Switch includes to absolute
We had some cherry picks that pulled in relative inclusions rather than absolute. We likely had a broken puppet-linter job so it didn't catch them. Now that the job "works" we need to fix these incusions to be absolute. Also squash in switch to stable/train helper. Change-Id: I4470236bb4bdff5356cfcbe98c9db0c00498ec68
This commit is contained in:
Alex Schultz
parent
a0725f8645
commit
5ec551b0b7
1
Gemfile
1
Gemfile
|
|
@ -8,6 +8,7 @@ group :development, :test, :system_tests do
|
|||
else
|
||||
gem 'puppet-openstack_spec_helper',
|
||||
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
|
||||
:branch => 'stable/train',
|
||||
:require => 'false'
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ class tripleo::certmonger::ovn_metadata (
|
|||
$postsave_cmd = undef,
|
||||
$principal = undef,
|
||||
) {
|
||||
include certmonger
|
||||
include ::certmonger
|
||||
|
||||
certmonger_certificate { 'ovn_metadata' :
|
||||
ensure => 'present',
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ class tripleo::certmonger::ovn_octavia (
|
|||
$postsave_cmd = undef,
|
||||
$principal = undef,
|
||||
) {
|
||||
include certmonger
|
||||
include ::certmonger
|
||||
|
||||
certmonger_certificate { 'ovn_octavia' :
|
||||
ensure => 'present',
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ class tripleo::profile::base::cinder::volume (
|
|||
}
|
||||
|
||||
if $cinder_enable_dellemc_sc_backend {
|
||||
include tripleo::profile::base::cinder::volume::dellemc_sc
|
||||
include ::tripleo::profile::base::cinder::volume::dellemc_sc
|
||||
$cinder_dellemc_sc_backend_name = hiera('cinder::backend::dellemc_sc::volume_backend_name', 'tripleo_dellemc_sc')
|
||||
} else {
|
||||
$cinder_dellemc_sc_backend_name = undef
|
||||
|
|
@ -225,7 +225,7 @@ class tripleo::profile::base::cinder::volume (
|
|||
}
|
||||
|
||||
if $cinder_enable_dellemc_powermax_backend {
|
||||
include tripleo::profile::base::cinder::volume::dellemc_powermax
|
||||
include ::tripleo::profile::base::cinder::volume::dellemc_powermax
|
||||
$cinder_dellemc_powermax_backend_name = hiera('cinder::backend::dellemc_powermax::volume_backend_name', 'tripleo_dellemc_powermax')
|
||||
} else {
|
||||
$cinder_dellemc_powermax_backend_name = undef
|
||||
|
|
@ -248,7 +248,7 @@ class tripleo::profile::base::cinder::volume (
|
|||
}
|
||||
|
||||
if $cinder_enable_dellemc_vxflexos_backend {
|
||||
include tripleo::profile::base::cinder::volume::dellemc_vxflexos
|
||||
include ::tripleo::profile::base::cinder::volume::dellemc_vxflexos
|
||||
$cinder_dellemc_vxflexos_backend_name = hiera('cinder::backend::dellemc_vxflexos::volume_backend_name',
|
||||
'tripleo_dellemc_vxflexos')
|
||||
} else {
|
||||
|
|
@ -256,7 +256,7 @@ class tripleo::profile::base::cinder::volume (
|
|||
}
|
||||
|
||||
if $cinder_enable_dellemc_xtremio_backend {
|
||||
include tripleo::profile::base::cinder::volume::dellemc_xtremio
|
||||
include ::tripleo::profile::base::cinder::volume::dellemc_xtremio
|
||||
$cinder_dellemc_xtremio_backend_name = hiera('cinder::backend::dellemc_xtremio::volume_backend_name',
|
||||
'tripleo_dellemc_xtremio')
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ class tripleo::profile::base::cinder::volume::dellemc_powermax (
|
|||
$multi_config = hiera('cinder::backend::dellemc_powermax::volume_multi_config', {}),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include tripleo::profile::base::cinder::volume
|
||||
include ::tripleo::profile::base::cinder::volume
|
||||
|
||||
if $step >= 4 {
|
||||
$backend_defaults = {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class tripleo::profile::base::cinder::volume::dellemc_sc (
|
|||
$multi_config = hiera('cinder::backend::dellemc_sc::volume_multi_config', {}),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include tripleo::profile::base::cinder::volume
|
||||
include ::tripleo::profile::base::cinder::volume
|
||||
|
||||
if $step >= 4 {
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::dellemc_vxflexos (
|
|||
$backend_name = hiera('cinder::backend::dellemc_vxflexos::volume_backend_name', 'tripleo_dellemc_vxflexos'),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include tripleo::profile::base::cinder::volume
|
||||
include ::tripleo::profile::base::cinder::volume
|
||||
|
||||
if $step >= 4 {
|
||||
cinder::backend::dellemc_vxflexos { $backend_name :
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class tripleo::profile::base::cinder::volume::dellemc_xtremio (
|
|||
$multi_config = hiera('cinder::backend::dellemc_xtremio::volume_multi_config', {}),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include tripleo::profile::base::cinder::volume
|
||||
include ::tripleo::profile::base::cinder::volume
|
||||
|
||||
if $step >= 4 {
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ class tripleo::profile::base::designate::authtoken (
|
|||
$memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
|
||||
}
|
||||
|
||||
class { 'designate::keystone::authtoken':
|
||||
class { '::designate::keystone::authtoken':
|
||||
memcached_servers => $memcache_servers
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ class tripleo::profile::base::octavia::provider::ovn (
|
|||
$ovn_nb_ca_cert = $::os_service_default
|
||||
) {
|
||||
|
||||
include tripleo::profile::base::octavia::api
|
||||
include ::tripleo::profile::base::octavia::api
|
||||
|
||||
if ($step >= 4) {
|
||||
# For backward compatibility
|
||||
|
|
@ -75,7 +75,7 @@ class tripleo::profile::base::octavia::provider::ovn (
|
|||
if $ovn_db_host_real {
|
||||
$ovn_nb_conn_args = ["${protocol}", normalize_ip_for_uri($ovn_db_host_real), "${ovn_nb_port_real}"].filter |$c| { !$c.empty() }
|
||||
$ovn_nb_connection = join($ovn_nb_conn_args, ':')
|
||||
class { 'octavia::provider::ovn':
|
||||
class { '::octavia::provider::ovn':
|
||||
ovn_nb_connection => $ovn_nb_connection,
|
||||
ovn_nb_private_key => $ovn_nb_private_key,
|
||||
ovn_nb_certificate => $ovn_nb_certificate,
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ class tripleo::profile::base::pacemaker_remote (
|
|||
fail('The $pcs_password param is and the hiera key "hacluster_pwd" hiera key are both undefined, this is not allowed')
|
||||
}
|
||||
|
||||
include pacemaker::params
|
||||
include ::pacemaker::params
|
||||
|
||||
class { '::pacemaker::remote':
|
||||
pcs_user => $pcs_user,
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
|
|||
} else {
|
||||
$log_file_real = ''
|
||||
}
|
||||
include tripleo::profile::base::cinder::volume
|
||||
include ::tripleo::profile::base::cinder::volume
|
||||
|
||||
if $step >= 2 and $pacemaker_master {
|
||||
$cinder_volume_short_node_names = hiera('cinder_volume_short_node_names')
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ class tripleo::profile::pacemaker::manila::share_bundle (
|
|||
} else {
|
||||
$log_file_real = ''
|
||||
}
|
||||
include tripleo::profile::base::manila::share
|
||||
include ::tripleo::profile::base::manila::share
|
||||
|
||||
if $step >= 2 and $pacemaker_master {
|
||||
$manila_share_short_node_names = hiera('manila_share_short_node_names')
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
|
|||
} else {
|
||||
$log_file_real = ''
|
||||
}
|
||||
include tripleo::profile::base::rabbitmq
|
||||
include ::tripleo::profile::base::rabbitmq
|
||||
|
||||
file { '/var/lib/rabbitmq/.erlang.cookie':
|
||||
ensure => file,
|
||||
|
|
|
|||
Loading…
Reference in New Issue