From a764891ee33554be65916f8afeea81189b1139a6 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Mon, 6 Jun 2016 10:05:31 +0300 Subject: Include neutron in step 3 neutron::server requires the neutron's init.pp to be ran beforehand because init.pp installs the 'neutron' package. Else the relationship with neutron::policy will fail [1].So to address this, we move neutron's init.pp to be ran on step 3 if db_sync is enabled. [1] https://github.com/openstack/puppet-neutron/blob/master/manifests/server.pp#L498 Change-Id: I8eb497c2b483e11d1f640a7ba9fae5a9d5bcef4d --- manifests/profile/pacemaker/neutron.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'manifests/profile/pacemaker') diff --git a/manifests/profile/pacemaker/neutron.pp b/manifests/profile/pacemaker/neutron.pp index 03ccbc3..2af53dc 100644 --- a/manifests/profile/pacemaker/neutron.pp +++ b/manifests/profile/pacemaker/neutron.pp @@ -61,9 +61,12 @@ class tripleo::profile::pacemaker::neutron ( stop => '/bin/true', } + class { '::tripleo::profile::base::neutron': + sync_db => ($::hostname == downcase($pacemaker_master)), + } + if $step >= 4 { include ::neutron::params - include ::tripleo::profile::base::neutron # To be removed when puppet-oslo comes into service neutron_config { -- cgit 1.2.3-korg