x/packstack
Code Issues Proposed changes

Remove eventlet support for Keystone

Browse Source 
Eventlet support has been removed from Keystone as of
https://review.openstack.org/249486, and removed in RDO openstack-keystone
packaging:
9dbd255654

Closes-Bug: #1572051

Change-Id: I5124b783f7f7c6b19e5ea371fac8d5b969126b3e
This commit is contained in:
Javier Pena 2016-04-19 12:49:32 +02:00
parent 4c37e48998
commit 839e85a96a
5 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/packstack.rst
View File

@ -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']

15
packstack/plugins/keystone_100.py
View File

@ -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']

6
packstack/puppet/templates/apache_ports.pp
View File

@ -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' {

23
packstack/puppet/templates/keystone.pp
View File

@ -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':

7
releasenotes/notes/keystone-evenlet-dropped-6f85670db62f7b91.yaml Normal file
View File

@ -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.