Convert all class usage to relative names

Change-Id: I87e35693d589258c877ffeaa47304e40107e5542
This commit is contained in:
Tobias Urdin 2019-12-08 23:22:18 +01:00
parent 98dacc3204
commit e14ab290e7
6 changed files with 12 additions and 12 deletions

View File

@ -9,4 +9,4 @@
# Learn more about module testing here: # Learn more about module testing here:
# https://puppet.com/docs/puppet/latest/bgtm.html#testing-your-module # https://puppet.com/docs/puppet/latest/bgtm.html#testing-your-module
# #
include ::tempest include tempest

View File

@ -412,9 +412,9 @@ class tempest(
warning('The tempest::neutron_fwaas_available parameter is deprecated. FWaaS plugin is now part of neutron plugin.') 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 { if $install_from_source {
$setuptools_pkg = "python${tempest::params::pyvers}-setuptools" $setuptools_pkg = "python${tempest::params::pyvers}-setuptools"

View File

@ -77,7 +77,7 @@ class tempest::magnum (
$copy_logs = true, $copy_logs = true,
$dns_nameserver = '8.8.8.8', $dns_nameserver = '8.8.8.8',
) { ) {
include ::tempest::params include tempest::params
if $provision_image { if $provision_image {
$image_properties = { 'os_distro' => $image_os_distro } $image_properties = { 'os_distro' => $image_os_distro }

View File

@ -1,6 +1,6 @@
# #
class tempest::params { class tempest::params {
include ::openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers $pyvers = $::openstacklib::defaults::pyvers
$pip_command = "pip${pyvers}" $pip_command = "pip${pyvers}"

View File

@ -6,10 +6,10 @@ describe 'basic tempest' do
it 'should work with no errors' do it 'should work with no errors' do
pp= <<-EOS pp= <<-EOS
include ::openstack_integration include openstack_integration
include ::openstack_integration::repos include openstack_integration::repos
class { '::tempest': class { 'tempest':
setup_venv => true, setup_venv => true,
configure_images => false, configure_images => false,
configure_networks => false, configure_networks => false,

View File

@ -4,8 +4,8 @@ describe 'tempest' do
shared_examples 'tempest' do shared_examples 'tempest' do
let :pre_condition do let :pre_condition do
"include ::glance "include glance
include ::neutron" include neutron"
end end
context 'without parameters' do context 'without parameters' do
@ -358,8 +358,8 @@ describe 'tempest' do
shared_examples 'tempest with plugins packages' do shared_examples 'tempest with plugins packages' do
let :pre_condition do let :pre_condition do
"include ::glance "include glance
include ::neutron" include neutron"
end end
context 'with when managing tests packages for keystone (required service)' do context 'with when managing tests packages for keystone (required service)' do