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

78
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,45 +1108,51 @@ 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 {
$service_name_real = $::keystone::params::service_name $::keystone::params::service_name, 'keystone-public-keystone-admin' : {
if $validate_service { $service_name_real = $::keystone::params::service_name
if $validate_auth_url { if $validate_service {
$v_auth_url = $validate_auth_url if $validate_auth_url {
} else { $v_auth_url = $validate_auth_url
$v_auth_url = $admin_endpoint } else {
} $v_auth_url = $admin_endpoint
}
class { '::keystone::service': class { '::keystone::service':
ensure => $service_ensure, ensure => $service_ensure,
service_name => $service_name, service_name => $service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,
validate => true, validate => true,
admin_endpoint => $v_auth_url, admin_endpoint => $v_auth_url,
admin_token => $admin_token, admin_token => $admin_token,
insecure => $validate_insecure, insecure => $validate_insecure,
cacert => $validate_cacert, cacert => $validate_cacert,
}
} else {
class { '::keystone::service':
ensure => $service_ensure,
service_name => $service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
validate => false,
}
} }
} else { if $service_name == $::keystone::params::service_name {
class { '::keystone::service': warning("Keystone under Eventlet has been deprecated during the Kilo cycle. \
ensure => $service_ensure, Support for deploying under eventlet will be dropped as of the M-release of OpenStack.")
service_name => $service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
validate => false,
} }
} }
warning("Keystone under Eventlet has been deprecated during the Kilo cycle. \ 'httpd': {
Support for deploying under eventlet will be dropped as of the M-release of OpenStack.") include ::apache::params
} elsif $service_name == 'httpd' { $service_name_real = $::apache::params::service_name
include ::apache::params }
$service_name_real = $::apache::params::service_name default: {
} else { 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 {

33
manifests/service.pp
View File

@ -77,13 +77,32 @@ class keystone::service(
include ::keystone::deps include ::keystone::deps
include ::keystone::params include ::keystone::params
service { 'keystone': if ($service_name == 'keystone-public-keystone-admin'){
ensure => $ensure, service { 'keystone-public':
name => $service_name, ensure => $ensure,
enable => $enable, name => 'keystone-public',
hasstatus => $hasstatus, enable => $enable,
hasrestart => $hasrestart, hasstatus => $hasstatus,
tag => 'keystone-service', 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':
ensure => $ensure,
name => $service_name,
enable => $enable,
hasstatus => $hasstatus,
hasrestart => $hasrestart,
tag => 'keystone-service',
}
} }
if $insecure { if $insecure {