From 839e85a96a6ba0a2a3ee67a2baf2fc8766fff179 Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena@redhat.com>
Date: Tue, 19 Apr 2016 12:49:32 +0200
Subject: [PATCH] Remove eventlet support for Keystone

Eventlet support has been removed from Keystone as of
https://review.openstack.org/249486, and removed in RDO openstack-keystone
packaging:
https://github.com/rdo-packages/keystone-distgit/commit/9dbd2556545afff77ec1d33449dd159eeb34be59

Closes-Bug: #1572051

Change-Id: I5124b783f7f7c6b19e5ea371fac8d5b969126b3e
---
 docs/packstack.rst                            |  3 ---
 packstack/plugins/keystone_100.py             | 15 +-----------
 packstack/puppet/templates/apache_ports.pp    |  6 ++---
 packstack/puppet/templates/keystone.pp        | 23 +++++++------------
 ...tone-evenlet-dropped-6f85670db62f7b91.yaml |  7 ++++++
 5 files changed, 18 insertions(+), 36 deletions(-)
 create mode 100644 releasenotes/notes/keystone-evenlet-dropped-6f85670db62f7b91.yaml

diff --git a/docs/packstack.rst b/docs/packstack.rst
index 70fcb8121..85d961951 100644
--- a/docs/packstack.rst
+++ b/docs/packstack.rst
@@ -337,9 +337,6 @@ Keystone Config parameters
 **CONFIG_KEYSTONE_TOKEN_FORMAT**
     Identity service token format (UUID or PKI). The recommended format for new deployments is UUID. ['UUID', 'PKI']
 
-**CONFIG_KEYSTONE_SERVICE_NAME**
-    Name of service to use to run the Identity service (keystone or httpd). ['keystone', 'httpd']
-
 **CONFIG_KEYSTONE_IDENTITY_BACKEND**
     Type of Identity service backend (sql or ldap). ['sql', 'ldap']
 
diff --git a/packstack/plugins/keystone_100.py b/packstack/plugins/keystone_100.py
index fac4c0762..92648268c 100644
--- a/packstack/plugins/keystone_100.py
+++ b/packstack/plugins/keystone_100.py
@@ -164,18 +164,6 @@ def initConfig(controller):
              "NEED_CONFIRM": False,
              "CONDITION": False},
 
-            {"CMD_OPTION": "keystone-service-name",
-             "PROMPT": "Enter the Keystone service name.",
-             "OPTION_LIST": ['keystone', 'httpd'],
-             "VALIDATORS": [validators.validate_options],
-             "DEFAULT_VALUE": "httpd",
-             "MASK_INPUT": False,
-             "LOOSE_VALIDATION": False,
-             "CONF_NAME": 'CONFIG_KEYSTONE_SERVICE_NAME',
-             "USE_DEFAULT": False,
-             "NEED_CONFIRM": False,
-             "CONDITION": False},
-
             {"CMD_OPTION": "keystone-identity-backend",
              "PROMPT": "Enter the Keystone identity backend type.",
              "OPTION_LIST": ['sql', 'ldap'],
@@ -780,8 +768,7 @@ def munge_ldap_config_params(config, messages):
 def create_manifest(config, messages):
     manifestfile = "%s_keystone.pp" % config['CONFIG_CONTROLLER_HOST']
     manifestdata = getManifestTemplate("keystone")
-    if config['CONFIG_KEYSTONE_SERVICE_NAME'] == 'httpd':
-        manifestdata += getManifestTemplate("apache_ports")
+    manifestdata += getManifestTemplate("apache_ports")
 
     if config['CONFIG_IP_VERSION'] == 'ipv6':
         host = config['CONFIG_CONTROLLER_HOST']
diff --git a/packstack/puppet/templates/apache_ports.pp b/packstack/puppet/templates/apache_ports.pp
index 34cf56ad9..0c0128b75 100644
--- a/packstack/puppet/templates/apache_ports.pp
+++ b/packstack/puppet/templates/apache_ports.pp
@@ -2,10 +2,8 @@ if hiera('CONFIG_HORIZON_SSL')  == 'y' {
   apache::listen { '443': }
 }
 
-if hiera('CONFIG_KEYSTONE_SERVICE_NAME') == 'httpd' {
-  apache::listen { '5000': }
-  apache::listen { '35357': }
-}
+apache::listen { '5000': }
+apache::listen { '35357': }
 
 if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
   if hiera('CONFIG_CEILOMETER_SERVICE_NAME') == 'httpd' {
diff --git a/packstack/puppet/templates/keystone.pp b/packstack/puppet/templates/keystone.pp
index 2cde284c5..9bd5c93b3 100644
--- a/packstack/puppet/templates/keystone.pp
+++ b/packstack/puppet/templates/keystone.pp
@@ -11,12 +11,6 @@ $bind_host = hiera('CONFIG_IP_VERSION') ? {
   # TO-DO(mmagr): Add IPv6 support when hostnames are used
 }
 
-if hiera('CONFIG_KEYSTONE_SERVICE_NAME') == 'keystone' {
-  $keystone_service_name = 'openstack-keystone'
-} else {
-  $keystone_service_name = 'httpd'
-}
-
 class { '::keystone::client': }
 
 if hiera('CONFIG_KEYSTONE_DB_PURGE_ENABLE',false) {
@@ -37,22 +31,21 @@ class { '::keystone':
   token_provider      => "keystone.token.providers.${keystone_token_provider_str}.Provider",
   verbose             => true,
   debug               => hiera('CONFIG_DEBUG_MODE'),
-  service_name        => $keystone_service_name,
+  service_name        => 'httpd',
   enable_ssl          => $keystone_use_ssl,
   public_bind_host    => $bind_host,
   admin_bind_host     => $bind_host,
   default_domain      => 'Default',
 }
 
-if $keystone_service_name == 'httpd' {
-  class { '::apache':
-    purge_configs => false,
-  }
+class { '::apache':
+  purge_configs => false,
+}
 
-  class { '::keystone::wsgi::apache':
-    workers => $service_workers,
-    ssl     => $keystone_use_ssl
-  }
+
+class { '::keystone::wsgi::apache':
+  workers => $service_workers,
+  ssl     => $keystone_use_ssl
 }
 
 class { '::keystone::roles::admin':
diff --git a/releasenotes/notes/keystone-evenlet-dropped-6f85670db62f7b91.yaml b/releasenotes/notes/keystone-evenlet-dropped-6f85670db62f7b91.yaml
new file mode 100644
index 000000000..79dd87185
--- /dev/null
+++ b/releasenotes/notes/keystone-evenlet-dropped-6f85670db62f7b91.yaml
@@ -0,0 +1,7 @@
+---
+deprecations:
+  - |
+    Keystone eventlet support has been removed as of
+    https://review.openstack.org/249486. Packstack support has also been
+    removed, so parameter CONFIG_KEYSTONE_SERVICE_NAME in the config file
+    will be ignored.