diff --git a/examples/init.pp b/examples/init.pp index 31e1ac0..3082c7a 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 ::tacker +include tacker diff --git a/manifests/client.pp b/manifests/client.pp index 46551a1..838d346 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -10,8 +10,8 @@ class tacker::client ( $ensure = 'present' ) { - include ::tacker::deps - include ::tacker::params + include tacker::deps + include tacker::params package { 'python-tackerclient': ensure => $ensure, diff --git a/manifests/config.pp b/manifests/config.pp index 7ec3583..015bb57 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -24,7 +24,7 @@ class tacker::config ( $tacker_config = {}, ) { - include ::tacker::deps + include tacker::deps validate_legacy(Hash, 'validate_hash', $tacker_config) diff --git a/manifests/db.pp b/manifests/db.pp index 295c146..eacf845 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -62,7 +62,7 @@ class tacker::db ( $database_idle_timeout = undef, ) { - include ::tacker::deps + include tacker::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 c47d9b4..ac940e8 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -43,7 +43,7 @@ class tacker::db::mysql( $allowed_hosts = undef ) { - include ::tacker::deps + include tacker::deps validate_legacy(String, 'validate_string', $password) diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index 8b4ba6d..c5fb59a 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -32,7 +32,7 @@ class tacker::db::postgresql( $privileges = 'ALL', ) { - include ::tacker::deps + include tacker::deps ::openstacklib::db::postgresql { 'tacker': password_hash => postgresql_password($user, $password), diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index bc77ca4..2919eb2 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -17,7 +17,7 @@ class tacker::db::sync( $user = 'tacker', ) { - include ::tacker::deps + include tacker::deps exec { 'tacker-db-sync': command => "tacker-db-manage ${extra_params} upgrade head", diff --git a/manifests/init.pp b/manifests/init.pp index 29aa17d..872c323 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -223,10 +223,10 @@ class tacker( $sync_db = true, ) inherits tacker::params { - include ::tacker::deps + include tacker::deps if $sync_db { - include ::tacker::db::sync + include tacker::db::sync } oslo::messaging::rabbit {'tacker_config': diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index a490807..256241b 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -79,7 +79,7 @@ class tacker::keystone::auth ( $internal_url = 'http://127.0.0.1:9890', ) { - include ::tacker::deps + include tacker::deps if $configure_user_role { Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'tacker-server' |> diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 9c046be..13161dc 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -202,7 +202,7 @@ class tacker::keystone::authtoken( $service_token_roles_required = $::os_service_default, ) { - include ::tacker::deps + include tacker::deps keystone::resource::authtoken { 'tacker_config': username => $username, diff --git a/manifests/logging.pp b/manifests/logging.pp index 4cc76c6..b80a9ae 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -123,7 +123,7 @@ class tacker::logging( $log_date_format = $::os_service_default, ) { - include ::tacker::deps + include tacker::deps oslo::log { 'tacker_config': use_stderr => $use_stderr, diff --git a/manifests/params.pp b/manifests/params.pp index e73143a..2710275 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,7 +1,7 @@ # Parameters for puppet-tacker # class tacker::params { - include ::openstacklib::defaults + include openstacklib::defaults $pyvers = $::openstacklib::defaults::pyvers $group = 'tacker' diff --git a/manifests/policy.pp b/manifests/policy.pp index 893d88c..aeda2af 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -28,8 +28,8 @@ class tacker::policy ( $policy_path = '/etc/tacker/policy.json', ) { - include ::tacker::deps - include ::tacker::params + include tacker::deps + include tacker::params validate_legacy(Hash, 'validate_hash', $policies) diff --git a/manifests/server.pp b/manifests/server.pp index b99185d..b98ae8a 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -35,12 +35,12 @@ class tacker::server( $package_ensure = 'present', ) { - include ::tacker::deps - include ::tacker::params - include ::tacker::policy + include tacker::deps + include tacker::params + include tacker::policy if $auth_strategy == 'keystone' { - include ::tacker::keystone::authtoken + include tacker::keystone::authtoken } package { 'tacker-server': diff --git a/spec/acceptance/tacker_spec.rb b/spec/acceptance/tacker_spec.rb index 23b852d..ad6ff8c 100644 --- a/spec/acceptance/tacker_spec.rb +++ b/spec/acceptance/tacker_spec.rb @@ -6,11 +6,11 @@ describe 'basic tacker' do it 'should work with no errors' do pp= <<-EOS - include ::openstack_integration - include ::openstack_integration::repos - include ::openstack_integration::rabbitmq - include ::openstack_integration::mysql - include ::openstack_integration::keystone + include openstack_integration + include openstack_integration::repos + include openstack_integration::rabbitmq + include openstack_integration::mysql + include openstack_integration::keystone rabbitmq_user { 'tacker': admin => true, @@ -27,7 +27,7 @@ describe 'basic tacker' do require => Class['rabbitmq'], } - class { '::tacker::db::mysql': + class { 'tacker::db::mysql': password => 'a_big_secret', } case $::osfamily { @@ -35,23 +35,23 @@ describe 'basic tacker' do warning('Gnocchi is not yet packaged on Ubuntu systems.') } 'RedHat': { - class { '::tacker::db': + class { 'tacker::db': database_connection => 'mysql+pymysql://tacker:a_big_secret@127.0.0.1/tacker?charset=utf8', } - class { '::tacker::keystone::auth': + class { 'tacker::keystone::auth': password => 'a_big_secret', } - class { '::tacker::keystone::authtoken': + class { 'tacker::keystone::authtoken': password => 'a_big_secret', } - class { '::tacker::logging': + class { 'tacker::logging': debug => true, } - class { '::tacker': + class { 'tacker': default_transport_url => 'rabbit://tacker:my_secret@127.0.0.1:5672/', } - include ::tacker::server - include ::tacker::client + include tacker::server + include tacker::client } default: { fail("Unsupported osfamily (${::osfamily})") diff --git a/spec/classes/tacker_server_spec.rb b/spec/classes/tacker_server_spec.rb index 74dbd98..24a4d9f 100644 --- a/spec/classes/tacker_server_spec.rb +++ b/spec/classes/tacker_server_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe 'tacker::server' do let :pre_condition do - "class { '::tacker::keystone::authtoken': + "class { 'tacker::keystone::authtoken': password =>'foo', } class {'::tacker': }"