opendev/system-config
Code Issues Proposed changes

Merge "Send keystone_rabbit_password parameter"

Browse Source
This commit is contained in:
Jenkins 2016-02-16 08:03:08 +00:00 committed by Gerrit Code Review
commit be5806b551
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -1150,6 +1150,7 @@ node 'controller00.hpuswest.ic.openstack.org' {
enable_unbound => false, enable_unbound => false,
} }
class { '::openstack_project::infracloud::controller': class { '::openstack_project::infracloud::controller':
keystone_rabbit_password => hiera('keystone_rabbit_password'),
neutron_rabbit_password => hiera('neutron_rabbit_password'), neutron_rabbit_password => hiera('neutron_rabbit_password'),
nova_rabbit_password => hiera('nova_rabbit_password'), nova_rabbit_password => hiera('nova_rabbit_password'),
root_mysql_password => hiera('infracloud_mysql_password'), root_mysql_password => hiera('infracloud_mysql_password'),

2
modules/openstack_project/manifests/infracloud/controller.pp
View File

@ -1,4 +1,5 @@
class openstack_project::infracloud::controller ( class openstack_project::infracloud::controller (
$keystone_rabbit_password,
$neutron_rabbit_password, $neutron_rabbit_password,
$nova_rabbit_password, $nova_rabbit_password,
$root_mysql_password, $root_mysql_password,
@ -25,6 +26,7 @@ class openstack_project::infracloud::controller (
$controller_public_address = $::fqdn, $controller_public_address = $::fqdn,
) { ) {
class { '::infracloud::controller': class { '::infracloud::controller':
keystone_rabbit_password => $keystone_rabbit_password,
neutron_rabbit_password => $neutron_rabbit_password, neutron_rabbit_password => $neutron_rabbit_password,
nova_rabbit_password => $nova_rabbit_password, nova_rabbit_password => $nova_rabbit_password,
root_mysql_password => $root_mysql_password, root_mysql_password => $root_mysql_password,