Browse Source

Convert all class usage to relative names

Change-Id: Ib2ed745b682cf12f9469a5a64451adcabec400af
changes/30/697930/1
Tobias Urdin 2 years ago
parent
commit
1523a4b804
  1. 2
      manifests/certmonger/etcd.pp
  2. 4
      manifests/certmonger/haproxy.pp
  3. 4
      manifests/certmonger/httpd.pp
  4. 4
      manifests/certmonger/libvirt.pp
  5. 4
      manifests/certmonger/libvirt_vnc.pp
  6. 4
      manifests/certmonger/metrics_qdr.pp
  7. 2
      manifests/certmonger/mysql.pp
  8. 2
      manifests/certmonger/neutron.pp
  9. 2
      manifests/certmonger/neutron_ovn.pp
  10. 4
      manifests/certmonger/novnc_proxy.pp
  11. 2
      manifests/certmonger/opendaylight.pp
  12. 2
      manifests/certmonger/openvswitch.pp
  13. 2
      manifests/certmonger/ovn_controller.pp
  14. 2
      manifests/certmonger/ovn_dbs.pp
  15. 2
      manifests/certmonger/ovn_metadata.pp
  16. 4
      manifests/certmonger/qemu.pp
  17. 2
      manifests/certmonger/rabbitmq.pp
  18. 2
      manifests/certmonger/redis.pp
  19. 2
      manifests/firewall/pre.pp
  20. 10
      manifests/haproxy.pp
  21. 2
      manifests/haproxy/endpoint.pp
  22. 2
      manifests/haproxy/horizon_endpoint.pp
  23. 2
      manifests/host/sriov/numvfs_persistence.pp
  24. 2
      manifests/keepalived.pp
  25. 4
      manifests/network/contrail/neutron_plugin.pp
  26. 2
      manifests/network/contrail/vrouter.pp
  27. 2
      manifests/network/os_net_config.pp
  28. 2
      manifests/packages.pp
  29. 2
      manifests/packages/upgrades.pp
  30. 12
      manifests/profile/base/aodh.pp
  31. 10
      manifests/profile/base/aodh/api.pp
  32. 2
      manifests/profile/base/aodh/authtoken.pp
  33. 4
      manifests/profile/base/aodh/evaluator.pp
  34. 4
      manifests/profile/base/aodh/listener.pp
  35. 4
      manifests/profile/base/aodh/notifier.pp
  36. 10
      manifests/profile/base/apache.pp
  37. 2
      manifests/profile/base/auditd.pp
  38. 6
      manifests/profile/base/barbican.pp
  39. 20
      manifests/profile/base/barbican/api.pp
  40. 2
      manifests/profile/base/barbican/authtoken.pp
  41. 8
      manifests/profile/base/barbican/backends.pp
  42. 6
      manifests/profile/base/ceilometer.pp
  43. 8
      manifests/profile/base/ceilometer/agent/notification.pp
  44. 8
      manifests/profile/base/ceilometer/agent/polling.pp
  45. 4
      manifests/profile/base/ceilometer/expirer.pp
  46. 2
      manifests/profile/base/ceilometer/upgrade.pp
  47. 22
      manifests/profile/base/certmonger_user.pp
  48. 16
      manifests/profile/base/cinder.pp
  49. 12
      manifests/profile/base/cinder/api.pp
  50. 2
      manifests/profile/base/cinder/authtoken.pp
  51. 4
      manifests/profile/base/cinder/backup.pp
  52. 4
      manifests/profile/base/cinder/backup/ceph.pp
  53. 4
      manifests/profile/base/cinder/backup/nfs.pp
  54. 4
      manifests/profile/base/cinder/backup/swift.pp
  55. 4
      manifests/profile/base/cinder/scheduler.pp
  56. 38
      manifests/profile/base/cinder/volume.pp
  57. 2
      manifests/profile/base/cinder/volume/dellemc_unity.pp
  58. 2
      manifests/profile/base/cinder/volume/dellemc_vmax_iscsi.pp
  59. 2
      manifests/profile/base/cinder/volume/dellemc_vnx.pp
  60. 2
      manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp
  61. 2
      manifests/profile/base/cinder/volume/dellps.pp
  62. 2
      manifests/profile/base/cinder/volume/dellsc.pp
  63. 2
      manifests/profile/base/cinder/volume/hpelefthand.pp
  64. 4
      manifests/profile/base/cinder/volume/iscsi.pp
  65. 2
      manifests/profile/base/cinder/volume/netapp.pp
  66. 2
      manifests/profile/base/cinder/volume/nfs.pp
  67. 2
      manifests/profile/base/cinder/volume/nvmeof.pp
  68. 2
      manifests/profile/base/cinder/volume/pure.pp
  69. 2
      manifests/profile/base/cinder/volume/rbd.pp
  70. 2
      manifests/profile/base/cinder/volume/scaleio.pp
  71. 2
      manifests/profile/base/cinder/volume/veritas_hyperscale.pp
  72. 50
      manifests/profile/base/database/mysql.pp
  73. 8
      manifests/profile/base/database/redis.pp
  74. 10
      manifests/profile/base/designate.pp
  75. 6
      manifests/profile/base/designate/api.pp
  76. 8
      manifests/profile/base/designate/central.pp
  77. 4
      manifests/profile/base/designate/mdns.pp
  78. 4
      manifests/profile/base/designate/producer.pp
  79. 4
      manifests/profile/base/designate/sink.pp
  80. 4
      manifests/profile/base/designate/worker.pp
  81. 14
      manifests/profile/base/glance/api.pp
  82. 2
      manifests/profile/base/glance/authtoken.pp
  83. 10
      manifests/profile/base/gnocchi.pp
  84. 26
      manifests/profile/base/gnocchi/api.pp
  85. 2
      manifests/profile/base/gnocchi/authtoken.pp
  86. 4
      manifests/profile/base/gnocchi/metricd.pp
  87. 4
      manifests/profile/base/gnocchi/statsd.pp
  88. 14
      manifests/profile/base/heat.pp
  89. 8
      manifests/profile/base/heat/api.pp
  90. 8
      manifests/profile/base/heat/api_cfn.pp
  91. 2
      manifests/profile/base/heat/authtoken.pp
  92. 4
      manifests/profile/base/heat/engine.pp
  93. 6
      manifests/profile/base/horizon.pp
  94. 8
      manifests/profile/base/ironic.pp
  95. 12
      manifests/profile/base/ironic/api.pp
  96. 2
      manifests/profile/base/ironic/authtoken.pp
  97. 36
      manifests/profile/base/ironic/conductor.pp
  98. 14
      manifests/profile/base/ironic_inspector.pp
  99. 2
      manifests/profile/base/ironic_inspector/authtoken.pp
  100. 2
      manifests/profile/base/keepalived.pp

2
manifests/certmonger/etcd.pp

@ -42,7 +42,7 @@ class tripleo::certmonger::etcd (
$certmonger_ca = hiera('certmonger_ca', 'local'),
$principal = undef,
) {
include ::certmonger
include certmonger
$postsave_cmd = 'systemctl reload etcd'
certmonger_certificate { 'etcd' :

4
manifests/certmonger/haproxy.pp

@ -58,8 +58,8 @@ define tripleo::certmonger::haproxy (
$principal = undef,
$postsave_cmd = undef,
){
include ::certmonger
include ::haproxy::params
include certmonger
include haproxy::params
if $certmonger_ca == 'local' {
if defined(Class['::haproxy']) {
Class['::tripleo::certmonger::ca::local'] ~> Class['::haproxy']

4
manifests/certmonger/httpd.pp

@ -53,8 +53,8 @@ define tripleo::certmonger::httpd (
$postsave_cmd = undef,
$principal = undef,
) {
include ::certmonger
include ::apache::params
include certmonger
include apache::params
if $dnsnames {
$dnsnames_real = $dnsnames

4
manifests/certmonger/libvirt.pp

@ -52,8 +52,8 @@ define tripleo::certmonger::libvirt (
$postsave_cmd = undef,
$principal = undef,
) {
include ::certmonger
include ::nova::params
include certmonger
include nova::params
$postsave_cmd_real = pick($postsave_cmd, "systemctl reload ${::nova::params::libvirt_service_name}")
certmonger_certificate { $name :

4
manifests/certmonger/libvirt_vnc.pp

@ -58,8 +58,8 @@ define tripleo::certmonger::libvirt_vnc (
$cacertfile = undef,
$notify_service = undef,
) {
include ::certmonger
include ::nova::params
include certmonger
include nova::params
$notify_service_real = pick($notify_service, $::nova::params::libvirt_service_name)

4
manifests/certmonger/metrics_qdr.pp

@ -54,8 +54,8 @@ class tripleo::certmonger::metrics_qdr (
$postsave_cmd = undef,
$principal = undef,
) {
include ::certmonger
include ::qdr::params
include certmonger
include qdr::params
ensure_resource('file', '/usr/bin/certmonger-metrics-qdr-refresh.sh', {
source => 'puppet:///modules/tripleo/certmonger-metrics-qdr-refresh.sh',

2
manifests/certmonger/mysql.pp

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

2
manifests/certmonger/neutron.pp

@ -46,7 +46,7 @@ class tripleo::certmonger::neutron (
$postsave_cmd = undef,
$principal = undef,
) {
include ::certmonger
include certmonger
ensure_resource('file', '/usr/bin/certmonger-neutron-dhcpd-refresh.sh', {
source => 'puppet:///modules/tripleo/certmonger-neutron-dhcpd-refresh.sh',

2
manifests/certmonger/neutron_ovn.pp

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

4
manifests/certmonger/novnc_proxy.pp

@ -55,8 +55,8 @@ class tripleo::certmonger::novnc_proxy (
$postsave_cmd = undef,
$principal = undef,
) {
include ::certmonger
include ::nova::params
include certmonger
include nova::params
$notify_service_real = pick($notify_service, $::nova::params::vncproxy_service_name)

2
manifests/certmonger/opendaylight.pp

@ -47,7 +47,7 @@ class tripleo::certmonger::opendaylight (
$postsave_cmd = 'if systemctl -q is-active opendaylight; then systemctl restart opendaylight; else true; fi',
$principal = undef,
) {
include ::certmonger
include certmonger
certmonger_certificate { 'opendaylight' :
ensure => 'present',

2
manifests/certmonger/openvswitch.pp

@ -47,7 +47,7 @@ class tripleo::certmonger::openvswitch (
$postsave_cmd = 'systemctl reload openvswitch',
$principal = undef,
) {
include ::certmonger
include certmonger
certmonger_certificate { 'openvswitch' :
ensure => 'present',

2
manifests/certmonger/ovn_controller.pp

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

2
manifests/certmonger/ovn_dbs.pp

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

2
manifests/certmonger/ovn_metadata.pp

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

4
manifests/certmonger/qemu.pp

@ -56,8 +56,8 @@ define tripleo::certmonger::qemu (
$postsave_cmd = undef,
$principal = undef,
) {
include ::certmonger
include ::nova::params
include certmonger
include nova::params
certmonger_certificate { $name :
ensure => 'present',

2
manifests/certmonger/rabbitmq.pp

@ -47,7 +47,7 @@ class tripleo::certmonger::rabbitmq (
$postsave_cmd = undef,
$principal = undef,
) {
include ::certmonger
include certmonger
ensure_resource('file', '/usr/bin/certmonger-rabbitmq-refresh.sh', {
source => 'puppet:///modules/tripleo/certmonger-rabbitmq-refresh.sh',

2
manifests/certmonger/redis.pp

@ -54,7 +54,7 @@ class tripleo::certmonger::redis (
$postsave_cmd = undef,
$principal = undef,
) {
include ::certmonger
include certmonger
ensure_resource('file', '/usr/bin/certmonger-redis-refresh.sh', {
source => 'puppet:///modules/tripleo/certmonger-redis-refresh.sh',

2
manifests/firewall/pre.pp

@ -29,7 +29,7 @@ class tripleo::firewall::pre(
){
# ensure the correct packages are installed
include ::firewall
include firewall
# defaults 'pre' rules
tripleo::firewall::rule{ '000 accept related established rules':

10
manifests/haproxy.pp

@ -849,7 +849,7 @@ class tripleo::haproxy (
$httplog = {}
}
class { '::haproxy':
class { 'haproxy':
service_manage => $haproxy_service_manage,
global_options => merge($haproxy_global_options, $haproxy_daemonize, $haproxy_globals_override),
defaults_options => merge($haproxy_defaults_options, $httplog, $haproxy_defaults_override),
@ -888,7 +888,7 @@ class tripleo::haproxy (
$haproxy_stats_ips_raw = union(any2array($controller_virtual_ip), any2array($haproxy_stats_bind_address))
$haproxy_stats_ips = delete_undef_values($haproxy_stats_ips_raw)
class { '::tripleo::haproxy::stats':
class { 'tripleo::haproxy::stats':
haproxy_listen_bind_param => $haproxy_listen_bind_param,
ip => $haproxy_stats_ips,
password => $haproxy_stats_password,
@ -1277,7 +1277,7 @@ class tripleo::haproxy (
}
if $horizon {
class { '::tripleo::haproxy::horizon_endpoint':
class { 'tripleo::haproxy::horizon_endpoint':
public_virtual_ip => $public_virtual_ip,
internal_ip => hiera('horizon_vip', $controller_virtual_ip),
haproxy_listen_bind_param => $haproxy_listen_bind_param,
@ -1378,7 +1378,7 @@ class tripleo::haproxy (
options => $mysql_member_options_real,
}
if $manage_firewall {
include ::tripleo::firewall
include tripleo::firewall
$mysql_firewall_rules = {
'100 mysql_haproxy' => {
'dport' => 3306,
@ -1475,7 +1475,7 @@ class tripleo::haproxy (
verifyhost => false,
}
if $manage_firewall {
include ::tripleo::firewall
include tripleo::firewall
$redis_firewall_rules = {
'100 redis_haproxy' => {
'dport' => 6379,

2
manifests/haproxy/endpoint.pp

@ -272,7 +272,7 @@ define tripleo::haproxy::endpoint (
}
if $manage_firewall {
include ::tripleo::firewall
include tripleo::firewall
# This block will construct firewall rules only when we specify
# a port for the regular service and also the ssl port for the service.
# It makes sure we're not trying to create TCP iptables rules where no port

2
manifests/haproxy/horizon_endpoint.pp

@ -167,7 +167,7 @@ class tripleo::haproxy::horizon_endpoint (
}
}
if $manage_firewall {
include ::tripleo::firewall
include tripleo::firewall
$haproxy_horizon_firewall_rules = {
'100 horizon_haproxy' => {
'dport' => 80,

2
manifests/host/sriov/numvfs_persistence.pp

@ -24,7 +24,7 @@ define tripleo::host::sriov::numvfs_persistence(
# Since reduce isn't available, we use recursion to iterate each entries of
# "physical_interface:vfs" and accumulate the content that needs to be
# written to the script file.
include ::stdlib
include stdlib
if empty($vf_defs) {
file { '/etc/sysconfig/allocate_vfs':

2
manifests/keepalived.pp

@ -118,7 +118,7 @@ class tripleo::keepalived (
$keepalived_vrrp_script_real = $keepalived_vrrp_script
}
class { '::keepalived': }
class { 'keepalived': }
keepalived::vrrp_script { 'haproxy':
name_is_process => $keepalived_name_is_process,
script => $keepalived_vrrp_script_real,

4
manifests/network/contrail/neutron_plugin.pp

@ -120,8 +120,8 @@ class tripleo::network::contrail::neutron_plugin (
$package_ensure = 'present',
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
validate_legacy(Array, 'validate_array', $contrail_extensions)

2
manifests/network/contrail/vrouter.pp

@ -173,7 +173,7 @@ class tripleo::network::contrail::vrouter (
notify { 'cidr':
message => $cidr,
}
#include ::contrail::vrouter
#include contrail::vrouter
# NOTE: it's not possible to use this class without a functional
# contrail controller up and running
if size($control_server) == 0 {

2
manifests/network/os_net_config.pp

@ -19,7 +19,7 @@
#
class tripleo::network::os_net_config {
include ::vswitch::ovs
include vswitch::ovs
ensure_packages('os-net-config', { ensure => present })
exec { 'os-net-config':

2
manifests/packages.pp

@ -33,7 +33,7 @@ class tripleo::packages (
) {
# required for stages
include ::stdlib
include stdlib
# if both enable_install and enabled_upgrade are false *or* if we're in containers we noop package installations
if (!str2bool($enable_install) and !str2bool($enable_upgrade)) or $::deployment_type == 'containers' {

2
manifests/packages/upgrades.pp

@ -20,7 +20,7 @@
class tripleo::packages::upgrades {
# required for stages
include ::stdlib
include stdlib
case $::osfamily {
'RedHat': {

12
manifests/profile/base/aodh.pp

@ -101,7 +101,7 @@ class tripleo::profile::base::aodh (
if $step >= 4 or ($step >= 3 and $sync_db) {
$oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
$oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
class { '::aodh' :
class { 'aodh' :
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
@ -119,11 +119,11 @@ class tripleo::profile::base::aodh (
'ssl' => $oslomsg_notify_use_ssl_real,
}),
}
include ::aodh::auth
include ::aodh::config
include ::aodh::client
include ::aodh::db::sync
include ::aodh::logging
include aodh::auth
include aodh::config
include aodh::client
include aodh::db::sync
include aodh::logging
}
}

10
manifests/profile/base/aodh/api.pp

@ -62,8 +62,8 @@ class tripleo::profile::base::aodh::api (
$is_bootstrap = false
}
include ::tripleo::profile::base::aodh
include ::tripleo::profile::base::aodh::authtoken
include tripleo::profile::base::aodh
include tripleo::profile::base::aodh::authtoken
if $enable_internal_tls {
if !$aodh_network {
@ -79,9 +79,9 @@ class tripleo::profile::base::aodh::api (
if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
warning('Service aodh is deprecated. Please take in mind, that it is going to be removed in T release.')
include ::aodh::api
include ::tripleo::profile::base::apache
class { '::aodh::wsgi::apache':
include aodh::api
include tripleo::profile::base::apache
class { 'aodh::wsgi::apache':
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,
}

2
manifests/profile/base/aodh/authtoken.pp

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

4
manifests/profile/base/aodh/evaluator.pp

@ -32,7 +32,7 @@ class tripleo::profile::base::aodh::evaluator (
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::aodh
include tripleo::profile::base::aodh
if $enable_internal_tls {
$tls_query_param = '?ssl=true'
} else {
@ -41,7 +41,7 @@ class tripleo::profile::base::aodh::evaluator (
if $step >= 4 {
warning('Service aodh is deprecated. Please take in mind, that it is going to be removed in T release.')
class { '::aodh::evaluator':
class { 'aodh::evaluator':
coordination_url => join(['redis://:', hiera('aodh_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/', $tls_query_param]),
}
}

4
manifests/profile/base/aodh/listener.pp

@ -27,11 +27,11 @@ class tripleo::profile::base::aodh::listener (
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::aodh
include tripleo::profile::base::aodh
if $step >= 4 {
warning('Service aodh is deprecated. Please take in mind, that it is going to be removed in T release.')
include ::aodh::listener
include aodh::listener
}
}

4
manifests/profile/base/aodh/notifier.pp

@ -27,11 +27,11 @@ class tripleo::profile::base::aodh::notifier (
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::aodh
include tripleo::profile::base::aodh
if $step >= 4 {
warning('Service aodh is deprecated. Please take in mind, that it is going to be removed in T release.')
include ::aodh::notifier
include aodh::notifier
}
}

10
manifests/profile/base/apache.pp

@ -36,23 +36,23 @@ class tripleo::profile::base::apache(
String $status_listener = '127.0.0.1:80',
String $mpm_module = 'prefork',
) {
include ::apache::params
include apache::params
# rhel8/fedora will be python3. See LP#1813053
if ($::os['name'] == 'Fedora') or ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
class { '::apache':
class { 'apache':
mod_packages => merge($::apache::params::mod_packages, { 'wsgi' => 'python3-mod_wsgi' }),
mod_libs => merge($::apache::params::mod_libs, { 'wsgi' => 'mod_wsgi_python3.so' }),
mpm_module => $mpm_module,
}
} else {
class { '::apache':
class { 'apache':
mpm_module => $mpm_module,
}
}
Service <| title == 'httpd' |> { provider => 'noop' }
include ::apache::mod::status
include ::apache::mod::ssl
include apache::mod::status
include apache::mod::ssl
if $enable_status_listener {
if !defined(Apache::Listen[$status_listener]) {
::apache::listen {$status_listener: }

2
manifests/profile/base/auditd.pp

@ -25,6 +25,6 @@ class tripleo::profile::base::auditd (
$step = Integer(hiera('step')),
) {
if $step >= 4 {
include ::auditd
include auditd
}
}

6
manifests/profile/base/barbican.pp

@ -29,8 +29,8 @@ class tripleo::profile::base::barbican (
) {
if $step >= 3 {
include ::barbican
include ::barbican::config
include ::barbican::client
include barbican
include barbican::config
include barbican::client
}
}

20
manifests/profile/base/barbican/api.pp

@ -132,15 +132,15 @@ class tripleo::profile::base::barbican::api (
$tls_keyfile = undef
}
include ::tripleo::profile::base::barbican
include ::tripleo::profile::base::barbican::authtoken
include tripleo::profile::base::barbican
include tripleo::profile::base::barbican::authtoken
if $step >= 4 or ( $step >= 3 and $sync_db ) {
include ::tripleo::profile::base::barbican::backends
include tripleo::profile::base::barbican::backends
$oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
$oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
class { '::barbican::api':
class { 'barbican::api':
sync_db => $sync_db,
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
@ -161,12 +161,12 @@ class tripleo::profile::base::barbican::api (
multiple_secret_stores_enabled => true,
enabled_secret_stores => $::tripleo::profile::base::barbican::backends::enabled_secret_stores,
}
include ::barbican::keystone::authtoken
include ::barbican::api::logging
include ::barbican::keystone::notification
include ::barbican::quota
include ::tripleo::profile::base::apache
class { '::barbican::wsgi::apache':
include barbican::keystone::authtoken
include barbican::api::logging
include barbican::keystone::notification
include barbican::quota
include tripleo::profile::base::apache
class { 'barbican::wsgi::apache':
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,
}

2
manifests/profile/base/barbican/authtoken.pp

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

8
manifests/profile/base/barbican/backends.pp

@ -54,28 +54,28 @@ class tripleo::profile::base::barbican::backends (
$kmip_backend_enabled = hiera('barbican_backend_kmip_enabled', false),
) {
if $simple_crypto_backend_enabled {
include ::barbican::plugins::simple_crypto
include barbican::plugins::simple_crypto
$backend1 = 'simple_crypto'
} else {
$backend1 = undef
}
if $dogtag_backend_enabled {
include ::barbican::plugins::dogtag
include barbican::plugins::dogtag
$backend2 = 'dogtag'
} else {
$backend2 = undef
}
if $p11_crypto_backend_enabled {
include ::barbican::plugins::p11_crypto
include barbican::plugins::p11_crypto
$backend3 = 'pkcs11'
} else {
$backend3 = undef
}
if $kmip_backend_enabled {
include ::barbican::plugins::kmip
include barbican::plugins::kmip
$backend4 = 'kmip'
} else {
$backend4 = undef

6
manifests/profile/base/ceilometer.pp

@ -112,7 +112,7 @@ class tripleo::profile::base::ceilometer (
$oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
$oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
class { '::ceilometer' :
class { 'ceilometer' :
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
@ -153,7 +153,7 @@ class tripleo::profile::base::ceilometer (
pipeline_publishers => $pipeline_publishers,
}
}
include ::ceilometer::config
include ::ceilometer::logging
include ceilometer::config
include ceilometer::logging
}
}

8
manifests/profile/base/ceilometer/agent/notification.pp

@ -26,12 +26,12 @@
class tripleo::profile::base::ceilometer::agent::notification (
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::ceilometer
include ::tripleo::profile::base::ceilometer::upgrade
include tripleo::profile::base::ceilometer
include tripleo::profile::base::ceilometer::upgrade
if $step >= 4 {
include ::ceilometer::agent::auth
include ::ceilometer::agent::notification
include ceilometer::agent::auth
include ceilometer::agent::notification
}
}

8
manifests/profile/base/ceilometer/agent/polling.pp

@ -54,10 +54,10 @@ class tripleo::profile::base::ceilometer::agent::polling (
$redis_vip = hiera('redis_vip', undef),
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::ceilometer
include tripleo::profile::base::ceilometer
if $central_namespace {
include ::tripleo::profile::base::ceilometer::upgrade
include tripleo::profile::base::ceilometer::upgrade
}
if $enable_internal_tls {
@ -67,8 +67,8 @@ class tripleo::profile::base::ceilometer::agent::polling (
}
if $step >= 4 {
include ::ceilometer::agent::auth
class { '::ceilometer::agent::polling':
include ceilometer::agent::auth
class { 'ceilometer::agent::polling':
central_namespace => $central_namespace,
compute_namespace => $compute_namespace,
ipmi_namespace => $ipmi_namespace,

4
manifests/profile/base/ceilometer/expirer.pp

@ -26,10 +26,10 @@
class tripleo::profile::base::ceilometer::expirer (
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::ceilometer
include tripleo::profile::base::ceilometer
if $step >= 4 {
include ::ceilometer::expirer
include ceilometer::expirer
Cron <| title == 'ceilometer-expirer' |>
{ command => "sleep $((\$(od -A n -t d -N 3 /dev/urandom) \\% 86400)) && ${::ceilometer::params::expirer_command}" }
}

2
manifests/profile/base/ceilometer/upgrade.pp

@ -54,7 +54,7 @@ class tripleo::profile::base::ceilometer::upgrade (
# NOTE(sileht): Ensure we run before ceilometer-agent-notification is
# started and after gnocchi-api is running
include ::gnocchi::deps
include gnocchi::deps
Anchor['gnocchi::service::end']
~> Exec['ceilometer-db-upgrade']
~> Anchor['ceilometer::service::begin']

22
manifests/profile/base/certmonger_user.pp

@ -199,13 +199,13 @@ class tripleo::profile::base::certmonger_user (
$haproxy_postsave_cmd = undef,
$apache_postsave_cmd = undef,
) {
include ::certmonger
include certmonger
if $step == 1 {
# This is only needed for certmonger's local CA. For any other CA this
# operation (trusting the CA) should be done by the deployer.
if $certmonger_ca == 'local' {
include ::tripleo::certmonger::ca::local
include tripleo::certmonger::ca::local
}
unless empty($haproxy_certificates_specs) {
$reload_haproxy = ['systemctl reload haproxy']
@ -216,38 +216,38 @@ class tripleo::profile::base::certmonger_user (
} else {
$reload_haproxy = []
}
class { '::tripleo::certmonger::ca::crl' :
class { 'tripleo::certmonger::ca::crl' :
reload_cmds => $reload_haproxy,
}
Certmonger_certificate<||> -> Class['::tripleo::certmonger::ca::crl']
include ::tripleo::certmonger::ca::libvirt_vnc
include ::tripleo::certmonger::ca::qemu
include tripleo::certmonger::ca::libvirt_vnc
include tripleo::certmonger::ca::qemu
# Remove apache_certificates_specs where hostname is empty.
# Workaround bug: https://bugs.launchpad.net/tripleo/+bug/1811207
$apache_certificates_specs_filtered = $apache_certificates_specs.filter | $specs, $keys | { ! empty($keys[hostname]) }
unless empty($apache_certificates_specs_filtered) {
include ::tripleo::certmonger::apache_dirs
include tripleo::certmonger::apache_dirs
ensure_resources('tripleo::certmonger::httpd', $apache_certificates_specs_filtered)
}
unless empty($libvirt_certificates_specs) {
include ::tripleo::certmonger::libvirt_dirs
include tripleo::certmonger::libvirt_dirs
ensure_resources('tripleo::certmonger::libvirt', $libvirt_certificates_specs,
{'postsave_cmd' => $libvirt_postsave_cmd})
}
unless empty($libvirt_vnc_certificates_specs) {
include ::tripleo::certmonger::libvirt_vnc_dirs
include tripleo::certmonger::libvirt_vnc_dirs
ensure_resources('tripleo::certmonger::libvirt_vnc', $libvirt_vnc_certificates_specs,
{'postsave_cmd' => $libvirt_vnc_postsave_cmd})
}
unless empty($qemu_certificates_specs) {
include ::tripleo::certmonger::qemu_dirs
include ::tripleo::certmonger::qemu_nbd_dirs
include tripleo::certmonger::qemu_dirs
include tripleo::certmonger::qemu_nbd_dirs
ensure_resources('tripleo::certmonger::qemu', $qemu_certificates_specs,
{'postsave_cmd' => $qemu_postsave_cmd})
}
unless empty($haproxy_certificates_specs) {
include ::tripleo::certmonger::haproxy_dirs
include tripleo::certmonger::haproxy_dirs
ensure_resources('tripleo::certmonger::haproxy', $haproxy_certificates_specs)
# The haproxy fronends (or listen resources) depend on the certificate
# existing and need to be refreshed if it changed.

16
manifests/profile/base/cinder.pp

@ -104,7 +104,7 @@ class tripleo::profile::base::cinder (
if $step >= 4 or ($step >= 3 and $sync_db) {
$oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
$oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
class { '::cinder' :
class { 'cinder' :
default_transport_url => os_transport_url({
'transport' => $oslomsg_rpc_proto,
'hosts' => $oslomsg_rpc_hosts,
@ -114,7 +114,7 @@ class tripleo::profile::base::cinder (
'ssl' => $oslomsg_rpc_use_ssl_real,
}),
}
class { '::cinder::ceilometer' :
class { 'cinder::ceilometer' :
notification_transport_url => os_transport_url({
'transport' => $oslomsg_notify_proto,
'hosts' => $oslomsg_notify_hosts,
@ -124,16 +124,16 @@ class tripleo::profile::base::cinder (
'ssl' => $oslomsg_notify_use_ssl_real,
}),
}
include ::cinder::config
include ::cinder::glance
include ::cinder::nova
include ::cinder::logging
include ::cinder::keystone::service_user
include cinder::config
include cinder::glance
include cinder::nova
include cinder::logging
include cinder::keystone::service_user
}
if $step >= 5 {
if $cinder_enable_db_purge {
include ::cinder::cron::db_purge
include cinder::cron::db_purge
}
}

12
manifests/profile/base/cinder/api.pp

@ -75,8 +75,8 @@ class tripleo::profile::base::cinder::api (
$manage_type = false
}
include ::tripleo::profile::base::cinder
include ::tripleo::profile::base::cinder::authtoken
include tripleo::profile::base::cinder
include tripleo::profile::base::cinder::authtoken
if $enable_internal_tls {
if !$cinder_api_network {
@ -90,16 +90,16 @@ class tripleo::profile::base::cinder::api (
}
if $step >= 4 or ($step >= 3 and $sync_db) {
class { '::cinder::api':
class { 'cinder::api':
sync_db => $sync_db,
keymgr_backend => $keymgr_backend,
}
include ::tripleo::profile::base::apache
class { '::cinder::wsgi::apache':
include tripleo::profile::base::apache
class { 'cinder::wsgi::apache':
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,
}
include ::cinder::ceilometer
include cinder::ceilometer
}
if $step == 4 and $manage_type and $default_volume_type != '' {

2
manifests/profile/base/cinder/authtoken.pp

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

4
manifests/profile/base/cinder/backup.pp

@ -27,10 +27,10 @@ class tripleo::profile::base::cinder::backup (
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder
include tripleo::profile::base::cinder
if $step >= 4 {
include ::cinder::backup
include cinder::backup
}
}

4
manifests/profile/base/cinder/backup/ceph.pp

@ -27,10 +27,10 @@ class tripleo::profile::base::cinder::backup::ceph (
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::backup
include tripleo::profile::base::cinder::backup
if $step >= 4 {
include ::cinder::backup::ceph
include cinder::backup::ceph
}
}

4
manifests/profile/base/cinder/backup/nfs.pp

@ -27,10 +27,10 @@ class tripleo::profile::base::cinder::backup::nfs (
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::backup
include tripleo::profile::base::cinder::backup
if $step >= 4 {
include ::cinder::backup::nfs
include cinder::backup::nfs
}
}

4
manifests/profile/base/cinder/backup/swift.pp

@ -27,10 +27,10 @@ class tripleo::profile::base::cinder::backup::swift (
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::backup
include tripleo::profile::base::cinder::backup
if $step >= 4 {
include ::cinder::backup::swift
include cinder::backup::swift
}
}

4
manifests/profile/base/cinder/scheduler.pp

@ -26,10 +26,10 @@
class tripleo::profile::base::cinder::scheduler (
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder
include tripleo::profile::base::cinder
if $step >= 4 {
include ::cinder::scheduler
include cinder::scheduler
}
}

38
manifests/profile/base/cinder/volume.pp

@ -136,7 +136,7 @@ class tripleo::profile::base::cinder::volume (
$etcd_port = hiera('tripleo::profile::base::etcd::client_port', '2379'),
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder
include tripleo::profile::base::cinder
if $step >= 4 {
if $cinder_volume_cluster == '' {
@ -158,38 +158,38 @@ class tripleo::profile::base::cinder::volume (
$protocol = 'http'
}
$backend_url = sprintf('etcd3+%s://%s:%s', $protocol, $etcd_host, $etcd_port)
class { '::cinder::coordination' :
class { 'cinder::coordination' :
backend_url => $backend_url,
}
}
class { '::cinder::volume' :
class { 'cinder::volume' :
cluster => $cinder_volume_cluster_real,
}
if $cinder_enable_pure_backend {
include ::tripleo::profile::base::cinder::volume::pure
include tripleo::profile::base::cinder::volume::pure
$cinder_pure_backend_name = hiera('cinder::backend::pure::volume_backend_name', 'tripleo_pure')
} else {
$cinder_pure_backend_name = undef
}
if $cinder_enable_dellsc_backend {
include ::tripleo::profile::base::cinder::volume::dellsc
include tripleo::profile::base::cinder::volume::dellsc
$cinder_dellsc_backend_name = hiera('cinder::backend::dellsc_iscsi::volume_backend_name', 'tripleo_dellsc')
} else {
$cinder_dellsc_backend_name = undef
}
if $cinder_enable_dellemc_unity_backend {
include ::tripleo::profile::base::cinder::volume::dellemc_unity
include tripleo::profile::base::cinder::volume::dellemc_unity
$cinder_dellemc_unity_backend_name = hiera('cinder::backend::dellemc_unity::volume_backend_name', 'tripleo_dellemc_unity')
} else {
$cinder_dellemc_unity_backend_name = undef
}
if $cinder_enable_dellemc_vmax_iscsi_backend {
include ::tripleo::profile::base::cinder::volume::dellemc_vmax_iscsi
include tripleo::profile::base::cinder::volume::dellemc_vmax_iscsi
$cinder_dellemc_vmax_iscsi_backend_name = hiera('cinder::backend::dellemc_vmax_iscsi::volume_backend_name',
'tripleo_dellemc_vmax_iscsi')
} else {
@ -197,7 +197,7 @@ class tripleo::profile::base::cinder::volume (
}
if $cinder_enable_dellemc_vnx_backend {
include ::tripleo::profile::base::cinder::volume::dellemc_vnx
include tripleo::profile::base::cinder::volume::dellemc_vnx
$cinder_dellemc_vnx_backend_name = hiera('cinder::backend::emc_vnx::volume_backend_name',
'tripleo_dellemc_vnx')
} else {
@ -205,7 +205,7 @@ class tripleo::profile::base::cinder::volume (
}
if $cinder_enable_dellemc_xtremio_iscsi_backend {
include ::tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi
include tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi
$cinder_dellemc_xtreamio_iscsi_backend_name = hiera('cinder::backend::dellemc_extremio_iscsi::volume_backend_name',
'tripleo_dellemc_xtremio_iscsi')
} else {
@ -213,42 +213,42 @@ class tripleo::profile::base::cinder::volume (
}
if $cinder_enable_hpelefthand_backend {
include ::tripleo::profile::base::cinder::volume::hpelefthand
include tripleo::profile::base::cinder::volume::hpelefthand
$cinder_hpelefthand_backend_name = hiera('cinder::backend::hpelefthand_iscsi::volume_backend_name', 'tripleo_hpelefthand')
} else {
$cinder_hpelefthand_backend_name = undef
}
if $cinder_enable_dellps_backend {
include ::tripleo::profile::base::cinder::volume::dellps
include tripleo::profile::base::cinder::volume::dellps
$cinder_dellps_backend_name = hiera('cinder::backend::dellps::volume_backend_name', 'tripleo_dellps')
} else {
$cinder_dellps_backend_name = undef
}
if $cinder_enable_iscsi_backend {
include ::tripleo::profile::base::cinder::volume::iscsi
include tripleo::profile::base::cinder::volume::iscsi
$cinder_iscsi_backend_name = hiera('cinder::backend::iscsi::volume_backend_name', 'tripleo_iscsi')
} else {
$cinder_iscsi_backend_name = undef
}
if $cinder_enable_netapp_backend {
include ::tripleo::profile::base::cinder::volume::netapp
include tripleo::profile::base::cinder::volume::netapp
$cinder_netapp_backend_name = hiera('cinder::backend::netapp::volume_backend_name', 'tripleo_netapp')
} else {
$cinder_netapp_backend_name = undef
}
if $cinder_enable_nfs_backend {
include ::tripleo::profile::base::cinder::volume::nfs
include tripleo::profile::base::cinder::volume::nfs
$cinder_nfs_backend_name = hiera('cinder::backend::nfs::volume_backend_name', 'tripleo_nfs')
} else {
$cinder_nfs_backend_name = undef
}
if $cinder_enable_rbd_backend {
include ::tripleo::profile::base::cinder::volume::rbd
include tripleo::profile::base::cinder::volume::rbd
$cinder_rbd_backend_name = hiera('cinder::backend::rbd::volume_backend_name', 'tripleo_ceph')
exec{ "exec-setfacl-${cinder_rbd_client_name}-cinder":
@ -275,21 +275,21 @@ class tripleo::profile::base::cinder::volume (
}
if $cinder_enable_scaleio_backend {
include ::tripleo::profile::base::cinder::volume::scaleio
include tripleo::profile::base::cinder::volume::scaleio
$cinder_scaleio_backend_name = hiera('cinder::backend::scaleio::volume_backend_name', 'tripleo_scaleio')
} else {
$cinder_scaleio_backend_name = undef
}
if $cinder_enable_vrts_hs_backend {
include ::tripleo::profile::base::cinder::volume::veritas_hyperscale
include tripleo::profile::base::cinder::volume::veritas_hyperscale
$cinder_veritas_hyperscale_backend_name = 'Veritas_HyperScale'
} else {
$cinder_veritas_hyperscale_backend_name = undef
}
if $cinder_enable_nvmeof_backend {
include ::tripleo::profile::base::cinder::volume::nvmeof
include tripleo::profile::base::cinder::volume::nvmeof
$cinder_nvmeof_backend_name = hiera('cinder::backend::nvmeof::volume_backend_name', 'tripleo_nvmeof')
} else {
$cinder_nvmeof_backend_name = undef
@ -318,7 +318,7 @@ class tripleo::profile::base::cinder::volume (
# "" strings in our array.
$cinder_enabled_backends = delete($backends, '')
class { '::cinder::backends' :
class { 'cinder::backends' :
enabled_backends => $cinder_enabled_backends,
}
}

2
manifests/profile/base/cinder/volume/dellemc_unity.pp

@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::dellemc_unity (
$backend_name = hiera('cinder::backend::dellemc_unity::volume_backend_name', 'tripleo_dellemc_unity'),
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::volume
include tripleo::profile::base::cinder::volume
if $step >= 4 {
cinder::backend::dellemc_unity { $backend_name :

2
manifests/profile/base/cinder/volume/dellemc_vmax_iscsi.pp

@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::dellemc_vmax_iscsi (
$backend_name = hiera('cinder::backend::dellemc_vmax_iscsi::volume_backend_name', 'tripleo_dellemc_vmax_iscsi'),
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::volume
include tripleo::profile::base::cinder::volume
if $step >= 4 {
cinder::backend::dellemc_vmax_iscsi { $backend_name :

2
manifests/profile/base/cinder/volume/dellemc_vnx.pp

@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::dellemc_vnx (
$backend_name = hiera('cinder::backend::emc_vnx::volume_backend_name', 'tripleo_dellemc_vnx'),
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::volume
include tripleo::profile::base::cinder::volume
if $step >= 4 {
# Accept recently deprecated 'storage_vnx_pool_name'

2
manifests/profile/base/cinder/volume/dellemc_xtremio_iscsi.pp

@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::dellemc_xtremio_iscsi (
$backend_name = hiera('cinder::backend::dellemc_xtremio_iscsi::volume_backend_name', 'tripleo_dellemc_xtremio_iscsi'),
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::volume
include tripleo::profile::base::cinder::volume
if $step >= 4 {
cinder::backend::dellemc_xtremio_iscsi { $backend_name :

2
manifests/profile/base/cinder/volume/dellps.pp

@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::dellps (
$backend_name = hiera('cinder::backend::eqlx::volume_backend_name', 'tripleo_dellps'),
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::volume
include tripleo::profile::base::cinder::volume
if $step >= 4 {
cinder::backend::eqlx { $backend_name :

2
manifests/profile/base/cinder/volume/dellsc.pp

@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::dellsc (
$backend_name = hiera('cinder::backend::dellsc_iscsi::volume_backend_name', 'tripleo_dellsc'),
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::volume
include tripleo::profile::base::cinder::volume
if $step >= 4 {

2
manifests/profile/base/cinder/volume/hpelefthand.pp

@ -60,7 +60,7 @@ class tripleo::profile::base::cinder::volume::hpelefthand (
$cinder_hpelefthand_debug = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_debug', undef),
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::volume
include tripleo::profile::base::cinder::volume
if $step >= 4 {
cinder::backend::hpelefthand_iscsi { $backend_name :

4
manifests/profile/base/cinder/volume/iscsi.pp

@ -55,10 +55,10 @@ class tripleo::profile::base::cinder::volume::iscsi (
$cinder_lvm_loop_device_size = '10280',
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::volume
include tripleo::profile::base::cinder::volume
if $step >= 4 {
class { '::cinder::setup_test_volume':
class { 'cinder::setup_test_volume':
size => join([$cinder_lvm_loop_device_size, 'M']),
}

2
manifests/profile/base/cinder/volume/netapp.pp

@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::netapp (
$backend_name = hiera('cinder::backend::netapp::volume_backend_name', 'tripleo_netapp'),
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::volume
include tripleo::profile::base::cinder::volume
if $step >= 4 {
if hiera('cinder::backend::netapp::nfs_shares', undef) {

2
manifests/profile/base/cinder/volume/nfs.pp

@ -69,7 +69,7 @@ class tripleo::profile::base::cinder::volume::nfs (
$cinder_nas_secure_file_permissions = $::os_service_default,
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::cinder::volume
include tripleo::profile::base::cinder::volume
if $step >= 4 {
package {'nfs-utils': }