diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-31 14:53:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-31 14:53:56 +0000 |
| commit | 7903fc743bd3e445ef48c2d08a4bd3115f825e0b (patch) | |
| tree | c48d4f6ebf904c45b04def70813cdd35bd10bdf8 /puppet/manifests | |
| parent | 9f45b39cd880980640cf369382dd92c35424e1ca (diff) | |
| parent | 655fd041ae283490a8d501ec13c06d8aabb0ced5 (diff) | |
Merge "Cleanup hieradata to reduce Puppet warnings"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 2 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 74f6c3ac..53bf62c7 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -270,7 +270,7 @@ if hiera('step') >= 4 { class {'::neutron::plugins::midonet': midonet_api_ip => hiera('public_virtual_ip'), keystone_tenant => hiera('neutron::server::auth_tenant'), - keystone_password => hiera('neutron::server::auth_password') + keystone_password => hiera('neutron::server::password') } } else { diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 77b190a3..d6d14a83 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -494,7 +494,7 @@ MYSQL_HOST=localhost\n", class {'::neutron::plugins::midonet': midonet_api_ip => hiera('public_virtual_ip'), keystone_tenant => hiera('neutron::server::auth_tenant'), - keystone_password => hiera('neutron::server::auth_password') + keystone_password => hiera('neutron::server::password') } } if hiera('neutron::core_plugin') == 'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2' { |