From b8f97a2e6d381c15011add9afdffff931f79616c Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 27 Aug 2017 10:53:14 +0200
Subject: [PATCH] keystone (openstack) is no longer in use

---
 hieradata/common.yaml                        |  3 --
 modules/roles/manifests/init.pp              |  7 ---
 modules/roles/manifests/keystone.pp          | 50 --------------------
 modules/roles/manifests/keystone/rabbitmq.pp | 21 --------
 4 files changed, 81 deletions(-)
 delete mode 100644 modules/roles/manifests/keystone.pp
 delete mode 100644 modules/roles/manifests/keystone/rabbitmq.pp

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 7dd938dd0..50b208ed5 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -52,9 +52,6 @@ roles:
     - jerea.debian.org
   keyring:
     - kaufmann.debian.org
-  keystone_rabbitmq:
-    - rainier.debian.org
-    - rapoport.debian.org
   lists:
     - bendel.debian.org
   mailrelay:
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index a224a1d84..625ae5f05 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -222,13 +222,6 @@ class roles {
 		include roles::jenkins
 	}
 
-	if has_role('keystone') {
-		include roles::keystone
-	}
-	if has_role('keystone_rabbitmq') {
-		include roles::keystone::rabbitmq
-	}
-
 	if has_role('memcached') {
 		include roles::memcached
 	}
diff --git a/modules/roles/manifests/keystone.pp b/modules/roles/manifests/keystone.pp
deleted file mode 100644
index 600fbcb98..000000000
--- a/modules/roles/manifests/keystone.pp
+++ /dev/null
@@ -1,50 +0,0 @@
-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
-
-	class { '::keystone':
-		verbose             => true,
-		debug               => true,
-		database_connection => "postgresql://keystone:${keystone_dbpass}@bmdb1.debian.org:5435/keystone",
-		catalog_type        => 'sql',
-		admin_token         => $admin_token,
-		enabled             => false,
-		rabbit_host         => undef,
-		rabbit_hosts        => ['rapoport.debian.org','rainier.debian.org'],
-		rabbit_password     => $rabbit_pass,
-		rabbit_userid       => 'openstack',
-		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':
-		public_url => 'https://openstack.bm.debian.org:5000/',
-		admin_url  => 'https://openstack.bm.debian.org:35357/',
-	}
-
-	include ::apache
-	class { '::keystone::wsgi::apache':
-		ssl      => true,
-		ssl_cert => '/etc/ssl/certs/openstack.bm.debian.org-chained.pem',
-		ssl_key  => '/etc/ssl/private/openstack.bm.debian.org.key',
-
-	}
-}
-
diff --git a/modules/roles/manifests/keystone/rabbitmq.pp b/modules/roles/manifests/keystone/rabbitmq.pp
deleted file mode 100644
index 65d6b29ed..000000000
--- a/modules/roles/manifests/keystone/rabbitmq.pp
+++ /dev/null
@@ -1,21 +0,0 @@
-class roles::keystone::rabbitmq {
-
-	include roles::openstack::params
-
-	$rabbit_pass     = $roles::openstack::params::rabbit_pass
-
-	rabbitmq_vhost { 'keystone':
-		ensure   => present,
-	}
-
-	rabbitmq_user { 'openstack':
-		admin    => false,
-		password => $rabbit_pass,
-	}
-
-	rabbitmq_user_permissions { 'openstack@keystone':
-		configure_permission => '.*',
-		read_permission      => '.*',
-		write_permission     => '.*',
-	}
-}
-- 
2.20.1