diff --git a/examples/init.pp b/examples/init.pp index f87ca95..a10c5fa 100644 --- a/examples/init.pp +++ b/examples/init.pp @@ -9,4 +9,4 @@ # Learn more about module testing here: # https://puppet.com/docs/puppet/latest/bgtm.html#testing-your-module # -include ::placement +include placement diff --git a/manifests/api.pp b/manifests/api.pp index 3f6e16a..eafb577 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -45,7 +45,7 @@ class placement::api ( $sync_db = false, ) inherits placement::params { - include ::placement::deps + include placement::deps package { 'placement-api': ensure => $package_ensure, @@ -69,7 +69,7 @@ class placement::api ( tag => ['placement-service', 'placement-db-sync-service'], } } elsif $api_service_name == 'httpd' { - include ::apache::params + include apache::params service { 'placement-api': ensure => 'stopped', name => $::placement::params::service_name, @@ -81,6 +81,6 @@ class placement::api ( } } if $sync_db { - include ::placement::db::sync + include placement::db::sync } } diff --git a/manifests/config.pp b/manifests/config.pp index 4f0c391..e812e7e 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -81,7 +81,7 @@ class placement::config( $username = undef, ) { - include ::placement::deps + include placement::deps # TODO(tobias-urdin): Remove these deprecated ones in U release. $default_parameters = { diff --git a/manifests/db.pp b/manifests/db.pp index d751820..b1b5a0b 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -63,8 +63,8 @@ class placement::db ( $database_pool_timeout = $::os_service_default, ) { - include ::placement::deps - include ::placement::config + include placement::deps + include placement::config validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection, ['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?']) diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 2824e90..3dcb49f 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -43,7 +43,7 @@ class placement::db::mysql( $allowed_hosts = undef ) { - include ::placement::deps + include placement::deps validate_legacy(String, 'validate_string', $password) diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index 5fb231b..de84a39 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -32,7 +32,7 @@ class placement::db::postgresql( $privileges = 'ALL', ) { - include ::placement::deps + include placement::deps ::openstacklib::db::postgresql { 'placement': password_hash => postgresql_password($user, $password), diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index ec1ec66..8e79bbc 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -3,7 +3,7 @@ # class placement::db::sync { - include ::placement::deps + include placement::deps exec { 'placement-manage-db-sync': command => 'placement-manage db sync', diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp index ae5c6b7..20d300a 100644 --- a/manifests/generic_service.pp +++ b/manifests/generic_service.pp @@ -38,8 +38,8 @@ define placement::generic_service( $ensure_package = 'present' ) { - include ::placement::deps - include ::placement::params + include placement::deps + include placement::params $placement_title = "placement-${name}" diff --git a/manifests/init.pp b/manifests/init.pp index f8d0334..11e878b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -23,10 +23,10 @@ class placement( $randomize_allocation_candidates = $::os_service_default, ) inherits placement::params { - include ::placement::deps + include placement::deps if $sync_db { - include ::placement::db::sync + include placement::db::sync } package { 'python-placement': diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index f84b7cc..d62f542 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -83,7 +83,7 @@ class placement::keystone::auth ( $internal_url = 'http://127.0.0.1/placement', ) { - include ::placement::deps + include placement::deps if $configure_user_role { Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'placement-server' |> diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 29647ac..45d2a23 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -220,7 +220,7 @@ class placement::keystone::authtoken( $interface = $::os_service_default, ) { - include ::placement::deps + include placement::deps if is_service_default($password) { fail('Please set password for Placement service user') diff --git a/manifests/logging.pp b/manifests/logging.pp index 708fb17..07a1283 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -123,7 +123,7 @@ class placement::logging( $log_date_format = $::os_service_default, ) { - include ::placement::deps + include placement::deps oslo::log { 'placement_config': use_stderr => $use_stderr, diff --git a/manifests/params.pp b/manifests/params.pp index 6d0a7f1..1b278b0 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -2,8 +2,8 @@ # class placement::params { - include ::placement::deps - include ::openstacklib::defaults + include placement::deps + include openstacklib::defaults $pyvers = $::openstacklib::defaults::pyvers $pyvers_real = $pyvers ? { diff --git a/manifests/policy.pp b/manifests/policy.pp index 188cc63..ca2833d 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -28,8 +28,8 @@ class placement::policy ( $policy_path = '/etc/placement/policy.json', ) { - include ::placement::deps - include ::placement::params + include placement::deps + include placement::params validate_legacy(Hash, 'validate_hash', $policies) diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index b3e869e..0c36d2a 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -113,11 +113,11 @@ class placement::wsgi::apache ( $error_log_file = undef, ) { - include ::placement::params - include ::apache - include ::apache::mod::wsgi + include placement::params + include apache + include apache::mod::wsgi if $ssl { - include ::apache::mod::ssl + include apache::mod::ssl } placement::generic_service { 'api':