diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-17 22:11:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-17 22:11:27 +0000 |
| commit | 19c9618cade3aaf66c8f8f75e09077d2bf3a8b97 (patch) | |
| tree | a41528dee4c4d955c1d56280aa5fa0e7c5b941ed /puppet/manifests | |
| parent | 6475dbdf4ef7b8dc5faf7d50e1d29222efb0bcf1 (diff) | |
| parent | d4518312486d9e5ad1399f59c04d972abfed4d82 (diff) | |
Merge "Remove Redis VirtualIP from params and build it from Neutron::Port"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index a9499821..4ef395f2 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -254,8 +254,10 @@ if hiera('step') >= 2 { require => Class['::redis'], } $redis_vip = hiera('redis_vip') - pacemaker::resource::ip { 'vip-redis': - ip_address => $redis_vip, + if $redis_vip and $redis_vip != $control_vip { + pacemaker::resource::ip { 'vip-redis': + ip_address => $redis_vip, + } } pacemaker::constraint::base { 'redis-master-then-vip-redis': constraint_type => 'order', |