From: Martin Zobel-Helas <zobel@debian.org>
Date: Wed, 1 Jul 2015 22:05:14 +0000 (+0000)
Subject: more keystone options
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a4e1bbf83dba50f4ec62da7568d52912fcb14f30;p=dsa-puppet.git

more keystone options

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/roles/manifests/keystone.pp b/modules/roles/manifests/keystone.pp
index 250f0431..d27cf458 100644
--- a/modules/roles/manifests/keystone.pp
+++ b/modules/roles/manifests/keystone.pp
@@ -5,14 +5,19 @@ class roles::keystone {
 	$keystone_dbpass = $roles::openstack::params::keystone_dbpass
 	$admin_token     = $roles::openstack::params::admin_token
 	$admin_pass      = $roles::openstack::params::admin_pass
+	$rabbit_pass      = $roles::openstack::params::rabbit_pass
 
 	class { '::keystone':
-		verbose        => true,
-		debug          => true,
-		sql_connection => 'postgresql://keystone:$keystone_postgres_password@bmdb1.debian.org/keystone',
-		catalog_type   => 'sql',
-		admin_token    => $admin_token,
-		enabled        => false,
+		verbose             => true,
+		debug               => true,
+		sql_connection      => "postgresql://keystone:${keystone_dbpass}@bmdb1.debian.org/keystone",
+		catalog_type        => 'sql',
+		admin_token         => $admin_token,
+		enabled             => false,
+		rabbit_hosts        => ['rapoport.debian.org','rainier.debian.org'],
+		rabbit_password     => $rabbit_pass,
+		rabbit_userid       => 'openstack',
+		rabbit_virtual_host => '/keystone',
 	}
 	class { 'keystone::roles::admin':
 		email    => 'test@puppetlabs.com',