Fix puppet-lint before upgrading gem
Removing puppet-lint warnings in favor of upgrading to latest gem 2016-09-13 21:10:29.621198 | manifests/federation/mellon.pp:70:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621299 | manifests/federation/openidc.pp:1:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621338 | manifests/federation/openidc_httpd_configuration.pp:2:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621371 | manifests/federation/shibboleth.pp:80:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621400 | manifests/init.pp:749:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621428 | manifests/init.pp:862:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621456 | manifests/init.pp:869:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621483 | manifests/init.pp:870:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621510 | manifests/init.pp:923:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621537 | manifests/init.pp:927:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621564 | manifests/init.pp:931:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621592 | manifests/init.pp:935:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621633 | manifests/init.pp:939:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621662 | manifests/init.pp:943:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621689 | manifests/init.pp:1062:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621717 | manifests/init.pp:1067:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621742 | manifests/ldap.pp:468:ERROR: trailing whitespace found 2016-09-13 21:10:29.621771 | manifests/ldap_backend.pp:465:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621800 | manifests/wsgi/apache.pp:282:WARNING: line has more than 140 characters 2016-09-13 21:10:29.621824 | tests/site.pp:24:WARNING: unquoted node name found 2016-09-13 21:10:29.621848 | tests/site.pp:43:WARNING: unquoted node name found Change-Id: Ia308a08b002074d2393dc488a8ccc5429d675533
This commit is contained in:
Carlos Camacho
parent
17675623f3
commit
08c30f7550
@ -67,7 +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 ) {
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
|
||||
# == define: keystone::federation::openidc_httpd_configuration [70/1473]
|
||||
#
|
||||
# == Parameters
|
||||
|
||||
@ -77,7 +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 ) {
|
||||
|
||||
@ -746,7 +746,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 {
|
||||
@ -859,15 +860,21 @@ 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
|
||||
}
|
||||
|
||||
# TODO(aschultz): remove in N cycle
|
||||
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')
|
||||
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')
|
||||
$cache_enabled_real = true
|
||||
} else {
|
||||
$cache_enabled_real = $cache_enabled
|
||||
@ -920,27 +927,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 {
|
||||
@ -1059,12 +1072,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 {
|
||||
|
||||
@ -462,7 +462,9 @@ 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"
|
||||
$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"
|
||||
|
||||
if(bool2num($domain_enabled) == 0) {
|
||||
fail($err_msg)
|
||||
|
||||
@ -279,7 +279,8 @@ 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 {
|
||||
|
||||
@ -21,7 +21,7 @@ node 'keystone_sqlite' {
|
||||
}
|
||||
}
|
||||
|
||||
node keystone_mysql {
|
||||
node 'keystone_mysql' {
|
||||
class { '::mysql::server': }
|
||||
class { '::keystone::db::mysql':
|
||||
password => 'keystone',
|
||||
@ -40,7 +40,7 @@ node keystone_mysql {
|
||||
|
||||
|
||||
# keystone with mysql on another node
|
||||
node keystone {
|
||||
node 'keystone' {
|
||||
class { '::keystone':
|
||||
debug => true,
|
||||
database_connection => 'mysql://keystone:password@127.0.0.1/keystone',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user