X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fkeystone.pp;h=e265e541a990554443955e167747a2ac9ed9ef18;hb=52e13a709b5b959cd8995e7fa4f1b226bbe13a87;hp=9f27fb4bf8bfe3582162886672b0061268e2100b;hpb=131a3ca9be78e0db6477dcb742fff2bc1b8c799d;p=dsa-puppet.git

diff --git a/modules/roles/manifests/keystone.pp b/modules/roles/manifests/keystone.pp
index 9f27fb4b..e265e541 100644
--- a/modules/roles/manifests/keystone.pp
+++ b/modules/roles/manifests/keystone.pp
@@ -1,16 +1,18 @@
 class roles::keystone {
 
+	Exec { logoutput => 'on_failure' }
+
 	include roles::openstack::params
 
 	$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
+	$rabbit_pass     = $roles::openstack::params::rabbit_pass
 
 	class { '::keystone':
 		verbose             => true,
 		debug               => true,
-		sql_connection      => "postgresql://keystone:${keystone_dbpass}@bmdb1.debian.org/keystone",
+		sql_connection      => "postgresql://keystone:${keystone_dbpass}@bmdb1.debian.org:5435/keystone",
 		catalog_type        => 'sql',
 		admin_token         => $admin_token,
 		enabled             => false,
@@ -19,19 +21,23 @@ class roles::keystone {
 		rabbit_password     => $rabbit_pass,
 		rabbit_userid       => 'openstack',
 		rabbit_virtual_host => '/keystone',
-		memcache_servers    => ['localhost'],
+		memcache_servers    => ['localhost:11211'],
+		cache_backend       => 'keystone.cache.memcache_pool',
+		admin_endpoint      => 'https://openstack.bm.debian.org:35357/',
+		validate_cacert     => '/etc/ssl/debian/certs/ca.crt',
+		validate_service    => true,
 	}
-	class { 'keystone::roles::admin':
+	class { '::keystone::roles::admin':
 		email    => 'test@puppetlabs.com',
 		password => $admin_pass,
 	}
-	class { 'keystone::endpoint':
-		public_url => "https://${::fqdn}:5000/",
-		admin_url  => "https://${::fqdn}:35357/",
+	class { '::keystone::endpoint':
+		public_url => 'https://openstack.bm.debian.org:5000/',
+		admin_url  => 'https://openstack.bm.debian.org:35357/',
 	}
 
 	include apache
-	class { 'keystone::wsgi::apache':
+	class { '::keystone::wsgi::apache':
 		ssl      => true,
 		ssl_cert => '/etc/ssl/debian/certs/openstack.bm.debian.org.crt-chained',
 		ssl_key  => '/etc/ssl/private/openstack.bm.debian.org.key',