diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-09 22:09:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-09 22:09:42 +0000 |
| commit | 38aab83e3558e450bf6754b981772b11f3c649b1 (patch) | |
| tree | 254528cc445dab565d2977df6c43d169b5df1e56 | |
| parent | 2f002bb0615a4ab8aa4954796a68936b0a4bdecb (diff) | |
| parent | a764891ee33554be65916f8afeea81189b1139a6 (diff) | |
Merge "Include neutron in step 3"
| -rw-r--r-- | manifests/profile/base/neutron.pp | 9 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/neutron.pp | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp index 2958170..d5efa81 100644 --- a/manifests/profile/base/neutron.pp +++ b/manifests/profile/base/neutron.pp @@ -18,14 +18,19 @@ # # === Parameters # +# [*sync_db*] +# (Optional) Whether to run db sync +# Defaults to true +# # [*step*] # (Optional) The current step of the deployment # Defaults to hiera('step') # class tripleo::profile::base::neutron ( - $step = hiera('step'), + $sync_db = true, + $step = hiera('step'), ) { - if $step >= 4 { + if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) { include ::neutron include ::neutron::config } 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 { |