diff --git a/examples/init.pp b/examples/init.pp index 00961e53..cafe4a51 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 ::tempest +include tempest diff --git a/manifests/init.pp b/manifests/init.pp index c0eb1f21..70e2b9dc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -412,9 +412,9 @@ class tempest( warning('The tempest::neutron_fwaas_available parameter is deprecated. FWaaS plugin is now part of neutron plugin.') } - include ::tempest::params + include tempest::params - include ::openstacklib::openstackclient + include openstacklib::openstackclient if $install_from_source { $setuptools_pkg = "python${tempest::params::pyvers}-setuptools" diff --git a/manifests/magnum.pp b/manifests/magnum.pp index 3d10f21a..2a3a06af 100644 --- a/manifests/magnum.pp +++ b/manifests/magnum.pp @@ -77,7 +77,7 @@ class tempest::magnum ( $copy_logs = true, $dns_nameserver = '8.8.8.8', ) { - include ::tempest::params + include tempest::params if $provision_image { $image_properties = { 'os_distro' => $image_os_distro } diff --git a/manifests/params.pp b/manifests/params.pp index 17da00f1..9be88e4b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,6 +1,6 @@ # class tempest::params { - include ::openstacklib::defaults + include openstacklib::defaults $pyvers = $::openstacklib::defaults::pyvers $pip_command = "pip${pyvers}" diff --git a/spec/acceptance/basic_tempest_spec.rb b/spec/acceptance/basic_tempest_spec.rb index 26975da1..e9d21611 100644 --- a/spec/acceptance/basic_tempest_spec.rb +++ b/spec/acceptance/basic_tempest_spec.rb @@ -6,10 +6,10 @@ describe 'basic tempest' do it 'should work with no errors' do pp= <<-EOS - include ::openstack_integration - include ::openstack_integration::repos + include openstack_integration + include openstack_integration::repos - class { '::tempest': + class { 'tempest': setup_venv => true, configure_images => false, configure_networks => false, diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb index bed37fa2..8febf75e 100644 --- a/spec/classes/tempest_init_spec.rb +++ b/spec/classes/tempest_init_spec.rb @@ -4,8 +4,8 @@ describe 'tempest' do shared_examples 'tempest' do let :pre_condition do - "include ::glance - include ::neutron" + "include glance + include neutron" end context 'without parameters' do @@ -358,8 +358,8 @@ describe 'tempest' do shared_examples 'tempest with plugins packages' do let :pre_condition do - "include ::glance - include ::neutron" + "include glance + include neutron" end context 'with when managing tests packages for keystone (required service)' do