From fa11274b2f6b54d789f3ab3e08bbe9dea3717591 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sun, 8 Dec 2019 23:09:22 +0100 Subject: [PATCH] Convert all class usage to relative names Change-Id: Ia631adf31be1eeadb7ab0f12b75f1eaed73d5fbf --- examples/apache_dropin.pp | 14 +++++++------- examples/apache_with_paths.pp | 16 ++++++++-------- examples/k2k_sp_shib.pp | 16 ++++++++-------- examples/ldap_backend.pp | 4 ++-- examples/ldap_full.pp | 4 ++-- examples/ldap_identity.pp | 4 ++-- examples/v3_basic.pp | 10 +++++----- examples/v3_domain_configuration.pp | 10 +++++----- manifests/client.pp | 2 +- manifests/config.pp | 2 +- manifests/cors.pp | 2 +- manifests/cron/fernet_rotate.pp | 2 +- manifests/cron/token_flush.pp | 2 +- manifests/db.pp | 2 +- manifests/db/mysql.pp | 2 +- manifests/db/postgresql.pp | 2 +- manifests/db/sync.pp | 2 +- manifests/endpoint.pp | 2 +- manifests/federation.pp | 2 +- manifests/federation/identity_provider.pp | 4 ++-- manifests/federation/mellon.pp | 6 +++--- manifests/federation/openidc.pp | 6 +++--- manifests/federation/shibboleth.pp | 6 +++--- manifests/init.pp | 18 +++++++++--------- manifests/ldap.pp | 2 +- manifests/ldap_backend.pp | 2 +- manifests/logging.pp | 2 +- manifests/messaging/amqp.pp | 2 +- manifests/params.pp | 2 +- manifests/policy.pp | 4 ++-- manifests/resource/authtoken.pp | 4 ++-- manifests/resource/service_identity.pp | 2 +- manifests/resource/service_user.pp | 4 ++-- manifests/roles/admin.pp | 2 +- manifests/security_compliance.pp | 2 +- manifests/service.pp | 2 +- manifests/wsgi/apache.pp | 2 +- spec/acceptance/default_domain_spec.rb | 10 +++++----- ...ystone_federation_identity_provider_spec.rb | 10 +++++----- .../keystone_federation_shibboleth_spec.rb | 10 +++++----- spec/acceptance/keystone_wsgi_apache_spec.rb | 10 +++++----- spec/classes/keystone_init_spec.rb | 6 +++--- spec/classes/keystone_wsgi_apache_spec.rb | 2 +- 43 files changed, 110 insertions(+), 110 deletions(-) diff --git a/examples/apache_dropin.pp b/examples/apache_dropin.pp index 9455cc475..b0880943c 100644 --- a/examples/apache_dropin.pp +++ b/examples/apache_dropin.pp @@ -20,29 +20,29 @@ Exec { logoutput => 'on_failure' } -class { '::mysql::server': } -class { '::keystone::db::mysql': +class { 'mysql::server': } +class { 'keystone::db::mysql': password => 'keystone', } -class { '::keystone': +class { 'keystone': debug => true, database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone', catalog_type => 'sql', admin_token => 'admin_token', enabled => false, } -class { '::keystone::roles::admin': +class { 'keystone::roles::admin': email => 'test@puppetlabs.com', password => 'ChangeMe', } -class { '::keystone::endpoint': +class { 'keystone::endpoint': public_url => "https://${::fqdn}:5000/", admin_url => "https://${::fqdn}:5000/", } keystone_config { 'ssl/enable': value => true } -include ::apache -class { '::keystone::wsgi::apache': +include apache +class { 'keystone::wsgi::apache': ssl => true } diff --git a/examples/apache_with_paths.pp b/examples/apache_with_paths.pp index 55c398f7a..7245cbd9f 100644 --- a/examples/apache_with_paths.pp +++ b/examples/apache_with_paths.pp @@ -20,31 +20,31 @@ Exec { logoutput => 'on_failure' } -class { '::mysql::server': } -class { '::keystone::db::mysql': +class { 'mysql::server': } +class { 'keystone::db::mysql': password => 'keystone', } -class { '::keystone': +class { 'keystone': debug => true, database_connection => 'mysql://keystone_admin:keystone@127.0.0.1/keystone', catalog_type => 'sql', admin_token => 'admin_token', enabled => true, } -class { '::keystone::cron::token_flush': } -class { '::keystone::roles::admin': +class { 'keystone::cron::token_flush': } +class { 'keystone::roles::admin': email => 'test@puppetlabs.com', password => 'ChangeMe', } -class { '::keystone::endpoint': +class { 'keystone::endpoint': public_url => "https://${::fqdn}:443/main/", admin_url => "https://${::fqdn}:443/admin/", } keystone_config { 'ssl/enable': ensure => absent } -include ::apache -class { '::keystone::wsgi::apache': +include apache +class { 'keystone::wsgi::apache': ssl => true, public_port => 443, admin_port => 443, diff --git a/examples/k2k_sp_shib.pp b/examples/k2k_sp_shib.pp index d3c777abd..e1fd623e4 100644 --- a/examples/k2k_sp_shib.pp +++ b/examples/k2k_sp_shib.pp @@ -36,12 +36,12 @@ yumrepo { 'shibboleth': Yumrepo['shibboleth'] -> Class['::keystone::federation::shibboleth'] # Yumrepo end -class { '::mysql::server': } -class { '::keystone::db::mysql': +class { 'mysql::server': } +class { 'keystone::db::mysql': password => 'keystone', } -class { '::keystone': +class { 'keystone': debug => true, database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone', catalog_type => 'sql', @@ -49,23 +49,23 @@ class { '::keystone': enabled => false, } -class { '::keystone::roles::admin': +class { 'keystone::roles::admin': email => 'test@puppetlabs.com', password => 'ChangeMe', } -class { '::keystone::endpoint': +class { 'keystone::endpoint': public_url => "https://${::fqdn}:5000/", admin_url => "https://${::fqdn}:5000/", } keystone_config { 'ssl/enable': value => true } -include ::apache -class { '::keystone::wsgi::apache': +include apache +class { 'keystone::wsgi::apache': ssl => true } -class { '::keystone::federation::shibboleth': +class { 'keystone::federation::shibboleth': methods => 'password, token, oauth1, saml2', } diff --git a/examples/ldap_backend.pp b/examples/ldap_backend.pp index 8139e2494..14cb7aded 100644 --- a/examples/ldap_backend.pp +++ b/examples/ldap_backend.pp @@ -1,4 +1,4 @@ -class { '::keystone': +class { 'keystone': debug => true, database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone', admin_token => 'admin_token', @@ -9,7 +9,7 @@ class { '::keystone': # Ensure this matches what is in LDAP or keystone will try to recreate # the admin user -class { '::keystone::roles::admin': +class { 'keystone::roles::admin': email => 'test@example.com', password => 'ChangeMe', admin_user_domain => 'domain_1', diff --git a/examples/ldap_full.pp b/examples/ldap_full.pp index c2903aefc..f9e74c1a7 100644 --- a/examples/ldap_full.pp +++ b/examples/ldap_full.pp @@ -3,7 +3,7 @@ # Ensure this matches what is in LDAP or keystone will try to recreate # the admin user -class { '::keystone::roles::admin': +class { 'keystone::roles::admin': email => 'test@example.com', password => 'ChangeMe', } @@ -15,7 +15,7 @@ class { '::keystone::roles::admin': # ldapsearch -v -x -H 'ldap://example.com:389' -D \ # "uid=bind,cn=users,cn=accounts,dc=example,dc=com" -w SecretPass \ # -b cn=users,cn=accounts,dc=example,dc=com -class { '::keystone:ldap': +class { 'keystone:ldap': url => 'ldap://ldap.example.com:389', user => 'uid=bind,cn=users,cn=accounts,dc=example,dc=com', password => 'SecretPass', diff --git a/examples/ldap_identity.pp b/examples/ldap_identity.pp index 717f51881..9b282be7f 100644 --- a/examples/ldap_identity.pp +++ b/examples/ldap_identity.pp @@ -3,7 +3,7 @@ # Ensure this matches what is in LDAP or keystone will try to recreate # the admin user -class { '::keystone::roles::admin': +class { 'keystone::roles::admin': email => 'test@example.com', password => 'ChangeMe', } @@ -11,7 +11,7 @@ class { '::keystone::roles::admin': # You can test this connection with ldapsearch first to ensure it works. # This was tested against a FreeIPA box, you will likely need to change the # attributes to match your configuration. -class { '::keystone:ldap': +class { 'keystone:ldap': identity_driver => 'ldap', url => 'ldap://ldap.example.com:389', user => 'uid=bind,cn=users,cn=accounts,dc=example,dc=com', diff --git a/examples/v3_basic.pp b/examples/v3_basic.pp index 84005687c..5c5326e6c 100644 --- a/examples/v3_basic.pp +++ b/examples/v3_basic.pp @@ -22,17 +22,17 @@ Exec { logoutput => 'on_failure' } -class { '::mysql::server': } -class { '::keystone::db::mysql': +class { 'mysql::server': } +class { 'keystone::db::mysql': password => 'keystone', } -class { '::keystone': +class { 'keystone': debug => true, database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone', admin_token => 'admin_token', enabled => true, } -class { '::keystone::roles::admin': +class { 'keystone::roles::admin': email => 'test@example.tld', password => 'a_big_secret', admin => 'admin', # username @@ -40,7 +40,7 @@ class { '::keystone::roles::admin': admin_user_domain => 'admin', # domain for user admin_tenant_domain => 'admin', # domain for project } -class { '::keystone::endpoint': +class { 'keystone::endpoint': public_url => 'http://127.0.0.1:5000/', admin_url => 'http://127.0.0.1:5000/', } diff --git a/examples/v3_domain_configuration.pp b/examples/v3_domain_configuration.pp index b7c478529..24042b4c6 100644 --- a/examples/v3_domain_configuration.pp +++ b/examples/v3_domain_configuration.pp @@ -5,11 +5,11 @@ Exec { logoutput => 'on_failure' } -class { '::mysql::server': } -class { '::keystone::db::mysql': +class { 'mysql::server': } +class { 'keystone::db::mysql': password => 'keystone', } -class { '::keystone': +class { 'keystone': debug => true, database_connection => 'mysql://keystone:keystone@192.168.1.1/keystone', admin_token => 'admin_token', @@ -17,11 +17,11 @@ class { '::keystone': # The domain configuration setup at keystone level using_domain_config => true, } -class { '::keystone::roles::admin': +class { 'keystone::roles::admin': email => 'test@example.tld', password => 'a_big_secret', } -class { '::keystone::endpoint': +class { 'keystone::endpoint': public_url => 'http://192.168.1.1:5000/', admin_url => 'http://192.168.1.1:5000/', } diff --git a/manifests/client.pp b/manifests/client.pp index 056eb1de9..2284ec1f3 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -17,7 +17,7 @@ class keystone::client ( $ensure = 'present' ) inherits keystone::params { - include ::keystone::deps + include keystone::deps package { 'python-keystoneclient': ensure => $ensure, diff --git a/manifests/config.pp b/manifests/config.pp index 44d7974bd..7a7c573a4 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -24,7 +24,7 @@ class keystone::config ( $keystone_config = {}, ) { - include ::keystone::deps + include keystone::deps validate_legacy(Hash, 'validate_hash', $keystone_config) diff --git a/manifests/cors.pp b/manifests/cors.pp index 5b1569bfa..0e0417934 100644 --- a/manifests/cors.pp +++ b/manifests/cors.pp @@ -45,7 +45,7 @@ class keystone::cors ( $allow_headers = $::os_service_default, ) { - include ::keystone::deps + include keystone::deps oslo::cors { 'keystone_config': allowed_origin => $allowed_origin, diff --git a/manifests/cron/fernet_rotate.pp b/manifests/cron/fernet_rotate.pp index 20b93d187..16ad76580 100644 --- a/manifests/cron/fernet_rotate.pp +++ b/manifests/cron/fernet_rotate.pp @@ -58,7 +58,7 @@ class keystone::cron::fernet_rotate ( $user = 'keystone', ) { - include ::keystone::deps + include keystone::deps if $maxdelay == 0 { $sleep = '' diff --git a/manifests/cron/token_flush.pp b/manifests/cron/token_flush.pp index ef66e4e1e..813059cea 100644 --- a/manifests/cron/token_flush.pp +++ b/manifests/cron/token_flush.pp @@ -65,7 +65,7 @@ class keystone::cron::token_flush ( $user = 'keystone', ) { - include ::keystone::deps + include keystone::deps if $maxdelay == 0 { $sleep = '' diff --git a/manifests/db.pp b/manifests/db.pp index ada80db29..511bd7c9e 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -62,7 +62,7 @@ class keystone::db ( $database_idle_timeout = undef, ) { - include ::keystone::deps + include keystone::deps if $database_idle_timeout { warning('The database_idle_timeout parameter is deprecated. Please use \ diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 0c0c57d44..763123657 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -43,7 +43,7 @@ class keystone::db::mysql( $allowed_hosts = undef ) { - include ::keystone::deps + include keystone::deps validate_legacy(String, 'validate_string', $password) diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index b05fb124a..d4202ae18 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -42,7 +42,7 @@ class keystone::db::postgresql( $privileges = 'ALL', ) { - include ::keystone::deps + include keystone::deps ::openstacklib::db::postgresql { 'keystone': password_hash => postgresql_password($user, $password), diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index fa905044c..f1bb758a0 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -19,7 +19,7 @@ class keystone::db::sync( $keystone_user = $::keystone::params::keystone_user, ) inherits keystone::params { - include ::keystone::deps + include keystone::deps exec { 'keystone-manage db_sync': command => "keystone-manage ${extra_params} db_sync", diff --git a/manifests/endpoint.pp b/manifests/endpoint.pp index edb47f021..b4d7bfbf0 100644 --- a/manifests/endpoint.pp +++ b/manifests/endpoint.pp @@ -62,7 +62,7 @@ class keystone::endpoint ( $version = '', ) { - include ::keystone::deps + include keystone::deps if $version == 'unset' { warning('keystone::endpoint::version parameter is deprecated and will be removed in a future release.') diff --git a/manifests/federation.pp b/manifests/federation.pp index 69a9470c7..8f08d8a9b 100644 --- a/manifests/federation.pp +++ b/manifests/federation.pp @@ -17,7 +17,7 @@ class keystone::federation ( $trusted_dashboards = undef, $remote_id_attribute = undef, ) { - include ::keystone::deps + include keystone::deps keystone_config { 'federation/trusted_dashboard': value => any2array($trusted_dashboards); diff --git a/manifests/federation/identity_provider.pp b/manifests/federation/identity_provider.pp index ebac01881..5b9ea630e 100644 --- a/manifests/federation/identity_provider.pp +++ b/manifests/federation/identity_provider.pp @@ -97,8 +97,8 @@ class keystone::federation::identity_provider( $package_ensure = present, ) { - include ::keystone::deps - include ::keystone::params + include keystone::deps + include keystone::params if $::keystone::service_name != 'httpd' { fail ('Keystone need to be running under Apache for Federation work.') diff --git a/manifests/federation/mellon.pp b/manifests/federation/mellon.pp index 5b97d4496..579cc5e94 100644 --- a/manifests/federation/mellon.pp +++ b/manifests/federation/mellon.pp @@ -70,9 +70,9 @@ class keystone::federation::mellon ( $main_port = undef, ) { - include ::apache - include ::keystone::deps - include ::keystone::params + include apache + include keystone::deps + include keystone::params if ($trusted_dashboards) { warning("keystone::federation::mellon::trusted_dashboards is deprecated \ diff --git a/manifests/federation/openidc.pp b/manifests/federation/openidc.pp index b65ff7f1a..1af0b1496 100644 --- a/manifests/federation/openidc.pp +++ b/manifests/federation/openidc.pp @@ -120,9 +120,9 @@ class keystone::federation::openidc ( $package_ensure = present, ) { - include ::apache - include ::keystone::deps - include ::keystone::params + include apache + include keystone::deps + include keystone::params if $openidc_enable_oauth and !$openidc_introspection_endpoint { fail('You must set openidc_introspection_endpoint when enabling oauth support') diff --git a/manifests/federation/shibboleth.pp b/manifests/federation/shibboleth.pp index 5a2aed0e5..0e277fc75 100644 --- a/manifests/federation/shibboleth.pp +++ b/manifests/federation/shibboleth.pp @@ -65,8 +65,8 @@ class keystone::federation::shibboleth( $main_port = undef, ) { - include ::apache - include ::keystone::deps + include apache + include keystone::deps if $admin_port or $main_port { warning('keystone::federation::shibboleth::admin_port and main_port are deprecated and have no effect') @@ -101,7 +101,7 @@ Apache + Shibboleth SP setups, where a REMOTE_USER env variable is always set, e path => '/usr/lib64/shibboleth/mod_shib_24.so' } } else { - class { '::apache::mod::shib': } + class { 'apache::mod::shib': } } concat::fragment { 'configure_shibboleth_keystone': diff --git a/manifests/init.pp b/manifests/init.pp index 5e0eb927b..aeac06673 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -700,9 +700,9 @@ class keystone( $validate_cacert = undef, ) inherits keystone::params { - include ::keystone::deps - include ::keystone::logging - include ::keystone::policy + include keystone::deps + include keystone::logging + include keystone::policy if $cache_dir { warning('keystone::cache_dir is deprecated, has no effect and will be removed in a later release') @@ -793,8 +793,8 @@ admin_token will be removed in a later release") ensure_resource('policy_rcd', $policy_services, { ensure => present, 'set_code' => '101' }) } - include ::keystone::db - include ::keystone::params + include keystone::db + include keystone::params package { 'keystone': ensure => $package_ensure, @@ -804,7 +804,7 @@ admin_token will be removed in a later release") if $client_package_ensure == 'present' { include '::keystone::client' } else { - class { '::keystone::client': + class { 'keystone::client': ensure => $client_package_ensure, } } @@ -961,7 +961,7 @@ admin_token will be removed in a later release") $::keystone::params::service_name, 'keystone-public-keystone-admin' : { $service_name_real = $::keystone::params::service_name - class { '::keystone::service': + class { 'keystone::service': ensure => $service_ensure, service_name => $service_name, enable => $enabled, @@ -975,7 +975,7 @@ Support for deploying under eventlet will be dropped as of the M-release of Open } } 'httpd': { - include ::apache::params + include apache::params $service_name_real = $::apache::params::service_name } default: { @@ -985,7 +985,7 @@ running as a standalone service, or httpd for being run by a httpd server") } if $sync_db { - include ::keystone::db::sync + include keystone::db::sync } # Fernet tokens support diff --git a/manifests/ldap.pp b/manifests/ldap.pp index 60fa37689..f69170219 100644 --- a/manifests/ldap.pp +++ b/manifests/ldap.pp @@ -447,7 +447,7 @@ class keystone::ldap( $manage_packages = true, ) { - include ::keystone::deps + include keystone::deps if $manage_packages { ensure_resource('package', 'python-ldappool', { ensure => $package_ensure, diff --git a/manifests/ldap_backend.pp b/manifests/ldap_backend.pp index b047a516f..c1e433825 100644 --- a/manifests/ldap_backend.pp +++ b/manifests/ldap_backend.pp @@ -486,7 +486,7 @@ define keystone::ldap_backend( $group_allow_delete = undef, ) { - include ::keystone::deps + include keystone::deps $domain_enabled = getparam(Keystone_config['identity/domain_specific_drivers_enabled'], 'value') $domain_dir_enabled = getparam(Keystone_config['identity/domain_config_dir'], 'value') diff --git a/manifests/logging.pp b/manifests/logging.pp index 5428a07fd..0396cd9f5 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -134,7 +134,7 @@ class keystone::logging( $watch_log_file = $::os_service_default, ) { - include ::keystone::deps + include keystone::deps oslo::log { 'keystone_config': debug => $debug, diff --git a/manifests/messaging/amqp.pp b/manifests/messaging/amqp.pp index 57a009226..440ff9702 100644 --- a/manifests/messaging/amqp.pp +++ b/manifests/messaging/amqp.pp @@ -47,7 +47,7 @@ class keystone::messaging::amqp( $amqp_sasl_mechanisms = $::os_service_default, ) { - include ::keystone::deps + include keystone::deps oslo::messaging::amqp { 'keystone_config': pre_settled => $amqp_pre_settled, diff --git a/manifests/params.pp b/manifests/params.pp index 62c235003..801bc6979 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -2,7 +2,7 @@ # This class contains the platform differences for keystone # class keystone::params { - include ::openstacklib::defaults + include openstacklib::defaults $pyvers = $::openstacklib::defaults::pyvers $client_package_name = "python${pyvers}-keystoneclient" diff --git a/manifests/policy.pp b/manifests/policy.pp index 184cc7600..aa647967c 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -28,8 +28,8 @@ class keystone::policy ( $policy_path = '/etc/keystone/policy.json', ) { - include ::keystone::deps - include ::keystone::params + include keystone::deps + include keystone::params validate_legacy(Hash, 'validate_hash', $policies) diff --git a/manifests/resource/authtoken.pp b/manifests/resource/authtoken.pp index ab30079f5..99bf8a0d6 100644 --- a/manifests/resource/authtoken.pp +++ b/manifests/resource/authtoken.pp @@ -278,8 +278,8 @@ define keystone::resource::authtoken( $hash_algorithms = undef, ) { - include ::keystone::params - include ::keystone::deps + include keystone::params + include keystone::deps if $check_revocations_for_cached { warning('keystone::resource::authtoken::check_revocations_for_cached is deprecated and will be removed') diff --git a/manifests/resource/service_identity.pp b/manifests/resource/service_identity.pp index b65594a59..eaf15981b 100644 --- a/manifests/resource/service_identity.pp +++ b/manifests/resource/service_identity.pp @@ -131,7 +131,7 @@ define keystone::resource::service_identity( $default_domain = undef, ) { - include ::keystone::deps + include keystone::deps validate_legacy(Enum['present', 'absent'], 'validate_re', $ensure, [['^present$', '^absent$'], 'Valid values for ensure parameter are present or absent']) diff --git a/manifests/resource/service_user.pp b/manifests/resource/service_user.pp index 60eccdff8..10766c34e 100644 --- a/manifests/resource/service_user.pp +++ b/manifests/resource/service_user.pp @@ -84,8 +84,8 @@ define keystone::resource::service_user( $region_name = $::os_service_default, ) { - include ::keystone::params - include ::keystone::deps + include keystone::params + include keystone::deps $service_user_options = { 'service_user/auth_type' => {'value' => $auth_type}, diff --git a/manifests/roles/admin.pp b/manifests/roles/admin.pp index fead5f225..7bc5f51e2 100644 --- a/manifests/roles/admin.pp +++ b/manifests/roles/admin.pp @@ -95,7 +95,7 @@ class keystone::roles::admin( $target_admin_domain = undef, ) { - include ::keystone::deps + include keystone::deps if $password != $keystone::admin_password_real { warning('the main class is setting the admin password differently from this\ diff --git a/manifests/security_compliance.pp b/manifests/security_compliance.pp index 42c37987f..9f716920e 100644 --- a/manifests/security_compliance.pp +++ b/manifests/security_compliance.pp @@ -68,7 +68,7 @@ class keystone::security_compliance( $unique_last_password_count = $::os_service_default, ) { - include ::keystone::deps + include keystone::deps keystone_config { 'security_compliance/change_password_upon_first_use': value => $change_password_upon_first_use; diff --git a/manifests/service.pp b/manifests/service.pp index bdc554b6f..548a8df1a 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -77,7 +77,7 @@ class keystone::service ( $cacert = undef, ) inherits keystone::params { - include ::keystone::deps + include keystone::deps if $service_name == 'keystone-public-keystone-admin' { service { 'keystone-public': diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 9b416cd02..ddb17e9b7 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -165,7 +165,7 @@ class keystone::wsgi::apache ( $custom_wsgi_process_options = {}, ) inherits ::keystone::params { - include ::keystone::deps + include keystone::deps # TODO(tobias-urdin): This dependency chaining can be moved to keystone::deps # when we have cleaned up some old eventlet code and users are forced to use diff --git a/spec/acceptance/default_domain_spec.rb b/spec/acceptance/default_domain_spec.rb index 7dead423d..4f4ce0889 100644 --- a/spec/acceptance/default_domain_spec.rb +++ b/spec/acceptance/default_domain_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper_acceptance' describe 'basic keystone server with changed domain id' do after(:context) do clean_up_manifest = <<-EOM - include ::openstack_integration::keystone + include openstack_integration::keystone keystone_config { 'identity/default_domain_id': ensure => absent} EOM @@ -13,11 +13,11 @@ describe 'basic keystone server with changed domain id' do context 'new domain id' do let(:pp) do <<-EOM - include ::openstack_integration - include ::openstack_integration::repos - include ::openstack_integration::mysql + include openstack_integration + include openstack_integration::repos + include openstack_integration::mysql - class { '::openstack_integration::keystone': + class { 'openstack_integration::keystone': default_domain => 'my_default_domain', } diff --git a/spec/acceptance/keystone_federation_identity_provider_spec.rb b/spec/acceptance/keystone_federation_identity_provider_spec.rb index 76ccec890..e74d7dc89 100644 --- a/spec/acceptance/keystone_federation_identity_provider_spec.rb +++ b/spec/acceptance/keystone_federation_identity_provider_spec.rb @@ -6,10 +6,10 @@ describe 'keystone server running with Apache/WSGI as Identity Provider' do it 'should work with no errors' do pp= <<-EOS - include ::openstack_integration - include ::openstack_integration::repos - include ::openstack_integration::mysql - include ::openstack_integration::keystone + include openstack_integration + include openstack_integration::repos + include openstack_integration::mysql + include openstack_integration::keystone ::keystone::resource::service_identity { 'beaker-ci': service_type => 'beaker', @@ -66,7 +66,7 @@ describe 'keystone server running with Apache/WSGI as Identity Provider' do user_domain => 'service_domain', project_domain => 'service_domain', } - class { '::keystone::federation::identity_provider': + class { 'keystone::federation::identity_provider': idp_entity_id => 'http://127.0.0.1:5000/v3/OS-FEDERATION/saml2/idp', idp_sso_endpoint => 'http://127.0.0.1:5000/v3/OS-FEDERATION/saml2/sso', idp_metadata_path => '/etc/keystone/saml2_idp_metadata.xml', diff --git a/spec/acceptance/keystone_federation_shibboleth_spec.rb b/spec/acceptance/keystone_federation_shibboleth_spec.rb index 4b1c35671..bf57f1fe6 100644 --- a/spec/acceptance/keystone_federation_shibboleth_spec.rb +++ b/spec/acceptance/keystone_federation_shibboleth_spec.rb @@ -6,10 +6,10 @@ describe 'keystone server running with Apache/WSGI as Service Provider with Shib it 'should work with no errors' do pp= <<-EOS - include ::openstack_integration - include ::openstack_integration::repos - include ::openstack_integration::mysql - include ::openstack_integration::keystone + include openstack_integration + include openstack_integration::repos + include openstack_integration::mysql + include openstack_integration::keystone ::keystone::resource::service_identity { 'beaker-ci': service_type => 'beaker', @@ -66,7 +66,7 @@ describe 'keystone server running with Apache/WSGI as Service Provider with Shib user_domain => 'service_domain', project_domain => 'service_domain', } - class { '::keystone::federation::shibboleth': + class { 'keystone::federation::shibboleth': methods => 'password, token, oauth1, saml2', } EOS diff --git a/spec/acceptance/keystone_wsgi_apache_spec.rb b/spec/acceptance/keystone_wsgi_apache_spec.rb index 183cb946b..0716a4c0b 100644 --- a/spec/acceptance/keystone_wsgi_apache_spec.rb +++ b/spec/acceptance/keystone_wsgi_apache_spec.rb @@ -6,10 +6,10 @@ describe 'keystone server running with Apache/WSGI with resources' do it 'should work with no errors' do pp= <<-EOS - include ::openstack_integration - include ::openstack_integration::repos - include ::openstack_integration::mysql - include ::openstack_integration::keystone + include openstack_integration + include openstack_integration::repos + include openstack_integration::mysql + include openstack_integration::keystone ::keystone::resource::service_identity { 'beaker-ci': service_type => 'beaker', @@ -318,7 +318,7 @@ EOC context 'manifest' do let(:pp) do <<-EOM - class { '::openstack_integration::keystone': + class { 'openstack_integration::keystone': default_domain => 'default_domain', using_domain_config => true, } diff --git a/spec/classes/keystone_init_spec.rb b/spec/classes/keystone_init_spec.rb index 9b8f242ad..ef1036a8a 100644 --- a/spec/classes/keystone_init_spec.rb +++ b/spec/classes/keystone_init_spec.rb @@ -245,7 +245,7 @@ describe 'keystone' do end let :pre_condition do - 'include ::keystone::wsgi::apache' + 'include keystone::wsgi::apache' end it_configures 'core keystone examples', httpd_params @@ -267,7 +267,7 @@ describe 'keystone' do end let :pre_condition do - 'include ::keystone::wsgi::apache' + 'include keystone::wsgi::apache' end it_configures 'core keystone examples', httpd_params @@ -961,7 +961,7 @@ describe 'keystone' do end describe 'with default domain and wsgi service is managed and enabled' do let :pre_condition do - 'include ::apache' + 'include apache' end let :params do default_params.merge({ diff --git a/spec/classes/keystone_wsgi_apache_spec.rb b/spec/classes/keystone_wsgi_apache_spec.rb index 7c8cb956d..1c5339678 100644 --- a/spec/classes/keystone_wsgi_apache_spec.rb +++ b/spec/classes/keystone_wsgi_apache_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe 'keystone::wsgi::apache' do let :pre_condition do - "class { '::keystone': + "class { 'keystone': admin_token => 'dummy', service_name => 'httpd', enable_ssl => true,