diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-04-26 19:42:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-04-26 19:42:21 +0000 |
| commit | 51dbad07eab3c601d9d6d9ede6f6613ba27c5977 (patch) | |
| tree | 31d92907bebd9a2ccd57b893271cfab7c120ccc3 | |
| parent | 004c3bf5493ea10ffb4e7ddb780042d07d4ae0b8 (diff) | |
| parent | efadbd85a444851a83e3ebed42b4dab36e9c784f (diff) | |
Merge "Run sync in step 3 when $sync_db"
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index b3b6ce54..0372a56b 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -473,7 +473,7 @@ MYSQL_HOST=localhost\n", } #END STEP 2 -if hiera('step') >= 4 { +if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) { $nova_ipv6 = hiera('nova::use_ipv6', false) if $nova_ipv6 { |