openstack
/
puppet-keystone
Code Issues Proposed changes

Merge "Make it so that service_name can handle Debian"

This commit is contained in:
Zuul 2018-03-28 19:59:35 +00:00 committed by Gerrit Code Review
parent ec28f991b2 f971f21547
commit bb2f85523b
2 changed files with 70 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/init.pp
View File

@ -380,6 +380,10 @@
# web service. For example, after calling class {'keystone'...} # web service. For example, after calling class {'keystone'...}
# use class { 'keystone::wsgi::apache'...} to make keystone be # use class { 'keystone::wsgi::apache'...} to make keystone be
# a web app using apache mod_wsgi. # a web app using apache mod_wsgi.
# If the value is 'keystone-public-keystone-admin', then the
# module will use 2 services, one called keystone-public, and
# one called keystone-admin (as per the new Debian package
# which uses UWSGI instead of Apache).
# Defaults to '$::keystone::params::service_name' # Defaults to '$::keystone::params::service_name'
# NOTE: validate_service only applies if the default value is used. # NOTE: validate_service only applies if the default value is used.
# #
@ -1104,7 +1108,8 @@ Fernet or UUID tokens are recommended.")
warning('Execution of db_sync does not depend on $enabled anymore. Please use sync_db instead.') warning('Execution of db_sync does not depend on $enabled anymore. Please use sync_db instead.')
} }
if $service_name == $::keystone::params::service_name { case $service_name {
$::keystone::params::service_name, 'keystone-public-keystone-admin' : {
$service_name_real = $::keystone::params::service_name $service_name_real = $::keystone::params::service_name
if $validate_service { if $validate_service {
if $validate_auth_url { if $validate_auth_url {
@ -1135,15 +1140,20 @@ Fernet or UUID tokens are recommended.")
validate => false, validate => false,
} }
} }
if $service_name == $::keystone::params::service_name {
warning("Keystone under Eventlet has been deprecated during the Kilo cycle. \ warning("Keystone under Eventlet has been deprecated during the Kilo cycle. \
Support for deploying under eventlet will be dropped as of the M-release of OpenStack.") Support for deploying under eventlet will be dropped as of the M-release of OpenStack.")
} elsif $service_name == 'httpd' { }
}
'httpd': {
include ::apache::params include ::apache::params
$service_name_real = $::apache::params::service_name $service_name_real = $::apache::params::service_name
} else { }
default: {
fail("Invalid service_name. Either keystone/openstack-keystone for \ fail("Invalid service_name. Either keystone/openstack-keystone for \
running as a standalone service, or httpd for being run by a httpd server") running as a standalone service, or httpd for being run by a httpd server")
} }
}
if $sync_db { if $sync_db {
include ::keystone::db::sync include ::keystone::db::sync

19
manifests/service.pp
View File

@ -77,6 +77,24 @@ class keystone::service(
include ::keystone::deps include ::keystone::deps
include ::keystone::params include ::keystone::params
if ($service_name == 'keystone-public-keystone-admin'){
service { 'keystone-public':
ensure => $ensure,
name => 'keystone-public',
enable => $enable,
hasstatus => $hasstatus,
hasrestart => $hasrestart,
tag => 'keystone-service',
}
service { 'keystone-admin':
ensure => $ensure,
name => 'keystone-admin',
enable => $enable,
hasstatus => $hasstatus,
hasrestart => $hasrestart,
tag => 'keystone-service',
}
} else {
service { 'keystone': service { 'keystone':
ensure => $ensure, ensure => $ensure,
name => $service_name, name => $service_name,
@ -85,6 +103,7 @@ class keystone::service(
hasrestart => $hasrestart, hasrestart => $hasrestart,
tag => 'keystone-service', tag => 'keystone-service',
} }
}
if $insecure { if $insecure {
$insecure_s = '--insecure' $insecure_s = '--insecure'