From 1817780513153501ce57646896c394336b0e3406 Mon Sep 17 00:00:00 2001
From: Yolanda Robla <yolanda.robla-mota@hp.com>
Date: Wed, 10 Feb 2016 17:13:38 +0100
Subject: [PATCH] Send keystone_rabbit_password parameter
We cannot use default guest/guest as it has been disabled
on our rabbit. So we need to generate a pass in hiera for that,
and pass it properly to the manifest.
Change-Id: I407119383b232f07888dc9821771f1ece383a431
Depends-On: I9582d68ca93f2f7b5742523e273ebf6b5a9c0c13
---
manifests/site.pp | 1 +
modules/openstack_project/manifests/infracloud/controller.pp | 2 ++
2 files changed, 3 insertions(+)
diff --git a/manifests/site.pp b/manifests/site.pp
index 86be63faf4..cb719f798b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1150,6 +1150,7 @@ node 'controller00.hpuswest.ic.openstack.org' {
enable_unbound => false,
}
class { '::openstack_project::infracloud::controller':
+ keystone_rabbit_password => hiera('keystone_rabbit_password'),
neutron_rabbit_password => hiera('neutron_rabbit_password'),
nova_rabbit_password => hiera('nova_rabbit_password'),
root_mysql_password => hiera('infracloud_mysql_password'),
diff --git a/modules/openstack_project/manifests/infracloud/controller.pp b/modules/openstack_project/manifests/infracloud/controller.pp
index 1bf470959e..4ac4e2a006 100644
--- a/modules/openstack_project/manifests/infracloud/controller.pp
+++ b/modules/openstack_project/manifests/infracloud/controller.pp
@@ -1,4 +1,5 @@
class openstack_project::infracloud::controller (
+ $keystone_rabbit_password,
$neutron_rabbit_password,
$nova_rabbit_password,
$root_mysql_password,
@@ -25,6 +26,7 @@ class openstack_project::infracloud::controller (
$controller_public_address = $::fqdn,
) {
class { '::infracloud::controller':
+ keystone_rabbit_password => $keystone_rabbit_password,
neutron_rabbit_password => $neutron_rabbit_password,
nova_rabbit_password => $nova_rabbit_password,
root_mysql_password => $root_mysql_password,