X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fkeystone.pp;h=600fbcb98c9f145ba819f9f60e454af93f885929;hb=e66c073cdf3914dfb1064d4c1c87affae7b33314;hp=81fd6de8f6602ccd499f6afe672e82214b087ea0;hpb=da494cfbd147dde985720654a2c0a5922f3e1d10;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/keystone.pp b/modules/roles/manifests/keystone.pp
index 81fd6de8f..600fbcb98 100644
--- a/modules/roles/manifests/keystone.pp
+++ b/modules/roles/manifests/keystone.pp
@@ -1,5 +1,7 @@
 class roles::keystone {
 
+	Exec { logoutput => 'on_failure' }
+
 	include roles::openstack::params
 
 	$keystone_dbpass = $roles::openstack::params::keystone_dbpass
@@ -10,7 +12,7 @@ class roles::keystone {
 	class { '::keystone':
 		verbose             => true,
 		debug               => true,
-		sql_connection      => "postgresql://keystone:${keystone_dbpass}@bmdb1.debian.org:5435/keystone",
+		database_connection => "postgresql://keystone:${keystone_dbpass}@bmdb1.debian.org:5435/keystone",
 		catalog_type        => 'sql',
 		admin_token         => $admin_token,
 		enabled             => false,
@@ -21,20 +23,26 @@ class roles::keystone {
 		rabbit_virtual_host => '/keystone',
 		memcache_servers    => ['localhost:11211'],
 		cache_backend       => 'keystone.cache.memcache_pool',
+		admin_endpoint      => 'https://openstack.bm.debian.org:35357/',
+		validate_cacert     => '/etc/ssl/ca-debian/spi-cacert-2008.pem',
+		validate_service    => true,
+		enable_ssl          => true,
+		validate_auth_url   => 'https://openstack.bm.debian.org:35357/',
+		signing_cert_subject => '/C=US/ST=Unset/L=Unset/O=Unset/CN=openstack.bm.debian.org',
 	}
-	class { 'keystone::roles::admin':
-		email    => 'test@puppetlabs.com',
-		password => $admin_pass,
-	}
-	class { 'keystone::endpoint':
+	#class { '::keystone::roles::admin':
+	#	email    => 'test@puppetlabs.com',
+	#	password => $admin_pass,
+	#}
+	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':
+	include ::apache
+	class { '::keystone::wsgi::apache':
 		ssl      => true,
-		ssl_cert => '/etc/ssl/debian/certs/openstack.bm.debian.org.crt-chained',
+		ssl_cert => '/etc/ssl/certs/openstack.bm.debian.org-chained.pem',
 		ssl_key  => '/etc/ssl/private/openstack.bm.debian.org.key',
 
 	}