openstack/puppet-keystone
Code Issues Proposed changes

Remove unnecesary spaces in log messages.

Browse Source 
Spaces added by mistake in some log messages.

Change-Id: Idab08cf39e2e25fcfe66f788e99b0c2e42a43600
This commit is contained in:
Carlos Camacho
2016-09-26 09:54:21 +02:00
parent 4d441726ad
commit 3e73d33bf1
5 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/federation/mellon.pp
View File

@@ -67,8 +67,8 @@ class keystone::federation::mellon (
}
if ('external' in $methods ) {
fail('The external method should be dropped to avoid any interference with some \
Apache + Mellon SP setups, where a REMOTE_USER env variable is always set, even as an empty value.')
fail("The external method should be dropped to avoid any interference with some \
Apache + Mellon SP setups, where a REMOTE_USER env variable is always set, even as an empty value.")
}
if !('saml2' in $methods ) {

4
manifests/federation/shibboleth.pp
View File

@@ -77,8 +77,8 @@ class keystone::federation::shibboleth(
}
if ('external' in $methods ) {
fail('The external method should be dropped to avoid any interference with some \
Apache + Shibboleth SP setups, where a REMOTE_USER env variable is always set, even as an empty value.')
fail("The external method should be dropped to avoid any interference with some \
Apache + Shibboleth SP setups, where a REMOTE_USER env variable is always set, even as an empty value.")
}
if !('saml2' in $methods ) {

55
manifests/init.pp
View File

@@ -755,8 +755,8 @@ class keystone(
}
if $service_provider {
warning('service_provider is deprecated, does nothing and will be removed in a future release, \
use a Puppet resource collector if you want to modify the service provider.')
warning("service_provider is deprecated, does nothing and will be removed in a future release, \
use a Puppet resource collector if you want to modify the service provider.")
}
if $verbose {
@@ -776,7 +776,8 @@ class keystone(
}
if $admin_password == undef {
warning('admin_password is required, please set admin_password to a value != admin_token. admin_token will be removed in a later release')
warning("admin_password is required, please set admin_password to a value != admin_token. \
admin_token will be removed in a later release")
$admin_password_real = $admin_token
} else {
$admin_password_real = $admin_password
@@ -876,9 +877,11 @@ class keystone(
# TODO(aschultz): remove in N cycle
if is_service_default($cache_memcache_servers) and !is_service_default($memcache_servers) {
warning('The keystone module now provides a $cache_memcache_servers to be used with caching. \
Please specify it separately to configure cache/memcache_servers for keystone. \
This backwards compatibility will be removed in the N cycle.')
warning("The keystone module now provides a \$cache_memcache_servers to be used with caching. \
Please specify it separately to configure cache/memcache_servers for keystone. \
This backwards compatibility will be removed in the N cycle.")
$cache_memcache_servers_real = $memcache_servers
} else {
$cache_memcache_servers_real = $cache_memcache_servers
@@ -888,9 +891,11 @@ class keystone(
if is_service_default($cache_enabled)
and (!is_service_default($memcache_servers) or !is_service_default($cache_memcache_servers_real))
and !is_service_default($cache_backend) {
warning('cache_enabled has been added to control weither or not to enable caching. \
Please specify it separately to configure caching.
We have enabled caching as a backwards compatibility that will be removed in the N cycle')
warning("cache_enabled has been added to control weither or not to enable caching. \
Please specify it separately to configure caching.
We have enabled caching as a backwards compatibility that will be removed in the N cycle")
$cache_enabled_real = true
} else {
$cache_enabled_real = $cache_enabled
@@ -943,33 +948,33 @@ class keystone(
# Set the signing key/cert configuration values.
if (!is_service_default($signing_certfile)) {
warning('PKI token support has been deprecated in the M release and will be removed in the O release. \
Fernet or UUID tokens are recommended.')
warning("PKI token support has been deprecated in the M release and will be removed in the O release. \
Fernet or UUID tokens are recommended.")
}
if (!is_service_default($signing_keyfile)) {
warning('PKI token support has been deprecated in the M release and will be removed in the O release. \
Fernet or UUID tokens are recommended.')
warning("PKI token support has been deprecated in the M release and will be removed in the O release. \
Fernet or UUID tokens are recommended.")
}
if (!is_service_default($signing_ca_certs)) {
warning('PKI token support has been deprecated in the M release and will be removed in the O release. \
Fernet or UUID tokens are recommended.')
warning("PKI token support has been deprecated in the M release and will be removed in the O release. \
Fernet or UUID tokens are recommended.")
}
if (!is_service_default($signing_ca_key)) {
warning('PKI token support has been deprecated in the M release and will be removed in the O release. \
Fernet or UUID tokens are recommended.')
warning("PKI token support has been deprecated in the M release and will be removed in the O release. \
Fernet or UUID tokens are recommended.")
}
if (!is_service_default($signing_cert_subject)) {
warning('PKI token support has been deprecated in the M release and will be removed in the O release. \
Fernet or UUID tokens are recommended.')
warning("PKI token support has been deprecated in the M release and will be removed in the O release. \
Fernet or UUID tokens are recommended.")
}
if (!is_service_default($signing_key_size)) {
warning('PKI token support has been deprecated in the M release and will be removed in the O release. \
Fernet or UUID tokens are recommended.')
warning("PKI token support has been deprecated in the M release and will be removed in the O release. \
Fernet or UUID tokens are recommended.")
}
keystone_config {
@@ -1088,14 +1093,14 @@ class keystone(
validate => false,
}
}
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.')
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.")
} elsif $service_name == 'httpd' {
include ::apache::params
$service_name_real = $::apache::params::service_name
} else {
fail('Invalid service_name. Either keystone/openstack-keystone for \
running as a standalone service, or httpd for being run by a httpd server')
fail("Invalid service_name. Either keystone/openstack-keystone for \
running as a standalone service, or httpd for being run by a httpd server")
}
if $sync_db {

4
manifests/ldap_backend.pp
View File

@@ -468,8 +468,8 @@ define keystone::ldap_backend(
$domain_enabled = getparam(Keystone_config['identity/domain_specific_drivers_enabled'], 'value')
$domain_dir_enabled = getparam(Keystone_config['identity/domain_config_dir'], 'value')
$err_msg = "You should add \"using_domain_config => true\" parameter to your Keystone class, \
got \"${domain_enabled}\" for identity/domain_specific_drivers_enabled \
and \"${domain_dir_enabled}\" for identity/domain_config_dir"
got \"${domain_enabled}\" for identity/domain_specific_drivers_enabled \
and \"${domain_dir_enabled}\" for identity/domain_config_dir"
if(bool2num($domain_enabled) == 0) {
fail($err_msg)

6
manifests/wsgi/apache.pp
View File

@@ -279,8 +279,10 @@ class keystone::wsgi::apache (
}
if $wsgi_script_source {
warning('The single wsgi script source has been deprecated as part of the Mitaka cycle, please switch to \
$wsgi_admin_script_source and $wsgi_public_script_source')
warning("The single wsgi script source has been deprecated as part of the Mitaka cycle, please switch to \
\$wsgi_admin_script_source and \$wsgi_public_script_source")
$wsgi_admin_source = $wsgi_script_source
$wsgi_public_source = $wsgi_script_source
} else {