Merge "Convert all class usage to relative names"
This commit is contained in:
commit
bd6da86d80
@ -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' :
|
||||
|
@ -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']
|
||||
|
@ -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
|
||||
|
@ -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 :
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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',
|
||||
|
@ -55,7 +55,7 @@ class tripleo::certmonger::mysql (
|
||||
$postsave_cmd = undef,
|
||||
$principal = undef,
|
||||
) {
|
||||
include ::certmonger
|
||||
include certmonger
|
||||
|
||||
certmonger_certificate { 'mysql' :
|
||||
ensure => 'present',
|
||||
|
@ -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',
|
||||
|
@ -46,7 +46,7 @@ class tripleo::certmonger::neutron_ovn (
|
||||
$postsave_cmd = undef,
|
||||
$principal = undef,
|
||||
) {
|
||||
include ::certmonger
|
||||
include certmonger
|
||||
|
||||
certmonger_certificate { 'neutron_ovn' :
|
||||
ensure => 'present',
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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',
|
||||
|
@ -47,7 +47,7 @@ class tripleo::certmonger::openvswitch (
|
||||
$postsave_cmd = 'systemctl reload openvswitch',
|
||||
$principal = undef,
|
||||
) {
|
||||
include ::certmonger
|
||||
include certmonger
|
||||
|
||||
certmonger_certificate { 'openvswitch' :
|
||||
ensure => 'present',
|
||||
|
@ -46,7 +46,7 @@ class tripleo::certmonger::ovn_controller (
|
||||
$postsave_cmd = undef,
|
||||
$principal = undef,
|
||||
) {
|
||||
include ::certmonger
|
||||
include certmonger
|
||||
|
||||
certmonger_certificate { 'ovn_controller' :
|
||||
ensure => 'present',
|
||||
|
@ -46,7 +46,7 @@ class tripleo::certmonger::ovn_dbs (
|
||||
$postsave_cmd = undef,
|
||||
$principal = undef,
|
||||
) {
|
||||
include ::certmonger
|
||||
include certmonger
|
||||
|
||||
certmonger_certificate { 'ovn_dbs' :
|
||||
ensure => 'present',
|
||||
|
@ -46,7 +46,7 @@ class tripleo::certmonger::ovn_metadata (
|
||||
$postsave_cmd = undef,
|
||||
$principal = undef,
|
||||
) {
|
||||
include ::certmonger
|
||||
include certmonger
|
||||
|
||||
certmonger_certificate { 'ovn_metadata' :
|
||||
ensure => 'present',
|
||||
|
@ -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',
|
||||
|
@ -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',
|
||||
|
@ -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',
|
||||
|
@ -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':
|
||||
|
@ -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,
|
||||
|
@ -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
|
||||
|
@ -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,
|
||||
|
@ -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':
|
||||
|
@ -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,
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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 {
|
||||
|
@ -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':
|
||||
|
@ -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' {
|
||||
|
@ -20,7 +20,7 @@
|
||||
class tripleo::packages::upgrades {
|
||||
|
||||
# required for stages
|
||||
include ::stdlib
|
||||
include stdlib
|
||||
|
||||
case $::osfamily {
|
||||
'RedHat': {
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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,
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
@ -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]),
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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: }
|
||||
|
@ -25,6 +25,6 @@ class tripleo::profile::base::auditd (
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
if $step >= 4 {
|
||||
include ::auditd
|
||||
include auditd
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
@ -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,
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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,
|
||||
|
@ -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}" }
|
||||
}
|
||||
|
@ -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']
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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 != '' {
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -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,
|
||||
}
|
||||
}
|
||||
|
@ -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 :
|
||||
|
@ -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 :
|
||||
|
@ -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'
|
||||
|
@ -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 :
|
||||
|
@ -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 :
|
||||
|
@ -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 {
|
||||
|
||||
|
@ -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 :
|
||||
|
@ -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']),
|
||||
}
|
||||
|
||||
|
@ -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) {
|
||||
|
@ -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': }
|
||||
|
@ -59,7 +59,7 @@ class tripleo::profile::base::cinder::volume::nvmeof (
|
||||
$volume_driver = 'cinder.volume.drivers.lvm.LVMVolumeDriver',
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include ::tripleo::profile::base::cinder::volume
|
||||
include tripleo::profile::base::cinder::volume
|
||||
|
||||
if $step >= 4 {
|
||||
cinder::backend::nvmeof { $volume_backend_name :
|
||||
|
@ -36,7 +36,7 @@ class tripleo::profile::base::cinder::volume::pure (
|
||||
$multi_config = hiera('cinder::backend::pure::volume_multi_config', {}),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include ::tripleo::profile::base::cinder::volume
|
||||
include tripleo::profile::base::cinder::volume
|
||||
|
||||
if $step >= 4 {
|
||||
$backend_defaults = {
|
||||
|
@ -75,7 +75,7 @@ class tripleo::profile::base::cinder::volume::rbd (
|
||||
$cinder_rbd_flatten_volume_from_snapshot = hiera('cinder::backend::rbd::flatten_volume_from_snapshot', undef),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include ::tripleo::profile::base::cinder::volume
|
||||
include tripleo::profile::base::cinder::volume
|
||||
|
||||
if $step >= 4 {
|
||||
cinder::backend::rbd { $backend_name :
|
||||
|
@ -31,7 +31,7 @@ class tripleo::profile::base::cinder::volume::scaleio (
|
||||
$backend_name = hiera('cinder::backend::scaleio::volume_backend_name', 'tripleo_scaleio'),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include ::tripleo::profile::base::cinder::volume
|
||||
include tripleo::profile::base::cinder::volume
|
||||
|
||||
if $step >= 4 {
|
||||
cinder::backend::scaleio { $backend_name :
|
||||
|
@ -34,7 +34,7 @@ class tripleo::profile::base::cinder::volume::veritas_hyperscale (
|
||||
$backend_name = hiera('cinder::backend::veritas_hyperscale::volume_backend_name', 'Veritas_HyperScale'),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include ::tripleo::profile::base::cinder::volume
|
||||
include tripleo::profile::base::cinder::volume
|
||||
|
||||
if $step >= 4 {
|
||||
cinder::backend::veritas_hyperscale { $backend_name :
|
||||
|
@ -177,7 +177,7 @@ class tripleo::profile::base::database::mysql (
|
||||
}
|
||||
}
|
||||
$mysql_server_options_real = deep_merge($mysql_server_default, $mysql_server_options)
|
||||
class { '::mysql::server':
|
||||
class { 'mysql::server':
|
||||
config_file => $mysql_config_file,
|
||||
override_options => $mysql_server_options_real,
|
||||
create_root_user => $manage_resources,
|
||||
@ -206,77 +206,77 @@ class tripleo::profile::base::database::mysql (
|
||||
if $step >= 2 and $sync_db {
|
||||
Class['::mysql::server'] -> Mysql_database<||>
|
||||
if hiera('aodh_api_enabled', false) {
|
||||
include ::aodh::db::mysql
|
||||
include aodh::db::mysql
|
||||
}
|
||||
if hiera('ceilometer_collector_enabled', false) {
|
||||
include ::ceilometer::db::mysql
|
||||
include ceilometer::db::mysql
|
||||
}
|
||||
if hiera('cinder_api_enabled', false) {
|
||||
include ::cinder::db::mysql
|
||||
include cinder::db::mysql
|
||||
}
|
||||
if hiera('barbican_api_enabled', false) {
|
||||
include ::barbican::db::mysql
|
||||
include barbican::db::mysql
|
||||
}
|
||||
if hiera('designate_api_enabled', false) {
|
||||
include ::designate::db::mysql
|
||||
include designate::db::mysql
|
||||
}
|
||||
if hiera('glance_api_enabled', false) {
|
||||
include ::glance::db::mysql
|
||||
include glance::db::mysql
|
||||
}
|
||||
if hiera('gnocchi_api_enabled', false) {
|
||||
include ::gnocchi::db::mysql
|
||||
include gnocchi::db::mysql
|
||||
}
|
||||
if hiera('heat_engine_enabled', false) {
|
||||
include ::heat::db::mysql
|
||||
include heat::db::mysql
|
||||
}
|
||||
if hiera('ironic_api_enabled', false) {
|
||||
include ::ironic::db::mysql
|
||||
include ironic::db::mysql
|
||||
}
|
||||
if hiera('ironic_inspector_enabled', false) {
|
||||
include ::ironic::inspector::db::mysql
|
||||
include ironic::inspector::db::mysql
|
||||
}
|
||||
if hiera('keystone_enabled', false) {
|
||||
include ::keystone::db::mysql
|
||||
include keystone::db::mysql
|
||||
}
|
||||
if hiera('manila_api_enabled', false) {
|
||||
include ::manila::db::mysql
|
||||
include manila::db::mysql
|
||||
}
|
||||
if hiera('mistral_api_enabled', false) {
|
||||
include ::mistral::db::mysql
|
||||
include mistral::db::mysql
|
||||
}
|
||||
if hiera('neutron_api_enabled', false) {
|
||||
include ::neutron::db::mysql
|
||||
include neutron::db::mysql
|
||||
}
|
||||
if hiera('nova_conductor_enabled', false) {
|
||||
include ::nova::db::mysql
|
||||
include nova::db::mysql
|
||||
}
|
||||
if hiera('nova_api_enabled', false) {
|
||||
include ::nova::db::mysql_api
|
||||
include nova::db::mysql_api
|
||||
}
|
||||
if hiera('placement_enabled', false) {
|
||||
include ::placement::db::mysql
|
||||
include placement::db::mysql
|
||||
}
|
||||
if hiera('octavia_api_enabled', false) {
|
||||
include ::octavia::db::mysql
|
||||
include octavia::db::mysql
|
||||
}
|
||||
if hiera('sahara_api_enabled', false) {
|
||||
include ::sahara::db::mysql
|
||||
include sahara::db::mysql
|
||||
}
|
||||
if hiera('trove_api_enabled', false) {
|
||||
include ::trove::db::mysql
|
||||
include trove::db::mysql
|
||||
}
|
||||
if hiera('panko_api_enabled', false) {
|
||||
include ::panko::db::mysql
|
||||
include panko::db::mysql
|
||||
}
|
||||
if hiera('ec2_api_enabled', false) {
|
||||
include ::ec2api::db::mysql
|
||||
include ec2api::db::mysql
|
||||
}
|
||||
if hiera('zaqar_api_enabled', false) and hiera('zaqar::db::mysql::user', '') == 'zaqar' {
|
||||
# NOTE: by default zaqar uses sqlalchemy
|
||||
include ::zaqar::db::mysql
|
||||
include zaqar::db::mysql
|
||||
}
|
||||
if hiera('veritas_hyperscale_controller_enabled', false) {
|
||||
include ::veritas_hyperscale::db::mysql
|
||||
include veritas_hyperscale::db::mysql
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -91,7 +91,7 @@ class tripleo::profile::base::database::redis (
|
||||
$tls_certfile = $certificate_specs['service_certificate']
|
||||
$tls_keyfile = $certificate_specs['service_key']
|
||||
|
||||
include ::tripleo::stunnel
|
||||
include tripleo::stunnel
|
||||
|
||||
::tripleo::stunnel::service_proxy { 'redis':
|
||||
accept_host => $tls_proxy_bind_ip,
|
||||
@ -107,14 +107,14 @@ class tripleo::profile::base::database::redis (
|
||||
} else {
|
||||
$slaveof = "${redis_short_bootstrap_node_name} 6379"
|
||||
}
|
||||
class { '::redis' :
|
||||
class { 'redis' :
|
||||
slaveof => $slaveof,
|
||||
}
|
||||
|
||||
if count($redis_node_ips) > 1 {
|
||||
Class['::tripleo::redis_notification'] -> Service['redis-sentinel']
|
||||
include ::redis::sentinel
|
||||
include ::tripleo::redis_notification
|
||||
include redis::sentinel
|
||||
include tripleo::redis_notification
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -108,7 +108,7 @@ class tripleo::profile::base::designate (
|
||||
if $step >= 3 {
|
||||
$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 { '::designate' :
|
||||
class { 'designate' :
|
||||
default_transport_url => os_transport_url({
|
||||
'transport' => $oslomsg_rpc_proto,
|
||||
'hosts' => $oslomsg_rpc_hosts,
|
||||
@ -127,7 +127,7 @@ class tripleo::profile::base::designate (
|
||||
}),
|
||||
}
|
||||
if ($rndc_host and $rndc_allowed_addresses) {
|
||||
class { '::designate::backend::bind9':
|
||||
class { 'designate::backend::bind9':
|
||||
rndc_controls => {
|
||||
$rndc_host => {
|
||||
'port' => $rndc_port,
|
||||
@ -137,9 +137,9 @@ class tripleo::profile::base::designate (
|
||||
},
|
||||
}
|
||||
} else {
|
||||
include ::designate::backend::bind9
|
||||
include designate::backend::bind9
|
||||
}
|
||||
include ::designate::config
|
||||
include ::designate::logging
|
||||
include designate::config
|
||||
include designate::logging
|
||||
}
|
||||
}
|
||||
|
@ -37,12 +37,12 @@ class tripleo::profile::base::designate::api (
|
||||
$listen_port = '9001',
|
||||
) {
|
||||
|
||||
include ::tripleo::profile::base::designate
|
||||
include tripleo::profile::base::designate
|
||||
|
||||
if ($step >= 3) {
|
||||
$listen_uri = normalize_ip_for_uri($listen_ip)
|
||||
include ::designate::keystone::authtoken
|
||||
class { '::designate::api':
|
||||
include designate::keystone::authtoken
|
||||
class { 'designate::api':
|
||||
listen => "${listen_uri}:${listen_port}",
|
||||
}
|
||||
}
|
||||
|
@ -51,13 +51,13 @@ class tripleo::profile::base::designate::central (
|
||||
path => '/etc/designate/pools.yaml',
|
||||
content => $pools_file_content_real,
|
||||
}
|
||||
include ::tripleo::profile::base::designate
|
||||
include tripleo::profile::base::designate
|
||||
if ($step >= 4 or ($step >= 3 and $sync_db)) {
|
||||
class { '::designate::db':
|
||||
class { 'designate::db':
|
||||
sync_db => $sync_db,
|
||||
}
|
||||
include ::designate::central
|
||||
include ::designate::quota
|
||||
include designate::central
|
||||
include designate::quota
|
||||
}
|
||||
if ($step == 5 and $sync_db) {
|
||||
exec { 'pool update':
|
||||
|
@ -26,8 +26,8 @@
|
||||
class tripleo::profile::base::designate::mdns (
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include ::tripleo::profile::base::designate
|
||||
include tripleo::profile::base::designate
|
||||
if $step >= 4 {
|
||||
include ::designate::mdns
|
||||
include designate::mdns
|
||||
}
|
||||
}
|
||||
|
@ -26,8 +26,8 @@
|
||||
class tripleo::profile::base::designate::producer (
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include ::tripleo::profile::base::designate
|
||||
include tripleo::profile::base::designate
|
||||
if $step >= 4 {
|
||||
include ::designate::producer
|
||||
include designate::producer
|
||||
}
|
||||
}
|
||||
|
@ -26,8 +26,8 @@
|
||||
class tripleo::profile::base::designate::sink (
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include ::tripleo::profile::base::designate
|
||||
include tripleo::profile::base::designate
|
||||
if $step >= 4 {
|
||||
include ::designate::sink
|
||||
include designate::sink
|
||||
}
|
||||
}
|
||||
|
@ -31,7 +31,7 @@ class tripleo::profile::base::designate::worker (
|
||||
$step = Integer(hiera('step')),
|
||||
$rndc_key = hiera('designate_rndc_key', false),
|
||||
) {
|
||||
include ::tripleo::profile::base::designate
|
||||
include tripleo::profile::base::designate
|
||||
|
||||
if $step >= 4 {
|
||||
if $rndc_key {
|
||||
@ -40,6 +40,6 @@ class tripleo::profile::base::designate::worker (
|
||||
content => template('tripleo/designate/rndc.key.erb')
|
||||
}
|
||||
}
|
||||
include ::designate::worker
|
||||
include designate::worker
|
||||
}
|
||||
}
|
||||
|
@ -148,7 +148,7 @@ class tripleo::profile::base::glance::api (
|
||||
$sync_db = false
|
||||
}
|
||||
|
||||
include ::tripleo::profile::base::glance::authtoken
|
||||
include tripleo::profile::base::glance::authtoken
|
||||
|
||||
if $step >= 4 or ($step >= 3 and $sync_db) {
|
||||
if $enable_internal_tls {
|
||||
@ -172,7 +172,7 @@ class tripleo::profile::base::glance::api (
|
||||
tls_key => $tls_keyfile,
|
||||
notify => Class['::glance::api'],
|
||||
}
|
||||
include ::tripleo::profile::base::apache
|
||||
include tripleo::profile::base::apache
|
||||
}
|
||||
case $glance_backend {
|
||||
'swift': { $backend_store = 'swift' }
|
||||
@ -196,16 +196,16 @@ class tripleo::profile::base::glance::api (
|
||||
$http_store = ['http']
|
||||
$glance_store = concat($http_store, $backend_store)
|
||||
|
||||
include ::glance
|
||||
include ::glance::config
|
||||
include ::glance::api::logging
|
||||
class { '::glance::api':
|
||||
include glance
|
||||
include glance::config
|
||||
include glance::api::logging
|
||||
class { 'glance::api':
|
||||
stores => $glance_store,
|
||||
sync_db => $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 { '::glance::notify::rabbitmq' :
|
||||
class { 'glance::notify::rabbitmq' :
|
||||
default_transport_url => os_transport_url({
|
||||
'transport' => $oslomsg_rpc_proto,
|
||||
'hosts' => $oslomsg_rpc_hosts,
|
||||
|
@ -37,7 +37,7 @@ class tripleo::profile::base::glance::authtoken (
|
||||
$memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
|
||||
}
|
||||
|
||||
class { '::glance::api::authtoken':
|
||||
class { 'glance::api::authtoken':
|
||||
memcached_servers => $memcache_servers
|
||||
}
|
||||
}
|
||||
|
@ -29,10 +29,10 @@ class tripleo::profile::base::gnocchi (
|
||||
if $step >= 3 {
|
||||
warning('Gnocchi is deprecated and is going to be removed in future.')
|
||||
|
||||
include ::gnocchi
|
||||
include ::gnocchi::config
|
||||
include ::gnocchi::cors
|
||||
include ::gnocchi::client
|
||||
include ::gnocchi::logging
|
||||
include gnocchi
|
||||
include gnocchi::config
|
||||
include gnocchi::cors
|
||||
include gnocchi::client
|
||||
include gnocchi::logging
|
||||
}
|
||||
}
|
||||
|
@ -86,8 +86,8 @@ class tripleo::profile::base::gnocchi::api (
|
||||
$sync_db = false
|
||||
}
|
||||
|
||||
include ::tripleo::profile::base::gnocchi
|
||||
include ::tripleo::profile::base::gnocchi::authtoken
|
||||
include tripleo::profile::base::gnocchi
|
||||
include tripleo::profile::base::gnocchi::authtoken
|
||||
|
||||
if $enable_internal_tls {
|
||||
if !$gnocchi_network {
|
||||
@ -112,41 +112,41 @@ class tripleo::profile::base::gnocchi::api (
|
||||
$db_sync_extra_opts = undef
|
||||
}
|
||||
|
||||
class { '::gnocchi::db::sync':
|
||||
class { 'gnocchi::db::sync':
|
||||
extra_opts => $db_sync_extra_opts,
|
||||
}
|
||||
}
|
||||
|
||||
include ::gnocchi::api
|
||||
include ::tripleo::profile::base::apache
|
||||
class { '::gnocchi::wsgi::apache':
|
||||
include gnocchi::api
|
||||
include tripleo::profile::base::apache
|
||||
class { 'gnocchi::wsgi::apache':
|
||||
ssl_cert => $tls_certfile,
|
||||
ssl_key => $tls_keyfile,
|
||||
}
|
||||
|
||||
class { '::gnocchi::storage':
|
||||
class { 'gnocchi::storage':
|
||||
coordination_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/', $tls_query_param]),
|
||||
}
|
||||
|
||||
if $incoming_storage_driver == 'redis' {
|
||||
class { '::gnocchi::storage::incoming::redis':
|
||||
class { 'gnocchi::storage::incoming::redis':
|
||||
redis_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/', $tls_query_param]),
|
||||
}
|
||||
}
|
||||
|
||||
case $gnocchi_backend {
|
||||
'swift': {
|
||||
include ::gnocchi::storage::swift
|
||||
include gnocchi::storage::swift
|
||||
if $sync_db {
|
||||
include ::swift::deps
|
||||
include swift::deps
|
||||
# Ensure we have swift proxy available before running gnocchi-upgrade
|
||||
# as storage is initialized at this point.
|
||||
Anchor<| title == 'swift::service::end' |> ~> Anchor['gnocchi::dbsync::begin']
|
||||
}
|
||||
}
|
||||
'file': { include ::gnocchi::storage::file }
|
||||
'file': { include gnocchi::storage::file }
|
||||
'rbd': {
|
||||
include ::gnocchi::storage::ceph
|
||||
include gnocchi::storage::ceph
|
||||
exec{ "exec-setfacl-${gnocchi_rbd_client_name}-gnocchi":
|
||||
path => ['/bin', '/usr/bin'],
|
||||
command => "setfacl -m u:gnocchi:r-- /etc/ceph/ceph.client.${gnocchi_rbd_client_name}.keyring",
|
||||
@ -158,7 +158,7 @@ class tripleo::profile::base::gnocchi::api (
|
||||
unless => "getfacl /etc/ceph/ceph.client.${gnocchi_rbd_client_name}.keyring | grep -q mask::r",
|
||||
}
|
||||
}
|
||||
's3': { include ::gnocchi::storage::s3 }
|
||||
's3': { include gnocchi::storage::s3 }
|
||||
default: { fail('Unrecognized gnocchi_backend parameter.') }
|
||||
}
|
||||
}
|
||||
|
@ -37,7 +37,7 @@ class tripleo::profile::base::gnocchi::authtoken (
|
||||
$memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
|
||||
}
|
||||
|
||||
class { '::gnocchi::keystone::authtoken':
|
||||
class { 'gnocchi::keystone::authtoken':
|
||||
memcached_servers => $memcache_servers
|
||||
}
|
||||
}
|
||||
|
@ -26,9 +26,9 @@
|
||||
class tripleo::profile::base::gnocchi::metricd (
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include ::tripleo::profile::base::gnocchi
|
||||
include tripleo::profile::base::gnocchi
|
||||
|
||||
if $step >= 5 {
|
||||
include ::gnocchi::metricd
|
||||
include gnocchi::metricd
|
||||
}
|
||||
}
|
||||
|
@ -26,9 +26,9 @@
|
||||
class tripleo::profile::base::gnocchi::statsd (
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include ::tripleo::profile::base::gnocchi
|
||||
include tripleo::profile::base::gnocchi
|
||||
|
||||
if $step >= 5 {
|
||||
include ::gnocchi::statsd
|
||||
include gnocchi::statsd
|
||||
}
|
||||
}
|
||||
|
@ -97,12 +97,12 @@ class tripleo::profile::base::heat (
|
||||
$oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
|
||||
) {
|
||||
|
||||
include ::tripleo::profile::base::heat::authtoken
|
||||
include tripleo::profile::base::heat::authtoken
|
||||
|
||||
# Domain resources will be created at step5 on the node running keystone.pp
|
||||
# configure heat.conf at step3 and 4 but actually create the domain later.
|
||||
if $step >= 3 {
|
||||
class { '::heat::keystone::domain':
|
||||
class { 'heat::keystone::domain':
|
||||
manage_domain => false,
|
||||
manage_user => false,
|
||||
manage_role => false,
|
||||
@ -110,7 +110,7 @@ class tripleo::profile::base::heat (
|
||||
|
||||
$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 { '::heat' :
|
||||
class { 'heat' :
|
||||
default_transport_url => os_transport_url({
|
||||
'transport' => $oslomsg_rpc_proto,
|
||||
'hosts' => $oslomsg_rpc_hosts,
|
||||
@ -128,14 +128,14 @@ class tripleo::profile::base::heat (
|
||||
'ssl' => $oslomsg_notify_use_ssl_real,
|
||||
}),
|
||||
}
|
||||
include ::heat::config
|
||||
include ::heat::cors
|
||||
include ::heat::logging
|
||||
include heat::config
|
||||
include heat::cors
|
||||
include heat::logging
|
||||
}
|
||||
|
||||
if $step >= 5 {
|
||||
if $manage_db_purge {
|
||||
include ::heat::cron::purge_deleted
|
||||
include heat::cron::purge_deleted
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -61,7 +61,7 @@ class tripleo::profile::base::heat::api (
|
||||
$is_bootstrap = false
|
||||
}
|
||||
|
||||
include ::tripleo::profile::base::heat
|
||||
include tripleo::profile::base::heat
|
||||
|
||||
if $enable_internal_tls {
|
||||
if !$heat_api_network {
|
||||
@ -75,9 +75,9 @@ class tripleo::profile::base::heat::api (
|
||||
}
|
||||
|
||||
if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
|
||||
include ::heat::api
|
||||
include ::tripleo::profile::base::apache
|
||||
class { '::heat::wsgi::apache_api':
|
||||
include heat::api
|
||||
include tripleo::profile::base::apache
|
||||
class { 'heat::wsgi::apache_api':
|
||||
ssl_cert => $tls_certfile,
|
||||
ssl_key => $tls_keyfile,
|
||||
}
|
||||
|
@ -61,7 +61,7 @@ class tripleo::profile::base::heat::api_cfn (
|
||||
$is_bootstrap = false
|
||||
}
|
||||
|
||||
include ::tripleo::profile::base::heat
|
||||
include tripleo::profile::base::heat
|
||||
|
||||
if $enable_internal_tls {
|
||||
if !$heat_api_cfn_network {
|
||||
@ -75,10 +75,10 @@ class tripleo::profile::base::heat::api_cfn (
|
||||
}
|
||||
|
||||
if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
|
||||
include ::heat::api_cfn
|
||||
include heat::api_cfn
|
||||
|
||||
include ::tripleo::profile::base::apache
|
||||
class { '::heat::wsgi::apache_api_cfn':
|
||||
include tripleo::profile::base::apache
|
||||
class { 'heat::wsgi::apache_api_cfn':
|
||||
ssl_cert => $tls_certfile,
|
||||
ssl_key => $tls_keyfile,
|
||||
}
|
||||
|
@ -37,7 +37,7 @@ class tripleo::profile::base::heat::authtoken (
|
||||
$memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
|
||||
}
|
||||
|
||||
class { '::heat::keystone::authtoken':
|
||||
class { 'heat::keystone::authtoken':
|
||||
memcached_servers => $memcache_servers
|
||||
}
|
||||
}
|
||||
|
@ -37,10 +37,10 @@ class tripleo::profile::base::heat::engine (
|
||||
$sync_db = false
|
||||
}
|
||||
|
||||
include ::tripleo::profile::base::heat
|
||||
include tripleo::profile::base::heat
|
||||
|
||||
if $step >= 4 or ( $step >= 3 and $sync_db ) {
|
||||
include ::heat::engine
|
||||
include heat::engine
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -84,8 +84,8 @@ class tripleo::profile::base::horizon (
|
||||
|
||||
if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
|
||||
# Horizon
|
||||
include ::tripleo::profile::base::apache
|
||||
include ::apache::mod::remoteip
|
||||
include tripleo::profile::base::apache
|
||||
include apache::mod::remoteip
|
||||
|
||||
if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers', undef) {
|
||||
$_profile_support = 'cisco'
|
||||
@ -101,7 +101,7 @@ class tripleo::profile::base::horizon (
|
||||
$horizon_memcached_servers = any2array(normalize_ip_for_uri($memcached_ips))
|
||||
}
|
||||
|
||||
class { '::horizon':
|
||||
class { 'horizon':
|
||||
cache_server_ip => $horizon_memcached_servers,
|
||||
neutron_options => $neutron_options_real,
|
||||
horizon_cert => $tls_certfile,
|
||||
|
@ -69,7 +69,7 @@ class tripleo::profile::base::ironic (
|
||||
|
||||
if $step >= 4 or ($step >= 3 and $sync_db) {
|
||||
$oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
|
||||
class { '::ironic':
|
||||
class { 'ironic':
|
||||
sync_db => $sync_db,
|
||||
db_online_data_migrations => $sync_db,
|
||||
default_transport_url => os_transport_url({
|
||||
@ -82,8 +82,8 @@ class tripleo::profile::base::ironic (
|
||||
}),
|
||||
}
|
||||
|
||||
include ::ironic::config
|
||||
include ::ironic::cors
|
||||
include ::ironic::logging
|
||||
include ironic::config
|
||||
include ironic::cors
|
||||
include ironic::logging
|
||||
}
|
||||
}
|
||||
|
@ -54,8 +54,8 @@ class tripleo::profile::base::ironic::api (
|
||||
$enable_internal_tls = hiera('enable_internal_tls', false),
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
include ::tripleo::profile::base::ironic
|
||||
include ::tripleo::profile::base::ironic::authtoken
|
||||
include tripleo::profile::base::ironic
|
||||
include tripleo::profile::base::ironic::authtoken
|
||||
|
||||
if $::hostname == downcase($bootstrap_node) {
|
||||
$is_bootstrap = true
|
||||
@ -75,10 +75,10 @@ class tripleo::profile::base::ironic::api (
|
||||
}
|
||||
|
||||
if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
|
||||
include ::ironic::api
|
||||
include ::ironic::cors
|
||||
include ::tripleo::profile::base::apache
|
||||
class { '::ironic::wsgi::apache':
|
||||
include ironic::api
|
||||
include ironic::cors
|
||||
include tripleo::profile::base::apache
|
||||
class { 'ironic::wsgi::apache':
|
||||
ssl_cert => $tls_certfile,
|
||||
ssl_key => $tls_keyfile,
|
||||
}
|
||||
|
@ -37,7 +37,7 @@ class tripleo::profile::base::ironic::authtoken (
|
||||
$memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
|
||||
}
|
||||
|
||||
class { '::ironic::api::authtoken':
|
||||
class { 'ironic::api::authtoken':
|
||||
memcached_servers => $memcache_servers
|
||||
}
|
||||
}
|
||||
|
@ -40,7 +40,7 @@ class tripleo::profile::base::ironic::conductor (
|
||||
$manage_pxe = true,
|
||||
$enable_staging = false,
|
||||
) {
|
||||
include ::tripleo::profile::base::ironic
|
||||
include tripleo::profile::base::ironic
|
||||
# Database is accessed by both API and conductor, hence it's here.
|
||||
if $::hostname == downcase($bootstrap_node) {
|
||||
$sync_db = true
|
||||
@ -50,33 +50,33 @@ class tripleo::profile::base::ironic::conductor (
|
||||
|
||||
# Ironic conductor class expects PXE directories exist
|
||||
if ($step >= 3 and $sync_db) and $manage_pxe {
|
||||
include ::ironic::pxe
|
||||
include ironic::pxe
|
||||
}
|
||||
|
||||
if $step >= 4 {
|
||||
include ::ironic::conductor
|
||||
include ::ironic::drivers::interfaces
|
||||
include ::ironic::drivers::pxe
|
||||
include ironic::conductor
|
||||
include ironic::drivers::interfaces
|
||||
include ironic::drivers::pxe
|
||||
if $manage_pxe {
|
||||
include ::ironic::pxe
|
||||
include ironic::pxe
|
||||
}
|
||||
|
||||
# Configure a few popular drivers
|
||||
include ::ironic::drivers::ansible
|
||||
include ::ironic::drivers::drac
|
||||
include ::ironic::drivers::ilo
|
||||
include ::ironic::drivers::ipmi
|
||||
include ::ironic::drivers::redfish
|
||||
include ironic::drivers::ansible
|
||||
include ironic::drivers::drac
|
||||
include ironic::drivers::ilo
|
||||
include ironic::drivers::ipmi
|
||||
include ironic::drivers::redfish
|
||||
if $enable_staging {
|
||||
include ::ironic::drivers::staging
|
||||
include ironic::drivers::staging
|
||||
}
|
||||
|
||||
# Configure access to other services
|
||||
include ::ironic::cinder
|
||||
include ::ironic::drivers::inspector
|
||||
include ::ironic::glance
|
||||
include ::ironic::neutron
|
||||
include ::ironic::service_catalog
|
||||
include ::ironic::swift
|
||||
include ironic::cinder
|
||||
include ironic::drivers::inspector
|
||||
include ironic::glance
|
||||
include ironic::neutron
|
||||
include ironic::service_catalog
|
||||
include ironic::swift
|
||||
}
|
||||
}
|
||||
|
@ -59,7 +59,7 @@ class tripleo::profile::base::ironic_inspector (
|
||||
$step = Integer(hiera('step')),
|
||||
) {
|
||||
|
||||
include ::tripleo::profile::base::ironic_inspector::authtoken
|
||||
include tripleo::profile::base::ironic_inspector::authtoken
|
||||
|
||||
if $::hostname == downcase($bootstrap_node) {
|
||||
$sync_db = true
|
||||
@ -74,15 +74,15 @@ class tripleo::profile::base::ironic_inspector (
|
||||
}
|
||||
|
||||
if $step >= 4 or ($step >= 3 and $sync_db) {
|
||||
include ::ironic::inspector::cors
|
||||
class { '::ironic::inspector':
|
||||
include ironic::inspector::cors
|
||||
class { 'ironic::inspector':
|
||||
sync_db => $sync_db,
|
||||
dnsmasq_ip_subnets => $inspection_subnets_real,
|
||||
}
|
||||
|
||||
include ::ironic::inspector::pxe_filter
|
||||
include ::ironic::inspector::pxe_filter::dnsmasq
|
||||
include ::ironic::config
|
||||
include ::ironic::inspector::logging
|
||||
include ironic::inspector::pxe_filter
|
||||
include ironic::inspector::pxe_filter::dnsmasq
|
||||
include ironic::config
|
||||
include ironic::inspector::logging
|
||||
}
|
||||
}
|
||||
|
@ -37,7 +37,7 @@ class tripleo::profile::base::ironic_inspector::authtoken (
|
||||
$memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211')
|
||||
}
|
||||
|
||||
class { '::ironic::inspector::authtoken':
|
||||
class { 'ironic::inspector::authtoken':
|
||||
memcached_servers => $memcache_servers
|
||||
}
|
||||
}
|
||||
|
@ -71,7 +71,7 @@ class tripleo::profile::base::keepalived (
|
||||
$public_detected_interface = $public_virtual_interface
|
||||
}
|
||||
|
||||
class { '::tripleo::keepalived':
|
||||
class { 'tripleo::keepalived':
|
||||
control_virtual_interface => $control_detected_interface,
|
||||
public_virtual_interface => $public_detected_interface,
|
||||
}
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user