openstack/puppet-tripleo
Code Issues Proposed changes

Switch includes to absolute

Browse Source 
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 2020-08-03 08:49:24 -06:00
parent a0725f8645
commit 5ec551b0b7
14 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -8,6 +8,7 @@ group :development, :test, :system_tests do
else else
gem 'puppet-openstack_spec_helper', gem 'puppet-openstack_spec_helper',
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper', :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
:branch => 'stable/train',
:require => 'false' :require => 'false'
end end
end end

2
manifests/certmonger/ovn_metadata.pp
View File

@ -46,7 +46,7 @@ class tripleo::certmonger::ovn_metadata (
$postsave_cmd = undef, $postsave_cmd = undef,
$principal = undef, $principal = undef,
) { ) {
include certmonger include ::certmonger
certmonger_certificate { 'ovn_metadata' : certmonger_certificate { 'ovn_metadata' :
ensure => 'present', ensure => 'present',

2
manifests/certmonger/ovn_octavia.pp
View File

@ -46,7 +46,7 @@ class tripleo::certmonger::ovn_octavia (
$postsave_cmd = undef, $postsave_cmd = undef,
$principal = undef, $principal = undef,
) { ) {
include certmonger include ::certmonger
certmonger_certificate { 'ovn_octavia' : certmonger_certificate { 'ovn_octavia' :
ensure => 'present', ensure => 'present',

8
manifests/profile/base/cinder/volume.pp
View File

@ -211,7 +211,7 @@ class tripleo::profile::base::cinder::volume (
} }
if $cinder_enable_dellemc_sc_backend { 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') $cinder_dellemc_sc_backend_name = hiera('cinder::backend::dellemc_sc::volume_backend_name', 'tripleo_dellemc_sc')
} else { } else {
$cinder_dellemc_sc_backend_name = undef $cinder_dellemc_sc_backend_name = undef
@ -225,7 +225,7 @@ class tripleo::profile::base::cinder::volume (
} }
if $cinder_enable_dellemc_powermax_backend { 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') $cinder_dellemc_powermax_backend_name = hiera('cinder::backend::dellemc_powermax::volume_backend_name', 'tripleo_dellemc_powermax')
} else { } else {
$cinder_dellemc_powermax_backend_name = undef $cinder_dellemc_powermax_backend_name = undef
@ -248,7 +248,7 @@ class tripleo::profile::base::cinder::volume (
} }
if $cinder_enable_dellemc_vxflexos_backend { 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', $cinder_dellemc_vxflexos_backend_name = hiera('cinder::backend::dellemc_vxflexos::volume_backend_name',
'tripleo_dellemc_vxflexos') 'tripleo_dellemc_vxflexos')
} else { } else {
@ -256,7 +256,7 @@ class tripleo::profile::base::cinder::volume (
} }
if $cinder_enable_dellemc_xtremio_backend { 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', $cinder_dellemc_xtremio_backend_name = hiera('cinder::backend::dellemc_xtremio::volume_backend_name',
'tripleo_dellemc_xtremio') 'tripleo_dellemc_xtremio')
} else { } else {

2
manifests/profile/base/cinder/volume/dellemc_powermax.pp
View File

@ -37,7 +37,7 @@ class tripleo::profile::base::cinder::volume::dellemc_powermax (
$multi_config = hiera('cinder::backend::dellemc_powermax::volume_multi_config', {}), $multi_config = hiera('cinder::backend::dellemc_powermax::volume_multi_config', {}),
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
) { ) {
include tripleo::profile::base::cinder::volume include ::tripleo::profile::base::cinder::volume
if $step >= 4 { if $step >= 4 {
$backend_defaults = { $backend_defaults = {

2
manifests/profile/base/cinder/volume/dellemc_sc.pp
View File

@ -36,7 +36,7 @@ class tripleo::profile::base::cinder::volume::dellemc_sc (
$multi_config = hiera('cinder::backend::dellemc_sc::volume_multi_config', {}), $multi_config = hiera('cinder::backend::dellemc_sc::volume_multi_config', {}),
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
) { ) {
include tripleo::profile::base::cinder::volume include ::tripleo::profile::base::cinder::volume
if $step >= 4 { if $step >= 4 {

2
manifests/profile/base/cinder/volume/dellemc_vxflexos.pp
View File

@ -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'), $backend_name = hiera('cinder::backend::dellemc_vxflexos::volume_backend_name', 'tripleo_dellemc_vxflexos'),
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
) { ) {
include tripleo::profile::base::cinder::volume include ::tripleo::profile::base::cinder::volume
if $step >= 4 { if $step >= 4 {
cinder::backend::dellemc_vxflexos { $backend_name : cinder::backend::dellemc_vxflexos { $backend_name :

2
manifests/profile/base/cinder/volume/dellemc_xtremio.pp
View File

@ -36,7 +36,7 @@ class tripleo::profile::base::cinder::volume::dellemc_xtremio (
$multi_config = hiera('cinder::backend::dellemc_xtremio::volume_multi_config', {}), $multi_config = hiera('cinder::backend::dellemc_xtremio::volume_multi_config', {}),
$step = Integer(hiera('step')), $step = Integer(hiera('step')),
) { ) {
include tripleo::profile::base::cinder::volume include ::tripleo::profile::base::cinder::volume
if $step >= 4 { if $step >= 4 {

2
manifests/profile/base/designate/authtoken.pp
View File

@ -37,7 +37,7 @@ class tripleo::profile::base::designate::authtoken (
$memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
} }
class { 'designate::keystone::authtoken': class { '::designate::keystone::authtoken':
memcached_servers => $memcache_servers memcached_servers => $memcache_servers
} }
} }

4
manifests/profile/base/octavia/provider/ovn.pp
View File

@ -59,7 +59,7 @@ class tripleo::profile::base::octavia::provider::ovn (
$ovn_nb_ca_cert = $::os_service_default $ovn_nb_ca_cert = $::os_service_default
) { ) {
include tripleo::profile::base::octavia::api include ::tripleo::profile::base::octavia::api
if ($step >= 4) { if ($step >= 4) {
# For backward compatibility # For backward compatibility
@ -75,7 +75,7 @@ class tripleo::profile::base::octavia::provider::ovn (
if $ovn_db_host_real { 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_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, ':') $ovn_nb_connection = join($ovn_nb_conn_args, ':')
class { 'octavia::provider::ovn': class { '::octavia::provider::ovn':
ovn_nb_connection => $ovn_nb_connection, ovn_nb_connection => $ovn_nb_connection,
ovn_nb_private_key => $ovn_nb_private_key, ovn_nb_private_key => $ovn_nb_private_key,
ovn_nb_certificate => $ovn_nb_certificate, ovn_nb_certificate => $ovn_nb_certificate,

2
manifests/profile/base/pacemaker_remote.pp
View File

@ -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') 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': class { '::pacemaker::remote':
pcs_user => $pcs_user, pcs_user => $pcs_user,

2
manifests/profile/pacemaker/cinder/volume_bundle.pp
View File

@ -98,7 +98,7 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
} else { } else {
$log_file_real = '' $log_file_real = ''
} }
include tripleo::profile::base::cinder::volume include ::tripleo::profile::base::cinder::volume
if $step >= 2 and $pacemaker_master { if $step >= 2 and $pacemaker_master {
$cinder_volume_short_node_names = hiera('cinder_volume_short_node_names') $cinder_volume_short_node_names = hiera('cinder_volume_short_node_names')

2
manifests/profile/pacemaker/manila/share_bundle.pp
View File

@ -103,7 +103,7 @@ class tripleo::profile::pacemaker::manila::share_bundle (
} else { } else {
$log_file_real = '' $log_file_real = ''
} }
include tripleo::profile::base::manila::share include ::tripleo::profile::base::manila::share
if $step >= 2 and $pacemaker_master { if $step >= 2 and $pacemaker_master {
$manila_share_short_node_names = hiera('manila_share_short_node_names') $manila_share_short_node_names = hiera('manila_share_short_node_names')

2
manifests/profile/pacemaker/rabbitmq_bundle.pp
View File

@ -162,7 +162,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
} else { } else {
$log_file_real = '' $log_file_real = ''
} }
include tripleo::profile::base::rabbitmq include ::tripleo::profile::base::rabbitmq
file { '/var/lib/rabbitmq/.erlang.cookie': file { '/var/lib/rabbitmq/.erlang.cookie':
ensure => file, ensure => file,