diff options
191 files changed, 799 insertions, 262 deletions
diff --git a/manifests/certmonger/mysql.pp b/manifests/certmonger/mysql.pp index dd9b184..0988c55 100644 --- a/manifests/certmonger/mysql.pp +++ b/manifests/certmonger/mysql.pp @@ -31,6 +31,12 @@ # (Optional) The CA that certmonger will use to generate the certificates. # Defaults to hiera('certmonger_ca', 'local'). # +# [*dnsnames*] +# (Optional) The DNS names that will be added for the SubjectAltNames entry +# in the certificate. If left unset, the value will be set to the $hostname. +# This parameter can take both a string or an array of strings. +# Defaults to $hostname +# # [*principal*] # (Optional) The haproxy service principal that is set for MySQL in kerberos. # Defaults to undef @@ -40,6 +46,7 @@ class tripleo::certmonger::mysql ( $service_certificate, $service_key, $certmonger_ca = hiera('certmonger_ca', 'local'), + $dnsnames = $hostname, $principal = undef, ) { include ::certmonger @@ -51,7 +58,7 @@ class tripleo::certmonger::mysql ( certfile => $service_certificate, keyfile => $service_key, hostname => $hostname, - dnsname => $hostname, + dnsname => $dnsnames, principal => $principal, postsave_cmd => $postsave_cmd, ca => $certmonger_ca, diff --git a/manifests/glance/nfs_mount.pp b/manifests/glance/nfs_mount.pp index 035191d..674bdd0 100644 --- a/manifests/glance/nfs_mount.pp +++ b/manifests/glance/nfs_mount.pp @@ -43,7 +43,7 @@ class tripleo::glance::nfs_mount ( $options = 'intr,context=system_u:object_r:glance_var_lib_t:s0', $edit_fstab = true, $fstab_fstype = 'nfs4', - $fstab_prepend_options = 'bg' + $fstab_prepend_options = '_netdev,bg' ) { $images_dir = '/var/lib/glance/images' diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp index 98c9c96..2f29674 100644 --- a/manifests/haproxy.pp +++ b/manifests/haproxy.pp @@ -155,6 +155,10 @@ # When set, enables SSL on the haproxy stats endpoint using the specified file. # Defaults to undef # +# [*haproxy_stats*] +# (optional) Enable or not the haproxy stats interface +# Defaults to true +# # [*keystone_admin*] # (optional) Enable or not Keystone Admin API binding # Defaults to hiera('keystone_enabled', false) @@ -279,6 +283,10 @@ # (optional) Enable check via clustercheck for mysql # Defaults to false # +# [*mysql_max_conn*] +# (optional) Set the maxconn parameter for mysql +# Defaults to undef +# # [*mysql_member_options*] # The options to use for the mysql HAProxy balancer members. # If this parameter is undefined, the actual value configured will depend @@ -522,7 +530,7 @@ # 'nova_novnc_port' (Defaults to 6080) # 'nova_novnc_ssl_port' (Defaults to 13080) # 'opendaylight_api_port' (Defaults to 8081) -# 'panko_api_port' (Defaults to 8779) +# 'panko_api_port' (Defaults to 8977) # 'panko_api_ssl_port' (Defaults to 13779) # 'ovn_nbdb_port' (Defaults to 6641) # 'ovn_sbdb_port' (Defaults to 6642) @@ -571,6 +579,7 @@ class tripleo::haproxy ( $ca_bundle = '/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt', $crl_file = undef, $haproxy_stats_certificate = undef, + $haproxy_stats = true, $keystone_admin = hiera('keystone_enabled', false), $keystone_public = hiera('keystone_enabled', false), $neutron = hiera('neutron_api_enabled', false), @@ -602,6 +611,7 @@ class tripleo::haproxy ( $ironic_inspector = hiera('ironic_inspector_enabled', false), $mysql = hiera('mysql_enabled', false), $mysql_clustercheck = false, + $mysql_max_conn = undef, $mysql_member_options = undef, $rabbitmq = false, $etcd = hiera('etcd_enabled', false), @@ -706,7 +716,7 @@ class tripleo::haproxy ( nova_novnc_port => 6080, nova_novnc_ssl_port => 13080, opendaylight_api_port => 8081, - panko_api_port => 8779, + panko_api_port => 8977, panko_api_ssl_port => 13779, ovn_nbdb_port => 6641, ovn_sbdb_port => 6642, @@ -871,19 +881,21 @@ class tripleo::haproxy ( listen_options => $default_listen_options, } - $stats_base = ['enable', 'uri /'] - if $haproxy_stats_password { - $stats_config = union($stats_base, ["auth ${haproxy_stats_user}:${haproxy_stats_password}"]) - } else { - $stats_config = $stats_base - } - haproxy::listen { 'haproxy.stats': - bind => $haproxy_stats_bind_opts, - mode => 'http', - options => { - 'stats' => $stats_config, - }, - collect_exported => false, + if $haproxy_stats { + $stats_base = ['enable', 'uri /'] + if $haproxy_stats_password { + $stats_config = union($stats_base, ["auth ${haproxy_stats_user}:${haproxy_stats_password}"]) + } else { + $stats_config = $stats_base + } + haproxy::listen { 'haproxy.stats': + bind => $haproxy_stats_bind_opts, + mode => 'http', + options => { + 'stats' => $stats_config, + }, + collect_exported => false, + } } if $keystone_admin { @@ -902,17 +914,8 @@ class tripleo::haproxy ( } if $keystone_public { - if $service_certificate { - $keystone_public_tls_listen_opts = { - 'rsprep' => '^Location:\ http://(.*) Location:\ https://\1', - # NOTE(jaosorior): We always redirect to https for the public_virtual_ip. - 'redirect' => "scheme https code 301 if { hdr(host) -i ${public_virtual_ip} } !{ ssl_fc }", - 'option' => 'forwardfor', - } - } else { - $keystone_public_tls_listen_opts = { - 'option' => [ 'httpchk GET /v3', ], - } + $keystone_listen_opts = { + 'option' => [ 'httpchk GET /v3', ], } ::tripleo::haproxy::endpoint { 'keystone_public': public_virtual_ip => $public_virtual_ip, @@ -921,7 +924,7 @@ class tripleo::haproxy ( ip_addresses => hiera('keystone_public_api_node_ips', $controller_hosts_real), server_names => hiera('keystone_public_api_node_names', $controller_hosts_names_real), mode => 'http', - listen_options => merge($default_listen_options, $keystone_public_tls_listen_opts), + listen_options => merge($default_listen_options, $keystone_listen_opts), public_ssl_port => $ports[keystone_public_api_ssl_port], service_network => $keystone_public_network, member_options => union($haproxy_member_options, $internal_tls_member_options), @@ -1323,6 +1326,7 @@ class tripleo::haproxy ( 'timeout server' => '90m', 'stick-table' => 'type ip size 1000', 'stick' => 'on dst', + 'maxconn' => $mysql_max_conn } if $mysql_member_options { $mysql_member_options_real = $mysql_member_options @@ -1333,6 +1337,7 @@ class tripleo::haproxy ( $mysql_listen_options = { 'timeout client' => '90m', 'timeout server' => '90m', + 'maxconn' => $mysql_max_conn } if $mysql_member_options { $mysql_member_options_real = $mysql_member_options diff --git a/manifests/haproxy/endpoint.pp b/manifests/haproxy/endpoint.pp index 16e0bd1..f1e80e8 100644 --- a/manifests/haproxy/endpoint.pp +++ b/manifests/haproxy/endpoint.pp @@ -108,9 +108,20 @@ define tripleo::haproxy::endpoint ( # service exposed to the public network if $public_certificate { + if $mode == 'http' { + $tls_listen_options = { + 'rsprep' => '^Location:\ http://(.*) Location:\ https://\1', + 'redirect' => "scheme https code 301 if { hdr(host) -i ${public_virtual_ip} } !{ ssl_fc }", + 'option' => 'forwardfor', + } + $listen_options_real = merge($tls_listen_options, $listen_options) + } else { + $listen_options_real = $listen_options + } $public_bind_opts = list_to_hash(suffix(any2array($public_virtual_ip), ":${public_ssl_port}"), union($haproxy_listen_bind_param, ['ssl', 'crt', $public_certificate])) } else { + $listen_options_real = $listen_options $public_bind_opts = list_to_hash(suffix(any2array($public_virtual_ip), ":${service_port}"), $haproxy_listen_bind_param) } } else { @@ -138,7 +149,7 @@ define tripleo::haproxy::endpoint ( bind => $bind_opts, collect_exported => false, mode => $mode, - options => $listen_options, + options => $listen_options_real, } haproxy::balancermember { "${name}": listening_service => $name, diff --git a/manifests/network/contrail/analytics.pp b/manifests/network/contrail/analytics.pp index e34c7e6..296fa19 100644 --- a/manifests/network/contrail/analytics.pp +++ b/manifests/network/contrail/analytics.pp @@ -189,7 +189,7 @@ # Defaults to hiera('contrail::zk_server_ip') # class tripleo::network::contrail::analytics( - $step = hiera('step'), + $step = Integer(hiera('step')), $admin_password = hiera('contrail::admin_password'), $admin_tenant_name = hiera('contrail::admin_tenant_name'), $admin_token = hiera('contrail::admin_token'), diff --git a/manifests/network/contrail/analyticsdatabase.pp b/manifests/network/contrail/analyticsdatabase.pp index 88b0327..cf3016a 100644 --- a/manifests/network/contrail/analyticsdatabase.pp +++ b/manifests/network/contrail/analyticsdatabase.pp @@ -120,7 +120,7 @@ # Defaults to hiera('contrail_database_node_ips') # class tripleo::network::contrail::analyticsdatabase( - $step = hiera('step'), + $step = Integer(hiera('step')), $auth_host = hiera('contrail::auth_host'), $api_server = hiera('contrail_config_vip'), $api_port = hiera('contrail::api_port'), diff --git a/manifests/network/contrail/config.pp b/manifests/network/contrail/config.pp index d02ab44..3fc4fd8 100644 --- a/manifests/network/contrail/config.pp +++ b/manifests/network/contrail/config.pp @@ -216,7 +216,7 @@ # Defaults to hiera('contrail_database_node_ips') # class tripleo::network::contrail::config( - $step = hiera('step'), + $step = Integer(hiera('step')), $aaa_mode = hiera('contrail::aaa_mode'), $admin_password = hiera('contrail::admin_password'), $admin_tenant_name = hiera('contrail::admin_tenant_name'), diff --git a/manifests/network/contrail/control.pp b/manifests/network/contrail/control.pp index e9c7a9e..530d607 100644 --- a/manifests/network/contrail/control.pp +++ b/manifests/network/contrail/control.pp @@ -117,7 +117,7 @@ # Defaults to hiera('step') # class tripleo::network::contrail::control( - $step = hiera('step'), + $step = Integer(hiera('step')), $admin_password = hiera('contrail::admin_password'), $admin_tenant_name = hiera('contrail::admin_tenant_name'), $admin_user = hiera('contrail::admin_user'), diff --git a/manifests/network/contrail/database.pp b/manifests/network/contrail/database.pp index f74eb1c..3d6b40b 100644 --- a/manifests/network/contrail/database.pp +++ b/manifests/network/contrail/database.pp @@ -117,7 +117,7 @@ class tripleo::network::contrail::database( $host_ip = hiera('contrail::database::host_ip'), $host_name = $::hostname, $public_vip = hiera('public_virtual_ip'), - $step = hiera('step'), + $step = Integer(hiera('step')), $zookeeper_client_ip = hiera('contrail::database::host_ip'), $zookeeper_hostnames = hiera('contrail_database_short_node_names'), $zookeeper_server_ips = hiera('contrail_database_node_ips'), diff --git a/manifests/network/contrail/heat.pp b/manifests/network/contrail/heat.pp index 637fdda..4ef2a31 100644 --- a/manifests/network/contrail/heat.pp +++ b/manifests/network/contrail/heat.pp @@ -60,7 +60,7 @@ class tripleo::network::contrail::heat( $api_port = 8082, $api_server = hiera('contrail_config_vip'), $auth_host = hiera('contrail::auth_host'), - $step = hiera('step'), + $step = Integer(hiera('step')), $use_ssl = 'False', ) { diff --git a/manifests/network/contrail/provision.pp b/manifests/network/contrail/provision.pp index 3025737..742c4a2 100644 --- a/manifests/network/contrail/provision.pp +++ b/manifests/network/contrail/provision.pp @@ -71,7 +71,7 @@ class tripleo::network::contrail::provision( $auth_host = hiera('contrail::auth_host'), $auth_port = hiera('contrail::auth_port'), $auth_protocol = hiera('contrail::auth_protocol'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 5 { diff --git a/manifests/network/contrail/vrouter.pp b/manifests/network/contrail/vrouter.pp index 2bccd1d..678a77d 100644 --- a/manifests/network/contrail/vrouter.pp +++ b/manifests/network/contrail/vrouter.pp @@ -143,7 +143,7 @@ # Defaults to hiera('contrail::vrouter::is_tsn',false) # class tripleo::network::contrail::vrouter ( - $step = hiera('step'), + $step = Integer(hiera('step')), $admin_password = hiera('contrail::admin_password'), $admin_tenant_name = hiera('contrail::admin_tenant_name'), $admin_token = hiera('contrail::admin_token'), diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp index da8aaa6..bc219fa 100644 --- a/manifests/profile/base/aodh.pp +++ b/manifests/profile/base/aodh.pp @@ -72,7 +72,7 @@ # Defaults to hiera('aodh::rabbit_use_ssl', '0') class tripleo::profile::base::aodh ( - $step = hiera('step'), + $step = Integer(hiera('step')), $bootstrap_node = hiera('bootstrap_nodeid', undef), $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp index 5c539fc..300c0ca 100644 --- a/manifests/profile/base/aodh/api.pp +++ b/manifests/profile/base/aodh/api.pp @@ -49,7 +49,7 @@ class tripleo::profile::base::aodh::api ( $aodh_network = hiera('aodh_api_network', undef), $certificates_specs = hiera('apache_certificates_specs', {}), $enable_internal_tls = hiera('enable_internal_tls', false), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::aodh diff --git a/manifests/profile/base/aodh/evaluator.pp b/manifests/profile/base/aodh/evaluator.pp index d9b48b3..1b25b37 100644 --- a/manifests/profile/base/aodh/evaluator.pp +++ b/manifests/profile/base/aodh/evaluator.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::aodh::evaluator ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::aodh diff --git a/manifests/profile/base/aodh/listener.pp b/manifests/profile/base/aodh/listener.pp index d36e1bb..d225e71 100644 --- a/manifests/profile/base/aodh/listener.pp +++ b/manifests/profile/base/aodh/listener.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::aodh::listener ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::aodh diff --git a/manifests/profile/base/aodh/notifier.pp b/manifests/profile/base/aodh/notifier.pp index d2a3945..bb79ed2 100644 --- a/manifests/profile/base/aodh/notifier.pp +++ b/manifests/profile/base/aodh/notifier.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::aodh::notifier ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::aodh diff --git a/manifests/profile/base/auditd.pp b/manifests/profile/base/auditd.pp index 628db08..46eb564 100644 --- a/manifests/profile/base/auditd.pp +++ b/manifests/profile/base/auditd.pp @@ -22,7 +22,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::auditd ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::auditd diff --git a/manifests/profile/base/barbican.pp b/manifests/profile/base/barbican.pp index f4d6230..7113fd0 100644 --- a/manifests/profile/base/barbican.pp +++ b/manifests/profile/base/barbican.pp @@ -25,7 +25,7 @@ # class tripleo::profile::base::barbican ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 3 { diff --git a/manifests/profile/base/barbican/api.pp b/manifests/profile/base/barbican/api.pp index 211e442..40a0a99 100644 --- a/manifests/profile/base/barbican/api.pp +++ b/manifests/profile/base/barbican/api.pp @@ -97,7 +97,7 @@ class tripleo::profile::base::barbican::api ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $certificates_specs = hiera('apache_certificates_specs', {}), $enable_internal_tls = hiera('enable_internal_tls', false), - $step = hiera('step'), + $step = Integer(hiera('step')), $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), $oslomsg_rpc_password = hiera('barbican::api::rabbit_password'), diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp index a85be5d..02ef037 100644 --- a/manifests/profile/base/ceilometer.pp +++ b/manifests/profile/base/ceilometer.pp @@ -68,7 +68,7 @@ # Defaults to hiera('ceilometer::rabbit_use_ssl', '0') class tripleo::profile::base::ceilometer ( - $step = hiera('step'), + $step = Integer(hiera('step')), $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), $oslomsg_rpc_password = hiera('ceilometer::rabbit_password'), diff --git a/manifests/profile/base/ceilometer/agent/central.pp b/manifests/profile/base/ceilometer/agent/central.pp index 033d34c..b8f5d07 100644 --- a/manifests/profile/base/ceilometer/agent/central.pp +++ b/manifests/profile/base/ceilometer/agent/central.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::ceilometer::agent::central ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::ceilometer diff --git a/manifests/profile/base/ceilometer/agent/compute.pp b/manifests/profile/base/ceilometer/agent/compute.pp index 749bc64..c054c35 100644 --- a/manifests/profile/base/ceilometer/agent/compute.pp +++ b/manifests/profile/base/ceilometer/agent/compute.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::ceilometer::agent::compute ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::ceilometer diff --git a/manifests/profile/base/ceilometer/agent/notification.pp b/manifests/profile/base/ceilometer/agent/notification.pp index 3fa139a..4286001 100644 --- a/manifests/profile/base/ceilometer/agent/notification.pp +++ b/manifests/profile/base/ceilometer/agent/notification.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::ceilometer::agent::notification ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::ceilometer include ::tripleo::profile::base::ceilometer::upgrade diff --git a/manifests/profile/base/ceilometer/agent/polling.pp b/manifests/profile/base/ceilometer/agent/polling.pp index fedf035..84f5e46 100644 --- a/manifests/profile/base/ceilometer/agent/polling.pp +++ b/manifests/profile/base/ceilometer/agent/polling.pp @@ -47,7 +47,7 @@ class tripleo::profile::base::ceilometer::agent::polling ( $ipmi_namespace = hiera('ipmi_namespace', false), $ceilometer_redis_password = hiera('ceilometer_redis_password', undef), $redis_vip = hiera('redis_vip', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::ceilometer diff --git a/manifests/profile/base/ceilometer/api.pp b/manifests/profile/base/ceilometer/api.pp index 0176380..6a30a40 100644 --- a/manifests/profile/base/ceilometer/api.pp +++ b/manifests/profile/base/ceilometer/api.pp @@ -48,7 +48,7 @@ class tripleo::profile::base::ceilometer::api ( $ceilometer_network = hiera('ceilometer_api_network', undef), $certificates_specs = hiera('apache_certificates_specs', {}), $enable_internal_tls = hiera('enable_internal_tls', false), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::ceilometer diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp index a2c1e29..9fcee7b 100644 --- a/manifests/profile/base/ceilometer/collector.pp +++ b/manifests/profile/base/ceilometer/collector.pp @@ -46,7 +46,7 @@ # class tripleo::profile::base::ceilometer::collector ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), $ceilometer_backend = hiera('ceilometer_backend', 'mongodb'), $mongodb_ipv6 = hiera('mongodb::server::ipv6', false), $mongodb_node_ips = hiera('mongodb_node_ips', []), diff --git a/manifests/profile/base/ceilometer/expirer.pp b/manifests/profile/base/ceilometer/expirer.pp index eaaaefc..20fa9d8 100644 --- a/manifests/profile/base/ceilometer/expirer.pp +++ b/manifests/profile/base/ceilometer/expirer.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::ceilometer::expirer ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::ceilometer diff --git a/manifests/profile/base/ceilometer/upgrade.pp b/manifests/profile/base/ceilometer/upgrade.pp index d0fc9be..f192b48 100644 --- a/manifests/profile/base/ceilometer/upgrade.pp +++ b/manifests/profile/base/ceilometer/upgrade.pp @@ -30,7 +30,7 @@ class tripleo::profile::base::ceilometer::upgrade ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/ceph.pp b/manifests/profile/base/ceph.pp index f4404e0..6ada505 100644 --- a/manifests/profile/base/ceph.pp +++ b/manifests/profile/base/ceph.pp @@ -39,7 +39,7 @@ class tripleo::profile::base::ceph ( $ceph_mon_initial_members = hiera('ceph_mon_short_node_names', undef), $ceph_mon_host = hiera('ceph_mon_node_ips', '127.0.0.1'), $enable_ceph_storage = false, - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if ! $ceph_mon_initial_members { $ceph_mon_initial_members_real = hiera('ceph_mon_node_names', undef) diff --git a/manifests/profile/base/ceph/client.pp b/manifests/profile/base/ceph/client.pp index 53f09c2..a38a6c5 100644 --- a/manifests/profile/base/ceph/client.pp +++ b/manifests/profile/base/ceph/client.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::ceph::client ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::ceph diff --git a/manifests/profile/base/ceph/mds.pp b/manifests/profile/base/ceph/mds.pp index c5c7654..9cc2b20 100644 --- a/manifests/profile/base/ceph/mds.pp +++ b/manifests/profile/base/ceph/mds.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::ceph::mds ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::ceph diff --git a/manifests/profile/base/ceph/mon.pp b/manifests/profile/base/ceph/mon.pp index c0768b6..21c69e7 100644 --- a/manifests/profile/base/ceph/mon.pp +++ b/manifests/profile/base/ceph/mon.pp @@ -35,7 +35,7 @@ # class tripleo::profile::base::ceph::mon ( $ceph_pools = {}, - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::ceph diff --git a/manifests/profile/base/ceph/osd.pp b/manifests/profile/base/ceph/osd.pp index 6940bca..8b3d3c2 100644 --- a/manifests/profile/base/ceph/osd.pp +++ b/manifests/profile/base/ceph/osd.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::ceph::osd ( $ceph_osd_selinux_permissive = false, - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::ceph diff --git a/manifests/profile/base/ceph/rgw.pp b/manifests/profile/base/ceph/rgw.pp index d00f7cd..8a81efa 100644 --- a/manifests/profile/base/ceph/rgw.pp +++ b/manifests/profile/base/ceph/rgw.pp @@ -51,7 +51,7 @@ class tripleo::profile::base::ceph::rgw ( $civetweb_bind_ip = '127.0.0.1', $civetweb_bind_port = '8080', $rgw_keystone_version = 'v2.0', - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::ceph diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp index fc3c659..9b1b35a 100644 --- a/manifests/profile/base/cinder.pp +++ b/manifests/profile/base/cinder.pp @@ -77,7 +77,7 @@ class tripleo::profile::base::cinder ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $cinder_enable_db_purge = true, - $step = hiera('step'), + $step = Integer(hiera('step')), $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), $oslomsg_rpc_password = hiera('cinder::rabbit_password'), diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp index 2fd9a65..54880ad 100644 --- a/manifests/profile/base/cinder/api.pp +++ b/manifests/profile/base/cinder/api.pp @@ -53,7 +53,7 @@ class tripleo::profile::base::cinder::api ( $certificates_specs = hiera('apache_certificates_specs', {}), $cinder_api_network = hiera('cinder_api_network', undef), $enable_internal_tls = hiera('enable_internal_tls', false), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/cinder/backup.pp b/manifests/profile/base/cinder/backup.pp index df015f7..ecf65ea 100644 --- a/manifests/profile/base/cinder/backup.pp +++ b/manifests/profile/base/cinder/backup.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::cinder::backup ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder diff --git a/manifests/profile/base/cinder/backup/ceph.pp b/manifests/profile/base/cinder/backup/ceph.pp index 67a666e..d6eb47b 100644 --- a/manifests/profile/base/cinder/backup/ceph.pp +++ b/manifests/profile/base/cinder/backup/ceph.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::cinder::backup::ceph ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder::backup diff --git a/manifests/profile/base/cinder/backup/swift.pp b/manifests/profile/base/cinder/backup/swift.pp index 12561bf..b9a38fe 100644 --- a/manifests/profile/base/cinder/backup/swift.pp +++ b/manifests/profile/base/cinder/backup/swift.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::cinder::backup::swift ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder::backup diff --git a/manifests/profile/base/cinder/scheduler.pp b/manifests/profile/base/cinder/scheduler.pp index 4586929..9fd172f 100644 --- a/manifests/profile/base/cinder/scheduler.pp +++ b/manifests/profile/base/cinder/scheduler.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::cinder::scheduler ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder diff --git a/manifests/profile/base/cinder/volume.pp b/manifests/profile/base/cinder/volume.pp index e1370a3..3581540 100644 --- a/manifests/profile/base/cinder/volume.pp +++ b/manifests/profile/base/cinder/volume.pp @@ -74,7 +74,7 @@ class tripleo::profile::base::cinder::volume ( $cinder_enable_rbd_backend = false, $cinder_enable_scaleio_backend = false, $cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder diff --git a/manifests/profile/base/cinder/volume/dellps.pp b/manifests/profile/base/cinder/volume/dellps.pp index e825b61..e81a7e8 100644 --- a/manifests/profile/base/cinder/volume/dellps.pp +++ b/manifests/profile/base/cinder/volume/dellps.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::cinder::volume::dellps ( $backend_name = hiera('cinder::backend::eqlx::volume_backend_name', 'tripleo_dellps'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder::volume diff --git a/manifests/profile/base/cinder/volume/dellsc.pp b/manifests/profile/base/cinder/volume/dellsc.pp index a60eadf..3f3f61e 100644 --- a/manifests/profile/base/cinder/volume/dellsc.pp +++ b/manifests/profile/base/cinder/volume/dellsc.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::cinder::volume::dellsc ( $backend_name = hiera('cinder::backend::dellsc_iscsi::volume_backend_name', 'tripleo_dellsc'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder::volume diff --git a/manifests/profile/base/cinder/volume/hpelefthand.pp b/manifests/profile/base/cinder/volume/hpelefthand.pp index 32f0976..473791c 100644 --- a/manifests/profile/base/cinder/volume/hpelefthand.pp +++ b/manifests/profile/base/cinder/volume/hpelefthand.pp @@ -53,7 +53,7 @@ class tripleo::profile::base::cinder::volume::hpelefthand ( $cinder_hpelefthand_api_url = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_api_url', undef), $cinder_hpelefthand_iscsi_chap_enabled = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_iscsi_chap_enabled', undef), $cinder_hpelefthand_debug = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_debug', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder::volume diff --git a/manifests/profile/base/cinder/volume/iscsi.pp b/manifests/profile/base/cinder/volume/iscsi.pp index 4d333c8..7db5022 100644 --- a/manifests/profile/base/cinder/volume/iscsi.pp +++ b/manifests/profile/base/cinder/volume/iscsi.pp @@ -48,7 +48,7 @@ class tripleo::profile::base::cinder::volume::iscsi ( $cinder_iscsi_helper = 'tgtadm', $cinder_iscsi_protocol = 'iscsi', $cinder_lvm_loop_device_size = '10280', - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder::volume diff --git a/manifests/profile/base/cinder/volume/netapp.pp b/manifests/profile/base/cinder/volume/netapp.pp index 43978da..c58d937 100644 --- a/manifests/profile/base/cinder/volume/netapp.pp +++ b/manifests/profile/base/cinder/volume/netapp.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::cinder::volume::netapp ( $backend_name = hiera('cinder::backend::netapp::volume_backend_name', 'tripleo_netapp'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder::volume diff --git a/manifests/profile/base/cinder/volume/nfs.pp b/manifests/profile/base/cinder/volume/nfs.pp index e384a79..16a49e4 100644 --- a/manifests/profile/base/cinder/volume/nfs.pp +++ b/manifests/profile/base/cinder/volume/nfs.pp @@ -57,7 +57,7 @@ class tripleo::profile::base::cinder::volume::nfs ( $cinder_nfs_mount_options = '', $cinder_nas_secure_file_operations = $::os_service_default, $cinder_nas_secure_file_permissions = $::os_service_default, - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder::volume diff --git a/manifests/profile/base/cinder/volume/pure.pp b/manifests/profile/base/cinder/volume/pure.pp index e524919..c7ab1d1 100644 --- a/manifests/profile/base/cinder/volume/pure.pp +++ b/manifests/profile/base/cinder/volume/pure.pp @@ -48,7 +48,7 @@ # class tripleo::profile::base::cinder::volume::pure ( $backend_name = hiera('cinder::backend::pure::volume_backend_name', 'tripleo_pure'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder::volume diff --git a/manifests/profile/base/cinder/volume/rbd.pp b/manifests/profile/base/cinder/volume/rbd.pp index 1246de8..dee2e72 100644 --- a/manifests/profile/base/cinder/volume/rbd.pp +++ b/manifests/profile/base/cinder/volume/rbd.pp @@ -49,7 +49,7 @@ class tripleo::profile::base::cinder::volume::rbd ( $cinder_rbd_pool_name = 'volumes', $cinder_rbd_secret_uuid = hiera('ceph::profile::params::fsid', undef), $cinder_rbd_user_name = 'openstack', - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder::volume diff --git a/manifests/profile/base/cinder/volume/scaleio.pp b/manifests/profile/base/cinder/volume/scaleio.pp index a30cffa..bdd4dc9 100644 --- a/manifests/profile/base/cinder/volume/scaleio.pp +++ b/manifests/profile/base/cinder/volume/scaleio.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::cinder::volume::scaleio ( $backend_name = hiera('cinder::backend::scaleio::volume_backend_name', 'tripleo_scaleio'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::cinder::volume diff --git a/manifests/profile/base/congress.pp b/manifests/profile/base/congress.pp index 3d1a693..424cd95 100644 --- a/manifests/profile/base/congress.pp +++ b/manifests/profile/base/congress.pp @@ -52,7 +52,7 @@ class tripleo::profile::base::congress ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), $oslomsg_rpc_password = hiera('congress::rabbit_password'), diff --git a/manifests/profile/base/database/mongodb.pp b/manifests/profile/base/database/mongodb.pp index 4740d67..48bdd82 100644 --- a/manifests/profile/base/database/mongodb.pp +++ b/manifests/profile/base/database/mongodb.pp @@ -37,7 +37,7 @@ class tripleo::profile::base::database::mongodb ( $mongodb_replset, $bootstrap_node = downcase(hiera('bootstrap_nodeid')), - $step = hiera('step'), + $step = Integer(hiera('step')), $memory_limit = '20G', ) { if $step >= 2 { diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp index 2dac028..8eb6079 100644 --- a/manifests/profile/base/database/mysql.pp +++ b/manifests/profile/base/database/mysql.pp @@ -80,7 +80,7 @@ class tripleo::profile::base::database::mysql ( $mysql_server_options = {}, $mysql_max_connections = hiera('mysql_max_connections', undef), $remove_default_accounts = true, - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { diff --git a/manifests/profile/base/database/mysql/client.pp b/manifests/profile/base/database/mysql/client.pp index 3de1e97..1e55f05 100644 --- a/manifests/profile/base/database/mysql/client.pp +++ b/manifests/profile/base/database/mysql/client.pp @@ -50,7 +50,7 @@ class tripleo::profile::base::database::mysql::client ( $mysql_read_default_group = 'tripleo', $mysql_client_bind_address = undef, $ssl_ca = '/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt', - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 1 { # If the folder /etc/my.cnf.d does not exist (e.g. if mariadb is not diff --git a/manifests/profile/base/database/redis.pp b/manifests/profile/base/database/redis.pp index 14f6af4..e357359 100644 --- a/manifests/profile/base/database/redis.pp +++ b/manifests/profile/base/database/redis.pp @@ -34,10 +34,10 @@ class tripleo::profile::base::database::redis ( $bootstrap_nodeid = hiera('bootstrap_nodeid'), $redis_node_ips = hiera('redis_node_ips'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 2 { - if $bootstrap_nodeid == $::hostname { + if downcase($bootstrap_nodeid) == $::hostname { $slaveof = undef } else { $slaveof = "${bootstrap_nodeid} 6379" diff --git a/manifests/profile/base/docker.pp b/manifests/profile/base/docker.pp index 67fbd71..28a2764 100644 --- a/manifests/profile/base/docker.pp +++ b/manifests/profile/base/docker.pp @@ -66,7 +66,7 @@ class tripleo::profile::base::docker ( $docker_options = '--log-driver=journald --signature-verification=false', $configure_storage = true, $storage_options = '-s overlay2', - $step = hiera('step'), + $step = Integer(hiera('step')), $configure_libvirt_polkit = undef, $docker_nova_uid = 42436, $services_enabled = hiera('service_names', []) diff --git a/manifests/profile/base/etcd.pp b/manifests/profile/base/etcd.pp index 9f5d180..86240be 100644 --- a/manifests/profile/base/etcd.pp +++ b/manifests/profile/base/etcd.pp @@ -62,7 +62,7 @@ class tripleo::profile::base::etcd ( $nodes = hiera('etcd_node_names', []), $certificate_specs = {}, $enable_internal_tls = hiera('enable_internal_tls', false), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { validate_hash($certificate_specs) diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp index 8ed7fb7..2896185 100644 --- a/manifests/profile/base/glance/api.pp +++ b/manifests/profile/base/glance/api.pp @@ -86,7 +86,7 @@ class tripleo::profile::base::glance::api ( $glance_backend = downcase(hiera('glance_backend', 'swift')), $glance_network = hiera('glance_api_network', undef), $glance_nfs_enabled = false, - $step = hiera('step'), + $step = Integer(hiera('step')), $rabbit_hosts = hiera('rabbitmq_node_names', undef), $rabbit_port = hiera('glance::notify::rabbitmq::rabbit_port', 5672), $tls_proxy_bind_ip = undef, diff --git a/manifests/profile/base/gnocchi.pp b/manifests/profile/base/gnocchi.pp index 6a470ca..5b8c5fc 100644 --- a/manifests/profile/base/gnocchi.pp +++ b/manifests/profile/base/gnocchi.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::gnocchi ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 3 { include ::gnocchi diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp index a4e9a30..3953f04 100644 --- a/manifests/profile/base/gnocchi/api.pp +++ b/manifests/profile/base/gnocchi/api.pp @@ -68,7 +68,7 @@ class tripleo::profile::base::gnocchi::api ( $gnocchi_network = hiera('gnocchi_api_network', undef), $gnocchi_redis_password = hiera('gnocchi_redis_password'), $redis_vip = hiera('redis_vip'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -89,12 +89,11 @@ class tripleo::profile::base::gnocchi::api ( $tls_keyfile = undef } - if $step >= 3 and $sync_db { + if $step >= 4 and $sync_db { include ::gnocchi::db::sync } - if $step >= 3 { - include ::gnocchi::api + if $step >= 4 or ($step >= 3 and $sync_db) { include ::apache::mod::ssl class { '::gnocchi::wsgi::apache': ssl_cert => $tls_certfile, @@ -107,19 +106,20 @@ class tripleo::profile::base::gnocchi::api ( coordination_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/']), } case $gnocchi_backend { - 'swift': { include ::gnocchi::storage::swift } + 'swift': { + include ::gnocchi::storage::swift + if $sync_db { + 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' |> ~> Class['Gnocchi::db::sync'] + } + } 'file': { include ::gnocchi::storage::file } 'rbd': { include ::gnocchi::storage::ceph } default: { fail('Unrecognized gnocchi_backend parameter.') } } + include ::gnocchi::api } - # Re-run gnochci upgrade with storage as swift/ceph should be up at this - # stage. - if $step >= 5 and $sync_db { - exec {'run gnocchi upgrade with storage': - command => 'gnocchi-upgrade --config-file=/etc/gnocchi/gnocchi.conf', - path => ['/usr/bin', '/usr/sbin'], - } - } } diff --git a/manifests/profile/base/gnocchi/metricd.pp b/manifests/profile/base/gnocchi/metricd.pp index f6f80cd..c585e57 100644 --- a/manifests/profile/base/gnocchi/metricd.pp +++ b/manifests/profile/base/gnocchi/metricd.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::gnocchi::metricd ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::gnocchi diff --git a/manifests/profile/base/gnocchi/statsd.pp b/manifests/profile/base/gnocchi/statsd.pp index 7c98a0a..184ff7b 100644 --- a/manifests/profile/base/gnocchi/statsd.pp +++ b/manifests/profile/base/gnocchi/statsd.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::gnocchi::statsd ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::gnocchi diff --git a/manifests/profile/base/haproxy.pp b/manifests/profile/base/haproxy.pp index 9a03487..4f3322c 100644 --- a/manifests/profile/base/haproxy.pp +++ b/manifests/profile/base/haproxy.pp @@ -44,7 +44,7 @@ class tripleo::profile::base::haproxy ( $certificates_specs = {}, $enable_load_balancer = hiera('enable_load_balancer', true), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 1 { if $enable_load_balancer { diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp index 4ff5b41..ac1c6a2 100644 --- a/manifests/profile/base/heat.pp +++ b/manifests/profile/base/heat.pp @@ -83,7 +83,7 @@ class tripleo::profile::base::heat ( $bootstrap_node = downcase(hiera('bootstrap_nodeid')), $manage_db_purge = hiera('heat_enable_db_purge', true), $notification_driver = 'messaging', - $step = hiera('step'), + $step = Integer(hiera('step')), $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), $oslomsg_rpc_password = hiera('heat::rabbit_password'), diff --git a/manifests/profile/base/heat/api.pp b/manifests/profile/base/heat/api.pp index 79eb77e..ff90590 100644 --- a/manifests/profile/base/heat/api.pp +++ b/manifests/profile/base/heat/api.pp @@ -48,7 +48,7 @@ class tripleo::profile::base::heat::api ( $certificates_specs = hiera('apache_certificates_specs', {}), $enable_internal_tls = hiera('enable_internal_tls', false), $heat_api_network = hiera('heat_api_network', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::heat diff --git a/manifests/profile/base/heat/api_cfn.pp b/manifests/profile/base/heat/api_cfn.pp index dad7b76..e14760a 100644 --- a/manifests/profile/base/heat/api_cfn.pp +++ b/manifests/profile/base/heat/api_cfn.pp @@ -48,7 +48,7 @@ class tripleo::profile::base::heat::api_cfn ( $certificates_specs = hiera('apache_certificates_specs', {}), $enable_internal_tls = hiera('enable_internal_tls', false), $heat_api_cfn_network = hiera('heat_api_cfn_network', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::heat diff --git a/manifests/profile/base/heat/api_cloudwatch.pp b/manifests/profile/base/heat/api_cloudwatch.pp index 428bcf2..83d5307 100644 --- a/manifests/profile/base/heat/api_cloudwatch.pp +++ b/manifests/profile/base/heat/api_cloudwatch.pp @@ -48,7 +48,7 @@ class tripleo::profile::base::heat::api_cloudwatch ( $certificates_specs = hiera('apache_certificates_specs', {}), $enable_internal_tls = hiera('enable_internal_tls', false), $heat_api_cloudwatch_network = hiera('heat_api_cloudwatch_network', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::heat diff --git a/manifests/profile/base/heat/engine.pp b/manifests/profile/base/heat/engine.pp index 479e1c6..b9b44d1 100644 --- a/manifests/profile/base/heat/engine.pp +++ b/manifests/profile/base/heat/engine.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::heat::engine ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/horizon.pp b/manifests/profile/base/horizon.pp index 10eaaa6..12482b6 100644 --- a/manifests/profile/base/horizon.pp +++ b/manifests/profile/base/horizon.pp @@ -28,7 +28,7 @@ # Defaults to hiera('horizon::neutron_options', {}) # class tripleo::profile::base::horizon ( - $step = hiera('step'), + $step = Integer(hiera('step')), $neutron_options = hiera('horizon::neutron_options', {}), ) { if $step >= 3 { diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp index 7ba629f..2739f33 100644 --- a/manifests/profile/base/ironic.pp +++ b/manifests/profile/base/ironic.pp @@ -52,7 +52,7 @@ class tripleo::profile::base::ironic ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), $oslomsg_rpc_password = hiera('ironic::rabbit_password'), diff --git a/manifests/profile/base/ironic/api.pp b/manifests/profile/base/ironic/api.pp index 020cacb..bbc91f5 100644 --- a/manifests/profile/base/ironic/api.pp +++ b/manifests/profile/base/ironic/api.pp @@ -18,16 +18,68 @@ # # === Parameters # +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks +# Defaults to hiera('bootstrap_nodeid') +# +# [*certificates_specs*] +# (Optional) The specifications to give to certmonger for the certificate(s) +# it will create. +# Example with hiera: +# apache_certificates_specs: +# httpd-internal_api: +# hostname: <overcloud controller fqdn> +# service_certificate: <service certificate path> +# service_key: <service key path> +# principal: "haproxy/<overcloud controller fqdn>" +# Defaults to hiera('apache_certificate_specs', {}). +# +# [*ironic_api_network*] +# (Optional) The network name where the ironic API endpoint is listening on. +# This is set by t-h-t. +# Defaults to hiera('ironic_api_network', undef) +# +# [*enable_internal_tls*] +# (Optional) Whether TLS in the internal network is enabled or not. +# Defaults to hiera('enable_internal_tls', false) +# # [*step*] # (Optional) The current step of the deployment # Defaults to hiera('step') # class tripleo::profile::base::ironic::api ( - $step = hiera('step'), + $bootstrap_node = hiera('bootstrap_nodeid', undef), + $certificates_specs = hiera('apache_certificates_specs', {}), + $ironic_api_network = hiera('ironic_api_network', undef), + $enable_internal_tls = hiera('enable_internal_tls', false), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::ironic - if $step >= 4 { - include ::ironic::api + if $::hostname == downcase($bootstrap_node) { + $is_bootstrap = true + } else { + $is_bootstrap = false } + + if $enable_internal_tls { + if !$ironic_api_network { + fail('ironic_api_network is not set in the hieradata.') + } + $tls_certfile = $certificates_specs["httpd-${ironic_api_network}"]['service_certificate'] + $tls_keyfile = $certificates_specs["httpd-${ironic_api_network}"]['service_key'] + } else { + $tls_certfile = undef + $tls_keyfile = undef + } + + if $step >= 4 or ( $step >= 3 and $is_bootstrap ) { + include ::ironic::api + include ::apache::mod::ssl + class { '::ironic::wsgi::apache': + ssl_cert => $tls_certfile, + ssl_key => $tls_keyfile, + } + } + } diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp index f7a2eb0..390d547 100644 --- a/manifests/profile/base/ironic/conductor.pp +++ b/manifests/profile/base/ironic/conductor.pp @@ -27,7 +27,7 @@ # Defaults to true # class tripleo::profile::base::ironic::conductor ( - $step = hiera('step'), + $step = Integer(hiera('step')), $manage_pxe = true, ) { include ::tripleo::profile::base::ironic diff --git a/manifests/profile/base/ironic_inspector.pp b/manifests/profile/base/ironic_inspector.pp index b4276c6..4e5e92f 100644 --- a/manifests/profile/base/ironic_inspector.pp +++ b/manifests/profile/base/ironic_inspector.pp @@ -28,7 +28,7 @@ class tripleo::profile::base::ironic_inspector ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { diff --git a/manifests/profile/base/keepalived.pp b/manifests/profile/base/keepalived.pp index 8dd03dc..a841e06 100644 --- a/manifests/profile/base/keepalived.pp +++ b/manifests/profile/base/keepalived.pp @@ -49,7 +49,7 @@ class tripleo::profile::base::keepalived ( $control_virtual_ip = hiera('tripleo::keepalived::controller_virtual_ip'), $public_virtual_interface = hiera('tripleo::keepalived::public_virtual_interface', false), $public_virtual_ip = hiera('tripleo::keepalived::public_virtual_ip'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 1 { if $enable_load_balancer and hiera('enable_keepalived', true){ diff --git a/manifests/profile/base/kernel.pp b/manifests/profile/base/kernel.pp index df13a98..48caf37 100644 --- a/manifests/profile/base/kernel.pp +++ b/manifests/profile/base/kernel.pp @@ -17,14 +17,32 @@ # # Load and configure Kernel modules. # -class tripleo::profile::base::kernel { +# === Parameters +# +# [*module_list*] +# (Optional) List of kernel modules to load. +# Defaults to hiera('kernel_modules') +# +# [*sysctl_settings*] +# (Optional) List of sysctl settings to load. +# Defaults to hiera('sysctl_settings') +# +class tripleo::profile::base::kernel ( + $module_list = hiera('kernel_modules', undef), + $sysctl_settings = hiera('sysctl_settings', undef), +) { - if hiera('kernel_modules', undef) { - create_resources(kmod::load, hiera('kernel_modules'), { }) + if $module_list { + create_resources(kmod::load, $module_list, { }) } - if hiera('sysctl_settings', undef) { - create_resources(sysctl::value, hiera('sysctl_settings'), { }) + if $sysctl_settings { + create_resources(sysctl::value, $sysctl_settings, { }) } Exec <| tag == 'kmod::load' |> -> Sysctl <| |> + # RHEL 7.4+ workaround where this functionality is built into the + # kernel instead of being built as a module. + # That way, we can support both 7.3 and 7.4 RHEL versions. + # https://bugzilla.redhat.com/show_bug.cgi?id=1387537 + Exec <| title == 'modprobe nf_conntrack_proto_sctp' |> { returns => [0,1] } } diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index c7eea14..91a660c 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -150,7 +150,7 @@ class tripleo::profile::base::keystone ( $oslomsg_notify_port = hiera('keystone::rabbit_port', '5672'), $oslomsg_notify_username = hiera('keystone::rabbit_userid', 'guest'), $oslomsg_use_ssl = hiera('keystone::rabbit_use_ssl', '0'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/logging/fluentd.pp b/manifests/profile/base/logging/fluentd.pp index fc996e9..51869d6 100644 --- a/manifests/profile/base/logging/fluentd.pp +++ b/manifests/profile/base/logging/fluentd.pp @@ -59,7 +59,7 @@ # (Optional, default 42185) Port on which fluentd should listen if # $fluentd_listen_syslog is true. class tripleo::profile::base::logging::fluentd ( - $step = hiera('step', undef), + $step = Integer(hiera('step')), $fluentd_sources = undef, $fluentd_filters = undef, $fluentd_servers = undef, diff --git a/manifests/profile/base/manila.pp b/manifests/profile/base/manila.pp index cad2cdf..6386e6c 100644 --- a/manifests/profile/base/manila.pp +++ b/manifests/profile/base/manila.pp @@ -72,7 +72,7 @@ class tripleo::profile::base::manila ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), $oslomsg_rpc_password = hiera('manila::rabbit_password'), diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp index 021fffd..95607ae 100644 --- a/manifests/profile/base/manila/api.pp +++ b/manifests/profile/base/manila/api.pp @@ -44,7 +44,7 @@ class tripleo::profile::base::manila::api ( $backend_netapp_enabled = hiera('manila_backend_netapp_enabled', false), $backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false), $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/manila/scheduler.pp b/manifests/profile/base/manila/scheduler.pp index 07ea676..5c94bbe 100644 --- a/manifests/profile/base/manila/scheduler.pp +++ b/manifests/profile/base/manila/scheduler.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::manila::scheduler ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::manila diff --git a/manifests/profile/base/manila/share.pp b/manifests/profile/base/manila/share.pp index d39c55c..13cedec 100644 --- a/manifests/profile/base/manila/share.pp +++ b/manifests/profile/base/manila/share.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::manila::share ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::manila diff --git a/manifests/profile/base/memcached.pp b/manifests/profile/base/memcached.pp index 72a91e2..e33999a 100644 --- a/manifests/profile/base/memcached.pp +++ b/manifests/profile/base/memcached.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::memcached ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 1 { include ::memcached diff --git a/manifests/profile/base/metrics/collectd.pp b/manifests/profile/base/metrics/collectd.pp index d8e6f89..088e6e2 100644 --- a/manifests/profile/base/metrics/collectd.pp +++ b/manifests/profile/base/metrics/collectd.pp @@ -23,6 +23,11 @@ # for more details. # Defaults to hiera('step') # +# [*enable_file_logging*] +# (Optional) Boolean. Whether to enable logfile plugin. +# which we should send metrics. +# Defaults to false +# # [*collectd_server*] # (Optional) String. The name or address of a collectd server to # which we should send metrics. @@ -47,8 +52,9 @@ # deployment. This is used to look up service-specific plugins that # need to be installed. class tripleo::profile::base::metrics::collectd ( - $step = hiera('step'), + $step = Integer(hiera('step')), + $enable_file_logging = false, $collectd_server = undef, $collectd_port = undef, $collectd_username = undef, @@ -58,6 +64,9 @@ class tripleo::profile::base::metrics::collectd ( ) { if $step >= 3 { include ::collectd + if $enable_file_logging { + include ::collectd::plugin::logfile + } if ! ($collectd_securitylevel in [undef, 'None', 'Sign', 'Encrypt']) { fail('collectd_securitylevel must be one of (None, Sign, Encrypt).') diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp index 0eb849d..89577b8 100644 --- a/manifests/profile/base/mistral.pp +++ b/manifests/profile/base/mistral.pp @@ -73,7 +73,7 @@ class tripleo::profile::base::mistral ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), $oslomsg_rpc_password = hiera('mistral::rabbit_password'), diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp index 4f81725..2ea5c9a 100644 --- a/manifests/profile/base/mistral/api.pp +++ b/manifests/profile/base/mistral/api.pp @@ -53,7 +53,7 @@ class tripleo::profile::base::mistral::api ( $certificates_specs = hiera('apache_certificates_specs', {}), $enable_internal_tls = hiera('enable_internal_tls', false), $mistral_api_network = hiera('mistral_api_network', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/mistral/engine.pp b/manifests/profile/base/mistral/engine.pp index b2d8864..95581aa 100644 --- a/manifests/profile/base/mistral/engine.pp +++ b/manifests/profile/base/mistral/engine.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::mistral::engine ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/mistral/event_engine.pp b/manifests/profile/base/mistral/event_engine.pp index 4214429..f9ea2f8 100644 --- a/manifests/profile/base/mistral/event_engine.pp +++ b/manifests/profile/base/mistral/event_engine.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::mistral::event_engine ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp index 8e3f2c9..cce96dc 100644 --- a/manifests/profile/base/mistral/executor.pp +++ b/manifests/profile/base/mistral/executor.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::mistral::executor ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/monitoring/sensu.pp b/manifests/profile/base/monitoring/sensu.pp index 91b7ac7..41db598 100644 --- a/manifests/profile/base/monitoring/sensu.pp +++ b/manifests/profile/base/monitoring/sensu.pp @@ -23,7 +23,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::monitoring::sensu ( - $step = hiera('step', undef), + $step = Integer(hiera('step')), ) { include ::sensu package { 'osops-tools-monitoring-oschecks': diff --git a/manifests/profile/base/monitoring/uchiwa.pp b/manifests/profile/base/monitoring/uchiwa.pp index 2674b5f..153a0bd 100644 --- a/manifests/profile/base/monitoring/uchiwa.pp +++ b/manifests/profile/base/monitoring/uchiwa.pp @@ -23,9 +23,9 @@ # Defaults to hiera('step') # class tripleo::profile::base::monitoring::uchiwa ( - $step = hiera('step', undef), + $step = Integer(hiera('step')), ) { - if $step == undef or $step >= 3 { + if $step >= 3 { include ::uchiwa } } diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp index 2f01b75..e409261 100644 --- a/manifests/profile/base/neutron.pp +++ b/manifests/profile/base/neutron.pp @@ -80,7 +80,7 @@ # class tripleo::profile::base::neutron ( - $step = hiera('step'), + $step = Integer(hiera('step')), $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), $oslomsg_rpc_password = hiera('neutron::rabbit_password'), diff --git a/manifests/profile/base/neutron/agents/bagpipe.pp b/manifests/profile/base/neutron/agents/bagpipe.pp index fb5e000..de5bc17 100644 --- a/manifests/profile/base/neutron/agents/bagpipe.pp +++ b/manifests/profile/base/neutron/agents/bagpipe.pp @@ -27,7 +27,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::agents::bagpipe ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::neutron diff --git a/manifests/profile/base/neutron/agents/bigswitch.pp b/manifests/profile/base/neutron/agents/bigswitch.pp index 137dec0..e79c8a2 100644 --- a/manifests/profile/base/neutron/agents/bigswitch.pp +++ b/manifests/profile/base/neutron/agents/bigswitch.pp @@ -23,7 +23,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::agents::bigswitch( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::neutron::agents::bigswitch diff --git a/manifests/profile/base/neutron/agents/l2gw.pp b/manifests/profile/base/neutron/agents/l2gw.pp index 10cd662..a728fa3 100644 --- a/manifests/profile/base/neutron/agents/l2gw.pp +++ b/manifests/profile/base/neutron/agents/l2gw.pp @@ -27,7 +27,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::agents::l2gw ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::neutron::agents::l2gw diff --git a/manifests/profile/base/neutron/agents/midonet.pp b/manifests/profile/base/neutron/agents/midonet.pp index f2ce94a..c967589 100644 --- a/manifests/profile/base/neutron/agents/midonet.pp +++ b/manifests/profile/base/neutron/agents/midonet.pp @@ -33,7 +33,7 @@ class tripleo::profile::base::neutron::agents::midonet ( $midonet_libvirt_qemu_data = hiera('midonet_libvirt_qemu_data', ''), $neutron_api_node_ips = hiera('neutron_api_node_ips', ''), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { # TODO(devvesa) provide non-controller ips for these services diff --git a/manifests/profile/base/neutron/agents/nuage.pp b/manifests/profile/base/neutron/agents/nuage.pp index 80beceb..2358a04 100644 --- a/manifests/profile/base/neutron/agents/nuage.pp +++ b/manifests/profile/base/neutron/agents/nuage.pp @@ -43,7 +43,7 @@ class tripleo::profile::base::neutron::agents::nuage ( $nova_metadata_ip = hiera('nova_metadata_node_ips', ''), $nova_os_password = hiera('nova_password', ''), $nova_os_tenant_name = hiera('nova::api::admin_tenant_name', ''), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::nuage::vrs diff --git a/manifests/profile/base/neutron/agents/ovn.pp b/manifests/profile/base/neutron/agents/ovn.pp index a593092..9f37bbf 100644 --- a/manifests/profile/base/neutron/agents/ovn.pp +++ b/manifests/profile/base/neutron/agents/ovn.pp @@ -32,7 +32,7 @@ class tripleo::profile::base::neutron::agents::ovn ( $ovn_db_host = hiera('ovn_dbs_vip'), $ovn_sbdb_port = hiera('ovn::southbound::port'), - $step = hiera('step') + $step = Integer(hiera('step')) ) { if $step >= 4 { class { '::ovn::controller': diff --git a/manifests/profile/base/neutron/agents/vpp.pp b/manifests/profile/base/neutron/agents/vpp.pp index e961aa7..6c55b86 100644 --- a/manifests/profile/base/neutron/agents/vpp.pp +++ b/manifests/profile/base/neutron/agents/vpp.pp @@ -32,7 +32,7 @@ # Defaults to 2379 # class tripleo::profile::base::neutron::agents::vpp( - $step = hiera('step'), + $step = Integer(hiera('step')), $etcd_host = hiera('etcd_vip'), $etcd_port = 2379, ) { diff --git a/manifests/profile/base/neutron/bgpvpn.pp b/manifests/profile/base/neutron/bgpvpn.pp index d6fdf4e..b2187df 100644 --- a/manifests/profile/base/neutron/bgpvpn.pp +++ b/manifests/profile/base/neutron/bgpvpn.pp @@ -27,7 +27,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::bgpvpn ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::neutron diff --git a/manifests/profile/base/neutron/dhcp.pp b/manifests/profile/base/neutron/dhcp.pp index 24b1a35..54904f2 100644 --- a/manifests/profile/base/neutron/dhcp.pp +++ b/manifests/profile/base/neutron/dhcp.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::dhcp ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::tripleo::profile::base::neutron diff --git a/manifests/profile/base/neutron/l2gw.pp b/manifests/profile/base/neutron/l2gw.pp index da71108..cd6239e 100644 --- a/manifests/profile/base/neutron/l2gw.pp +++ b/manifests/profile/base/neutron/l2gw.pp @@ -27,7 +27,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::l2gw ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::neutron diff --git a/manifests/profile/base/neutron/l3.pp b/manifests/profile/base/neutron/l3.pp index 14ffa82..90d8ace 100644 --- a/manifests/profile/base/neutron/l3.pp +++ b/manifests/profile/base/neutron/l3.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::l3 ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::tripleo::profile::base::neutron diff --git a/manifests/profile/base/neutron/lbaas.pp b/manifests/profile/base/neutron/lbaas.pp index a6e42ee..8bce0b1 100644 --- a/manifests/profile/base/neutron/lbaas.pp +++ b/manifests/profile/base/neutron/lbaas.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::neutron::lbaas( $manage_haproxy_package = hiera('manage_haproxy_package', false), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::neutron diff --git a/manifests/profile/base/neutron/linuxbridge.pp b/manifests/profile/base/neutron/linuxbridge.pp index 9f4899a..36be214 100644 --- a/manifests/profile/base/neutron/linuxbridge.pp +++ b/manifests/profile/base/neutron/linuxbridge.pp @@ -10,7 +10,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::linuxbridge( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::neutron diff --git a/manifests/profile/base/neutron/metadata.pp b/manifests/profile/base/neutron/metadata.pp index 4cc6748..66de883 100644 --- a/manifests/profile/base/neutron/metadata.pp +++ b/manifests/profile/base/neutron/metadata.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::metadata ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::tripleo::profile::base::neutron diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp index 3ba9dd9..0e40ede 100644 --- a/manifests/profile/base/neutron/midonet.pp +++ b/manifests/profile/base/neutron/midonet.pp @@ -69,7 +69,7 @@ class tripleo::profile::base::neutron::midonet ( $neutron_api_node_ips = hiera('neutron_api_node_ips', ''), $neutron_auth_password = hiera('neutron::keystone::authtoken::password', ''), $neutron_auth_tenant = hiera('neutron::keystone::authtoken::project_name', ''), - $step = hiera('step'), + $step = Integer(hiera('step')), $vip = hiera('public_virtual_ip'), $zk_on_controller = hiera('enable_zookeeper_on_controller', ''), $zookeeper_client_ip = hiera('neutron::bind_host', ''), diff --git a/manifests/profile/base/neutron/n1k.pp b/manifests/profile/base/neutron/n1k.pp index 8c8cfbd..e61023d 100644 --- a/manifests/profile/base/neutron/n1k.pp +++ b/manifests/profile/base/neutron/n1k.pp @@ -34,7 +34,7 @@ class tripleo::profile::base::neutron::n1k ( $n1kv_source = hiera('n1kv_vem_source', undef), $n1kv_version = hiera('n1kv_vem_version', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::neutron::plugins::ml2::cisco::nexus1000v include ::tripleo::profile::base::neutron diff --git a/manifests/profile/base/neutron/opencontrail/vrouter.pp b/manifests/profile/base/neutron/opencontrail/vrouter.pp index 90ab71c..4330dc4 100644 --- a/manifests/profile/base/neutron/opencontrail/vrouter.pp +++ b/manifests/profile/base/neutron/opencontrail/vrouter.pp @@ -23,7 +23,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::opencontrail::vrouter ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { diff --git a/manifests/profile/base/neutron/opendaylight.pp b/manifests/profile/base/neutron/opendaylight.pp index b5e6d11..5d25ae2 100644 --- a/manifests/profile/base/neutron/opendaylight.pp +++ b/manifests/profile/base/neutron/opendaylight.pp @@ -31,7 +31,7 @@ # Defaults to hiera('bootstack_nodeid') # class tripleo::profile::base::neutron::opendaylight ( - $step = hiera('step'), + $step = Integer(hiera('step')), $odl_api_ips = hiera('opendaylight_api_node_ips'), $node_name = hiera('bootstack_nodeid') ) { diff --git a/manifests/profile/base/neutron/opendaylight/configure_cluster.pp b/manifests/profile/base/neutron/opendaylight/configure_cluster.pp new file mode 100644 index 0000000..022e8ae --- /dev/null +++ b/manifests/profile/base/neutron/opendaylight/configure_cluster.pp @@ -0,0 +1,45 @@ +# Copyright 2017 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# Configures an OpenDaylight cluster. +# It creates the akka configuration file for ODL to cluster correctly +# It will not configure clustering if less than 3 nodes +# +# == Function: tripleo::profile::base::neutron::opendaylight::configure_cluster +# +# == Parameters +# +# [*node_name*] +# The short hostname of node +# +# [*odl_api_ips*] Array of IPs per ODL node +# Defaults to empty array +# +define tripleo::profile::base::neutron::opendaylight::configure_cluster( + $node_name, + $odl_api_ips = [], +) { + validate_array($odl_api_ips) + if size($odl_api_ips) > 2 { + $node_string = split($node_name, '-') + $ha_node_index = $node_string[-1] + 1 + $ha_node_ip_str = join($odl_api_ips, ' ') + exec { 'Configure ODL Clustering': + command => "configure_cluster.sh ${ha_node_index} ${ha_node_ip_str}", + path => '/opt/opendaylight/bin/:/usr/sbin:/usr/bin:/sbin:/bin', + creates => '/opt/opendaylight/configuration/initial/akka.conf' + } + } +} + diff --git a/manifests/profile/base/neutron/opendaylight/create_cluster.pp b/manifests/profile/base/neutron/opendaylight/create_cluster.pp new file mode 100644 index 0000000..c3e4f7f --- /dev/null +++ b/manifests/profile/base/neutron/opendaylight/create_cluster.pp @@ -0,0 +1,43 @@ +# Copyright 2017 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# Configures an OpenDaylight cluster. +# It creates the akka configuration file for ODL to cluster correctly +# It will not configure clustering if less than 3 nodes +# +# == Class: tripleo::profile::base::neutron::opendaylight::create_cluster +# +# OpenDaylight class only used for creating clusters with container deployments +# +# === Parameters +# +# [*odl_api_ips*] +# (Optional) List of OpenStack Controller IPs for ODL API +# Defaults to hiera('opendaylight_api_node_ips') +# +# [*node_name*] +# (Optional) The short hostname of node +# Defaults to hiera('bootstack_nodeid') +# +class tripleo::profile::base::neutron::opendaylight::create_cluster ( + $odl_api_ips = hiera('opendaylight_api_node_ips'), + $node_name = hiera('bootstack_nodeid') +) { + + tripleo::profile::base::neutron::opendaylight::configure_cluster {'ODL cluster': + node_name => $node_name, + odl_api_ips => $odl_api_ips, + } + +} diff --git a/manifests/profile/base/neutron/ovn_northd.pp b/manifests/profile/base/neutron/ovn_northd.pp index 0b46d5c..721e84e 100644 --- a/manifests/profile/base/neutron/ovn_northd.pp +++ b/manifests/profile/base/neutron/ovn_northd.pp @@ -27,7 +27,7 @@ # class tripleo::profile::base::neutron::ovn_northd ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { # Note this only runs on the first node in the cluster when diff --git a/manifests/profile/base/neutron/ovs.pp b/manifests/profile/base/neutron/ovs.pp index 97eb8e9..8794d74 100644 --- a/manifests/profile/base/neutron/ovs.pp +++ b/manifests/profile/base/neutron/ovs.pp @@ -29,7 +29,7 @@ # client mode. class tripleo::profile::base::neutron::ovs( - $step = hiera('step'), + $step = Integer(hiera('step')), $vhostuser_socket_dir = hiera('neutron::agents::ml2::ovs::vhostuser_socket_dir', undef) ) { include ::tripleo::profile::base::neutron diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp index 1702fed..1f440fa 100644 --- a/manifests/profile/base/neutron/plugins/ml2.pp +++ b/manifests/profile/base/neutron/plugins/ml2.pp @@ -34,7 +34,7 @@ class tripleo::profile::base::neutron::plugins::ml2 ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true @@ -85,5 +85,9 @@ class tripleo::profile::base::neutron::plugins::ml2 ( if 'vpp' in $mechanism_drivers { include ::tripleo::profile::base::neutron::plugins::ml2::vpp } + + if 'nuage' in $mechanism_drivers { + include ::tripleo::profile::base::neutron::plugins::ml2::nuage + } } } diff --git a/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp b/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp index 161cd75..44521ef 100644 --- a/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp +++ b/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp @@ -27,7 +27,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::plugins::ml2::bagpipe ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::neutron diff --git a/manifests/profile/base/neutron/plugins/ml2/nuage.pp b/manifests/profile/base/neutron/plugins/ml2/nuage.pp new file mode 100644 index 0000000..e9608d0 --- /dev/null +++ b/manifests/profile/base/neutron/plugins/ml2/nuage.pp @@ -0,0 +1,31 @@ +# Copyright 2017 Nuage Networks from Nokia Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# == Class: tripleo::profile::base::neutron::plugins::ml2::nuage +# +# Nuage Neutron ML2 profile for tripleo +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +class tripleo::profile::base::neutron::plugins::ml2::nuage ( + $step = hiera('step'), +) { + + if $step >= 4 { + include ::neutron::plugins::ml2::nuage + } +} diff --git a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp index 2618d4f..bffcb39 100644 --- a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp +++ b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp @@ -49,7 +49,7 @@ class tripleo::profile::base::neutron::plugins::ml2::opendaylight ( $odl_password = hiera('opendaylight::password'), $odl_url_ip = hiera('opendaylight_api_vip'), $conn_proto = hiera('opendaylight::nb_connection_protocol'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { diff --git a/manifests/profile/base/neutron/plugins/ml2/ovn.pp b/manifests/profile/base/neutron/plugins/ml2/ovn.pp index b5b7a0a..fad907c 100644 --- a/manifests/profile/base/neutron/plugins/ml2/ovn.pp +++ b/manifests/profile/base/neutron/plugins/ml2/ovn.pp @@ -37,7 +37,7 @@ class tripleo::profile::base::neutron::plugins::ml2::ovn ( $ovn_db_host = hiera('ovn_dbs_vip'), $ovn_nb_port = hiera('ovn::northbound::port'), $ovn_sb_port = hiera('ovn::southbound::port'), - $step = hiera('step') + $step = Integer(hiera('step')) ) { if $step >= 4 { class { '::neutron::plugins::ml2::ovn': diff --git a/manifests/profile/base/neutron/plugins/ml2/vpp.pp b/manifests/profile/base/neutron/plugins/ml2/vpp.pp index 217e4cf..7d59239 100644 --- a/manifests/profile/base/neutron/plugins/ml2/vpp.pp +++ b/manifests/profile/base/neutron/plugins/ml2/vpp.pp @@ -32,7 +32,7 @@ # Defaults to 2379 # class tripleo::profile::base::neutron::plugins::ml2::vpp ( - $step = hiera('step'), + $step = Integer(hiera('step')), $etcd_host = hiera('etcd_vip'), $etcd_port = 2379, ) { diff --git a/manifests/profile/base/neutron/plugins/nsx_v3.pp b/manifests/profile/base/neutron/plugins/nsx_v3.pp index 33fa0cf..b534a2f 100644 --- a/manifests/profile/base/neutron/plugins/nsx_v3.pp +++ b/manifests/profile/base/neutron/plugins/nsx_v3.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::neutron::plugins::nsx_v3 ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/neutron/plugins/nuage.pp b/manifests/profile/base/neutron/plugins/nuage.pp index 0843ec4..ccfcae1 100644 --- a/manifests/profile/base/neutron/plugins/nuage.pp +++ b/manifests/profile/base/neutron/plugins/nuage.pp @@ -27,7 +27,7 @@ # class tripleo::profile::base::neutron::plugins::nuage ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/neutron/plugins/opencontrail.pp b/manifests/profile/base/neutron/plugins/opencontrail.pp index fbf46e7..d13af61 100644 --- a/manifests/profile/base/neutron/plugins/opencontrail.pp +++ b/manifests/profile/base/neutron/plugins/opencontrail.pp @@ -27,7 +27,7 @@ # class tripleo::profile::base::neutron::plugins::opencontrail ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp index 4da8df9..59060a6 100644 --- a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp +++ b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp @@ -49,7 +49,7 @@ class tripleo::profile::base::neutron::plugins::ovs::opendaylight ( $odl_api_ips = hiera('opendaylight_api_node_ips'), $odl_url_ip = hiera('opendaylight_api_vip'), $conn_proto = hiera('opendaylight::nb_connection_protocol'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { diff --git a/manifests/profile/base/neutron/plugins/plumgrid.pp b/manifests/profile/base/neutron/plugins/plumgrid.pp index bc73d29..606f001 100644 --- a/manifests/profile/base/neutron/plugins/plumgrid.pp +++ b/manifests/profile/base/neutron/plugins/plumgrid.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::neutron::plugins::plumgrid ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/neutron/plumgrid.pp b/manifests/profile/base/neutron/plumgrid.pp index 03dc101..cafeefe 100644 --- a/manifests/profile/base/neutron/plumgrid.pp +++ b/manifests/profile/base/neutron/plumgrid.pp @@ -22,7 +22,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::plumgrid ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp index d67a40c..0dee53e 100644 --- a/manifests/profile/base/neutron/server.pp +++ b/manifests/profile/base/neutron/server.pp @@ -90,7 +90,7 @@ class tripleo::profile::base::neutron::server ( $l3_ha_override = '', $l3_nodes = hiera('neutron_l3_short_node_names', []), $neutron_network = hiera('neutron_api_network', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), $tls_proxy_bind_ip = undef, $tls_proxy_fqdn = undef, $tls_proxy_port = 9696, diff --git a/manifests/profile/base/neutron/sriov.pp b/manifests/profile/base/neutron/sriov.pp index 095da0f..3c06beb 100644 --- a/manifests/profile/base/neutron/sriov.pp +++ b/manifests/profile/base/neutron/sriov.pp @@ -25,7 +25,7 @@ # class tripleo::profile::base::neutron::sriov( - $step = hiera('step') + $step = Integer(hiera('step')) ) { include ::tripleo::profile::base::neutron diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index d786940..65e8ebc 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -112,7 +112,7 @@ class tripleo::profile::base::nova ( $oslomsg_notify_username = hiera('nova::rabbit_userid', 'guest'), $oslomsg_use_ssl = hiera('nova::rabbit_use_ssl', '0'), $nova_compute_enabled = false, - $step = hiera('step'), + $step = Integer(hiera('step')), $migration_ssh_key = {}, $migration_ssh_localaddrs = [], $libvirt_tls = false diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp index bdb3007..0dcc754 100644 --- a/manifests/profile/base/nova/api.pp +++ b/manifests/profile/base/nova/api.pp @@ -57,7 +57,7 @@ class tripleo::profile::base::nova::api ( $enable_internal_tls = hiera('enable_internal_tls', false), $nova_api_network = hiera('nova_api_network', undef), $nova_api_wsgi_enabled = hiera('nova_wsgi_enabled', false), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/nova/authtoken.pp b/manifests/profile/base/nova/authtoken.pp index ee6c331..d8285ba 100644 --- a/manifests/profile/base/nova/authtoken.pp +++ b/manifests/profile/base/nova/authtoken.pp @@ -35,7 +35,7 @@ # Defaults to hiera('memcached_node_ips', ['127.0.0.1']) # class tripleo::profile::base::nova::authtoken ( - $step = hiera('step'), + $step = Integer(hiera('step')), $use_ipv6 = hiera('nova::use_ipv6', false), $memcache_nodes_ipv6 = hiera('memcached_node_ips_v6', ['::1']), $memcache_nodes_ipv4 = hiera('memcached_node_ips', ['127.0.0.1']), diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp index 84b8bd5..bd50204 100644 --- a/manifests/profile/base/nova/compute.pp +++ b/manifests/profile/base/nova/compute.pp @@ -28,7 +28,7 @@ # Defaults to hiera('cinder_enable_nfs_backend', false) # class tripleo::profile::base::nova::compute ( - $step = hiera('step'), + $step = Integer(hiera('step')), $cinder_nfs_backend = hiera('cinder_enable_nfs_backend', false), ) { diff --git a/manifests/profile/base/nova/compute/ironic.pp b/manifests/profile/base/nova/compute/ironic.pp index c0213fb..52b3020 100644 --- a/manifests/profile/base/nova/compute/ironic.pp +++ b/manifests/profile/base/nova/compute/ironic.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::nova::compute::ironic ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::tripleo::profile::base::nova::compute diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp index cc9beb6..ec592cb 100644 --- a/manifests/profile/base/nova/compute/libvirt.pp +++ b/manifests/profile/base/nova/compute/libvirt.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::nova::compute::libvirt ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::tripleo::profile::base::nova::compute diff --git a/manifests/profile/base/nova/conductor.pp b/manifests/profile/base/nova/conductor.pp index fa9f12b..d9d55d2 100644 --- a/manifests/profile/base/nova/conductor.pp +++ b/manifests/profile/base/nova/conductor.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::nova::conductor ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::nova if $step >= 4 { diff --git a/manifests/profile/base/nova/consoleauth.pp b/manifests/profile/base/nova/consoleauth.pp index 8ccfb8c..4c2807c 100644 --- a/manifests/profile/base/nova/consoleauth.pp +++ b/manifests/profile/base/nova/consoleauth.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::nova::consoleauth ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::tripleo::profile::base::nova diff --git a/manifests/profile/base/nova/ec2api.pp b/manifests/profile/base/nova/ec2api.pp index f8817d2..00a6a14 100644 --- a/manifests/profile/base/nova/ec2api.pp +++ b/manifests/profile/base/nova/ec2api.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::nova::ec2api ( - $step = hiera('step') + $step = Integer(hiera('step')) ) { if $step >= 4 { include ::ec2api diff --git a/manifests/profile/base/nova/libvirt.pp b/manifests/profile/base/nova/libvirt.pp index 889b80d..b639858 100644 --- a/manifests/profile/base/nova/libvirt.pp +++ b/manifests/profile/base/nova/libvirt.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::nova::libvirt ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::tripleo::profile::base::nova diff --git a/manifests/profile/base/nova/placement.pp b/manifests/profile/base/nova/placement.pp index c78b3c2..ac78287 100644 --- a/manifests/profile/base/nova/placement.pp +++ b/manifests/profile/base/nova/placement.pp @@ -51,7 +51,7 @@ class tripleo::profile::base::nova::placement ( $certificates_specs = hiera('apache_certificates_specs', {}), $enable_internal_tls = hiera('enable_internal_tls', false), $nova_placement_network = hiera('nova_placement_network', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/nova/scheduler.pp b/manifests/profile/base/nova/scheduler.pp index 3c9b2c2..a9db318 100644 --- a/manifests/profile/base/nova/scheduler.pp +++ b/manifests/profile/base/nova/scheduler.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::nova::scheduler ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::tripleo::profile::base::nova diff --git a/manifests/profile/base/nova/vncproxy.pp b/manifests/profile/base/nova/vncproxy.pp index f654fef..25ab3fe 100644 --- a/manifests/profile/base/nova/vncproxy.pp +++ b/manifests/profile/base/nova/vncproxy.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::nova::vncproxy ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::tripleo::profile::base::nova diff --git a/manifests/profile/base/novajoin.pp b/manifests/profile/base/novajoin.pp index f9c1ea9..c28508b 100644 --- a/manifests/profile/base/novajoin.pp +++ b/manifests/profile/base/novajoin.pp @@ -63,7 +63,7 @@ class tripleo::profile::base::novajoin ( $oslomsg_rpc_port = '5672', $oslomsg_rpc_username = 'guest', $oslomsg_use_ssl = '0', - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 3 { $oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl))) diff --git a/manifests/profile/base/octavia.pp b/manifests/profile/base/octavia.pp index e8310d8..00252e3 100644 --- a/manifests/profile/base/octavia.pp +++ b/manifests/profile/base/octavia.pp @@ -47,7 +47,7 @@ # Defaults to hiera('octavia::rabbit_use_ssl', '0') class tripleo::profile::base::octavia ( - $step = hiera('step'), + $step = Integer(hiera('step')), $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), $oslomsg_rpc_password = hiera('octavia::rabbit_password'), diff --git a/manifests/profile/base/octavia/api.pp b/manifests/profile/base/octavia/api.pp index d457478..2604711 100644 --- a/manifests/profile/base/octavia/api.pp +++ b/manifests/profile/base/octavia/api.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::octavia::api ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/octavia/health_manager.pp b/manifests/profile/base/octavia/health_manager.pp index bac5f65..8bb486a 100644 --- a/manifests/profile/base/octavia/health_manager.pp +++ b/manifests/profile/base/octavia/health_manager.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::octavia::health_manager ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::octavia if $step >= 5 { diff --git a/manifests/profile/base/octavia/housekeeping.pp b/manifests/profile/base/octavia/housekeeping.pp index 0dcd5cf..d6f85ac 100644 --- a/manifests/profile/base/octavia/housekeeping.pp +++ b/manifests/profile/base/octavia/housekeeping.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::octavia::housekeeping ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::octavia diff --git a/manifests/profile/base/octavia/worker.pp b/manifests/profile/base/octavia/worker.pp index 7df324d..ce49455 100644 --- a/manifests/profile/base/octavia/worker.pp +++ b/manifests/profile/base/octavia/worker.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::octavia::worker ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::octavia diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp index 811b911..bc15e62 100644 --- a/manifests/profile/base/pacemaker.pp +++ b/manifests/profile/base/pacemaker.pp @@ -64,7 +64,7 @@ # Defaults to hiera('pacemaker_cluster_recheck_interval', undef) # class tripleo::profile::base::pacemaker ( - $step = hiera('step'), + $step = Integer(hiera('step')), $pcs_tries = hiera('pcs_tries', 20), $remote_short_node_names = hiera('pacemaker_remote_short_node_names', []), $remote_node_ips = hiera('pacemaker_remote_node_ips', []), @@ -111,9 +111,11 @@ class tripleo::profile::base::pacemaker ( cluster_setup_extras => $cluster_setup_extras, remote_authkey => $remote_authkey, } - class { '::pacemaker::stonith': - disable => !$enable_fencing, - tries => $pcs_tries, + if $pacemaker_master { + class { '::pacemaker::stonith': + disable => !$enable_fencing, + tries => $pcs_tries, + } } if $enable_fencing { include ::tripleo::fencing diff --git a/manifests/profile/base/pacemaker_remote.pp b/manifests/profile/base/pacemaker_remote.pp index dfe0a3e..f4265ff 100644 --- a/manifests/profile/base/pacemaker_remote.pp +++ b/manifests/profile/base/pacemaker_remote.pp @@ -39,18 +39,13 @@ class tripleo::profile::base::pacemaker_remote ( $remote_authkey, $pcs_tries = hiera('pcs_tries', 20), $enable_fencing = hiera('enable_fencing', false), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { class { '::pacemaker::remote': remote_authkey => $remote_authkey, } $enable_fencing_real = str2bool($enable_fencing) and $step >= 5 - class { '::pacemaker::stonith': - disable => !$enable_fencing_real, - tries => $pcs_tries, - } - if $enable_fencing_real { include ::tripleo::fencing @@ -58,7 +53,5 @@ class tripleo::profile::base::pacemaker_remote ( Pcmk_resource<||> -> Class['tripleo::fencing'] Pcmk_constraint<||> -> Class['tripleo::fencing'] Exec <| tag == 'pacemaker_constraint' |> -> Class['tripleo::fencing'] - # enable stonith after all fencing devices have been created - Class['tripleo::fencing'] -> Class['pacemaker::stonith'] } } diff --git a/manifests/profile/base/panko.pp b/manifests/profile/base/panko.pp index 286e4ac..8c31339 100644 --- a/manifests/profile/base/panko.pp +++ b/manifests/profile/base/panko.pp @@ -25,7 +25,7 @@ # class tripleo::profile::base::panko ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 3 { include ::panko diff --git a/manifests/profile/base/panko/api.pp b/manifests/profile/base/panko/api.pp index 165969f..3b1b8d9 100644 --- a/manifests/profile/base/panko/api.pp +++ b/manifests/profile/base/panko/api.pp @@ -53,7 +53,7 @@ class tripleo::profile::base::panko::api ( $certificates_specs = hiera('apache_certificates_specs', {}), $enable_internal_tls = hiera('enable_internal_tls', false), $panko_network = hiera('panko_api_network', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/qdr.pp b/manifests/profile/base/qdr.pp index 9827f2e..37cf9e5 100644 --- a/manifests/profile/base/qdr.pp +++ b/manifests/profile/base/qdr.pp @@ -40,7 +40,7 @@ class tripleo::profile::base::qdr ( $qdr_username = undef, $qdr_password = undef, $qdr_listener_port = hiera('tripleo::profile::base::qdr::qdr_listener_port', 5672), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 1 { class { '::qdr': diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp index 8551f19..8ab6049 100644 --- a/manifests/profile/base/rabbitmq.pp +++ b/manifests/profile/base/rabbitmq.pp @@ -88,7 +88,7 @@ class tripleo::profile::base::rabbitmq ( $rabbitmq_pass = hiera('rabbitmq::default_pass'), $rabbitmq_user = hiera('rabbitmq::default_user'), $stack_action = hiera('stack_action'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $enable_internal_tls { $tls_certfile = $certificate_specs['service_certificate'] diff --git a/manifests/profile/base/sahara.pp b/manifests/profile/base/sahara.pp index 7f4ecbe..d465304 100644 --- a/manifests/profile/base/sahara.pp +++ b/manifests/profile/base/sahara.pp @@ -72,7 +72,7 @@ class tripleo::profile::base::sahara ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), $oslomsg_rpc_password = hiera('sahara::rabbit_password'), diff --git a/manifests/profile/base/sahara/api.pp b/manifests/profile/base/sahara/api.pp index 1ead106..83f1956 100644 --- a/manifests/profile/base/sahara/api.pp +++ b/manifests/profile/base/sahara/api.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::sahara::api ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { include ::tripleo::profile::base::sahara diff --git a/manifests/profile/base/sahara/engine.pp b/manifests/profile/base/sahara/engine.pp index e2da0e7..1bbbfa2 100644 --- a/manifests/profile/base/sahara/engine.pp +++ b/manifests/profile/base/sahara/engine.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::sahara::engine ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/securetty.pp b/manifests/profile/base/securetty.pp index 07f29f8..5c36fe6 100644 --- a/manifests/profile/base/securetty.pp +++ b/manifests/profile/base/securetty.pp @@ -29,7 +29,7 @@ # Defaults to hiera('securetty::tty_list') # class tripleo::profile::base::securetty ( - $step = hiera('step'), + $step = Integer(hiera('step')), $tty_list = hiera('tty_list', []), ) { validate_array($tty_list) diff --git a/manifests/profile/base/snmp.pp b/manifests/profile/base/snmp.pp index d12e34d..ecef5ae 100644 --- a/manifests/profile/base/snmp.pp +++ b/manifests/profile/base/snmp.pp @@ -34,7 +34,7 @@ class tripleo::profile::base::snmp ( $snmpd_password = hiera('snmpd_readonly_user_password'), $snmpd_user = hiera('snmpd_readonly_user_name'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { snmp::snmpv3_user { $snmpd_user: diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp index 4e0e568..b047c36 100644 --- a/manifests/profile/base/swift/proxy.pp +++ b/manifests/profile/base/swift/proxy.pp @@ -107,7 +107,7 @@ class tripleo::profile::base::swift::proxy ( $enable_internal_tls = hiera('enable_internal_tls', false), $memcache_port = 11211, $memcache_servers = hiera('memcached_node_ips'), - $step = hiera('step'), + $step = Integer(hiera('step')), $swift_proxy_network = hiera('swift_proxy_network', undef), $tls_proxy_bind_ip = undef, $tls_proxy_fqdn = undef, diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp index 67156d4..3ab3234 100644 --- a/manifests/profile/base/swift/ringbuilder.pp +++ b/manifests/profile/base/swift/ringbuilder.pp @@ -77,7 +77,7 @@ class tripleo::profile::base::swift::ringbuilder ( $replicas, $build_ring = true, $devices = undef, - $step = hiera('step'), + $step = Integer(hiera('step')), $swift_zones = '1', $raw_disk_prefix = 'r1z1-', $raw_disks = [], diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp index 5018d77..3d0ba16 100644 --- a/manifests/profile/base/swift/storage.pp +++ b/manifests/profile/base/swift/storage.pp @@ -30,7 +30,7 @@ class tripleo::profile::base::swift::storage ( # Deprecated conditional to support ControllerEnableSwiftStorage parameter $enable_swift_storage = true, - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { if $enable_swift_storage { diff --git a/manifests/profile/base/tacker.pp b/manifests/profile/base/tacker.pp index fa85ec1..5d3a54f 100644 --- a/manifests/profile/base/tacker.pp +++ b/manifests/profile/base/tacker.pp @@ -58,7 +58,7 @@ class tripleo::profile::base::tacker ( $oslomsg_rpc_port = hiera('tacker::rabbit_port', '5672'), $oslomsg_rpc_username = hiera('tacker::rabbit_userid', 'guest'), $oslomsg_use_ssl = hiera('tacker::rabbit_use_ssl', '0'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/trove/api.pp b/manifests/profile/base/trove/api.pp index bc16e6e..aac5923 100644 --- a/manifests/profile/base/trove/api.pp +++ b/manifests/profile/base/trove/api.pp @@ -29,7 +29,7 @@ # class tripleo::profile::base::trove::api ( $bootstrap_node = hiera('bootstrap_nodeid', undef), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $sync_db = true diff --git a/manifests/profile/base/trove/conductor.pp b/manifests/profile/base/trove/conductor.pp index 0e95a40..cc6f039 100644 --- a/manifests/profile/base/trove/conductor.pp +++ b/manifests/profile/base/trove/conductor.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::trove::conductor ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { diff --git a/manifests/profile/base/trove/taskmanager.pp b/manifests/profile/base/trove/taskmanager.pp index 3972c29..7fc2a81 100644 --- a/manifests/profile/base/trove/taskmanager.pp +++ b/manifests/profile/base/trove/taskmanager.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::trove::taskmanager ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { diff --git a/manifests/profile/base/vpp.pp b/manifests/profile/base/vpp.pp index 05f52f9..90bc54e 100644 --- a/manifests/profile/base/vpp.pp +++ b/manifests/profile/base/vpp.pp @@ -24,7 +24,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::vpp ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 1 { include ::fdio diff --git a/manifests/profile/base/zaqar.pp b/manifests/profile/base/zaqar.pp index 243dcc7..b9171b0 100644 --- a/manifests/profile/base/zaqar.pp +++ b/manifests/profile/base/zaqar.pp @@ -28,7 +28,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::zaqar ( - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $step >= 4 { include ::zaqar diff --git a/manifests/profile/pacemaker/ceph/rbdmirror.pp b/manifests/profile/pacemaker/ceph/rbdmirror.pp index 4066225..6b566a7 100644 --- a/manifests/profile/pacemaker/ceph/rbdmirror.pp +++ b/manifests/profile/pacemaker/ceph/rbdmirror.pp @@ -45,7 +45,7 @@ class tripleo::profile::pacemaker::ceph::rbdmirror ( $client_name = 'openstack', $pcs_tries = hiera('pcs_tries', 20), $stack_action = hiera('stack_action'), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { Service <| tag == 'ceph-rbd-mirror' |> { hasrestart => true, diff --git a/manifests/profile/pacemaker/cinder/backup.pp b/manifests/profile/pacemaker/cinder/backup.pp index ff0d8c9..933a735 100644 --- a/manifests/profile/pacemaker/cinder/backup.pp +++ b/manifests/profile/pacemaker/cinder/backup.pp @@ -33,7 +33,7 @@ # class tripleo::profile::pacemaker::cinder::backup ( $bootstrap_node = hiera('cinder_backup_short_bootstrap_node_name'), - $step = hiera('step'), + $step = Integer(hiera('step')), $pcs_tries = hiera('pcs_tries', 20), ) { diff --git a/manifests/profile/pacemaker/cinder/backup_bundle.pp b/manifests/profile/pacemaker/cinder/backup_bundle.pp index cd06986..a5e1a9b 100644 --- a/manifests/profile/pacemaker/cinder/backup_bundle.pp +++ b/manifests/profile/pacemaker/cinder/backup_bundle.pp @@ -40,7 +40,7 @@ class tripleo::profile::pacemaker::cinder::backup_bundle ( $bootstrap_node = hiera('cinder_backup_short_bootstrap_node_name'), $cinder_backup_docker_image = hiera('tripleo::profile::pacemaker::cinder::backup_bundle::cinder_backup_docker_image', undef), $pcs_tries = hiera('pcs_tries', 20), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true diff --git a/manifests/profile/pacemaker/cinder/volume.pp b/manifests/profile/pacemaker/cinder/volume.pp index 0d6a598..e993426 100644 --- a/manifests/profile/pacemaker/cinder/volume.pp +++ b/manifests/profile/pacemaker/cinder/volume.pp @@ -33,7 +33,7 @@ # class tripleo::profile::pacemaker::cinder::volume ( $bootstrap_node = hiera('cinder_volume_short_bootstrap_node_name'), - $step = hiera('step'), + $step = Integer(hiera('step')), $pcs_tries = hiera('pcs_tries', 20), ) { Service <| tag == 'cinder::volume' |> { diff --git a/manifests/profile/pacemaker/cinder/volume_bundle.pp b/manifests/profile/pacemaker/cinder/volume_bundle.pp index f0858c9..39199a5 100644 --- a/manifests/profile/pacemaker/cinder/volume_bundle.pp +++ b/manifests/profile/pacemaker/cinder/volume_bundle.pp @@ -40,7 +40,7 @@ class tripleo::profile::pacemaker::cinder::volume_bundle ( $bootstrap_node = hiera('cinder_volume_short_bootstrap_node_name'), $cinder_volume_docker_image = hiera('tripleo::profile::pacemaker::cinder::volume_bundle::cinder_volume_docker_image', undef), $pcs_tries = hiera('pcs_tries', 20), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true diff --git a/manifests/profile/pacemaker/clustercheck.pp b/manifests/profile/pacemaker/clustercheck.pp index fad30da..958f4a2 100644 --- a/manifests/profile/pacemaker/clustercheck.pp +++ b/manifests/profile/pacemaker/clustercheck.pp @@ -32,7 +32,7 @@ # # class tripleo::profile::pacemaker::clustercheck ( - $step = hiera('step'), + $step = Integer(hiera('step')), $clustercheck_password = hiera('mysql::server::root_password'), $bind_address = hiera('mysql_bind_host'), ) { diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp index d42d557..22adbe9 100644 --- a/manifests/profile/pacemaker/database/mysql.pp +++ b/manifests/profile/pacemaker/database/mysql.pp @@ -26,6 +26,27 @@ # (Optional) The address that the local mysql instance should bind to. # Defaults to $::hostname # +# [*ca_file*] +# (Optional) The path to the CA file that will be used for the TLS +# configuration. It's only used if internal TLS is enabled. +# Defaults to undef +# +# [*certificate_specs*] +# (Optional) The specifications to give to certmonger for the certificate +# it will create. Note that the certificate nickname must be 'mysql' in +# the case of this service. +# Example with hiera: +# tripleo::profile::base::database::mysql::certificate_specs: +# hostname: <overcloud controller fqdn> +# service_certificate: <service certificate path> +# service_key: <service key path> +# principal: "mysql/<overcloud controller fqdn>" +# Defaults to hiera('tripleo::profile::base::database::mysql::certificate_specs', {}). +# +# [*enable_internal_tls*] +# (Optional) Whether TLS in the internal network is enabled or not. +# Defaults to hiera('enable_internal_tls', false) +# # [*gmcast_listen_addr*] # (Optional) This variable defines the address on which the node listens to # connections from other nodes in the cluster. @@ -41,11 +62,14 @@ # Defaults to hiera('pcs_tries', 20) # class tripleo::profile::pacemaker::database::mysql ( - $bootstrap_node = hiera('mysql_short_bootstrap_node_name'), - $bind_address = $::hostname, - $gmcast_listen_addr = hiera('mysql_bind_host'), - $step = hiera('step'), - $pcs_tries = hiera('pcs_tries', 20), + $bootstrap_node = hiera('mysql_short_bootstrap_node_name'), + $bind_address = $::hostname, + $ca_file = undef, + $certificate_specs = hiera('tripleo::profile::base::database::mysql::certificate_specs', {}), + $enable_internal_tls = hiera('enable_internal_tls', false), + $gmcast_listen_addr = hiera('mysql_bind_host'), + $step = Integer(hiera('step')), + $pcs_tries = hiera('pcs_tries', 20), ) { if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true @@ -70,6 +94,19 @@ class tripleo::profile::pacemaker::database::mysql ( $processed_galera_name_pairs = $galera_name_pairs.map |$pair| { join($pair, ':') } $cluster_host_map = join($processed_galera_name_pairs, ';') + if $enable_internal_tls { + $tls_certfile = $certificate_specs['service_certificate'] + $tls_keyfile = $certificate_specs['service_key'] + if $ca_file { + $tls_ca_options = "socket.ssl_ca=${ca_file}" + } else { + $tls_ca_options = '' + } + $tls_options = "socket.ssl_key=${tls_keyfile};socket.ssl_cert=${tls_certfile};${tls_ca_options};" + } else { + $tls_options = '' + } + $mysqld_options = { 'mysqld' => { 'skip-name-resolve' => '1', @@ -98,7 +135,7 @@ class tripleo::profile::pacemaker::database::mysql ( 'wsrep_drupal_282555_workaround'=> '0', 'wsrep_causal_reads' => '0', 'wsrep_sst_method' => 'rsync', - 'wsrep_provider_options' => "gmcast.listen_addr=tcp://${gmcast_listen_addr}:4567;", + 'wsrep_provider_options' => "gmcast.listen_addr=tcp://${gmcast_listen_addr}:4567;${tls_options}", } } diff --git a/manifests/profile/pacemaker/database/mysql_bundle.pp b/manifests/profile/pacemaker/database/mysql_bundle.pp index a127a5c..56e9e28 100644 --- a/manifests/profile/pacemaker/database/mysql_bundle.pp +++ b/manifests/profile/pacemaker/database/mysql_bundle.pp @@ -56,7 +56,7 @@ class tripleo::profile::pacemaker::database::mysql_bundle ( $bind_address = $::hostname, $gmcast_listen_addr = hiera('mysql_bind_host'), $pcs_tries = hiera('pcs_tries', 20), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true diff --git a/manifests/profile/pacemaker/database/redis.pp b/manifests/profile/pacemaker/database/redis.pp index 4f5a861..bc91be7 100644 --- a/manifests/profile/pacemaker/database/redis.pp +++ b/manifests/profile/pacemaker/database/redis.pp @@ -46,7 +46,7 @@ class tripleo::profile::pacemaker::database::redis ( $bootstrap_node = hiera('redis_short_bootstrap_node_name'), $enable_load_balancer = hiera('enable_load_balancer', true), - $step = hiera('step'), + $step = Integer(hiera('step')), $redis_file_limit = undef, $pcs_tries = hiera('pcs_tries', 20), ) { diff --git a/manifests/profile/pacemaker/database/redis_bundle.pp b/manifests/profile/pacemaker/database/redis_bundle.pp index 8e30c2f..dd090d7 100644 --- a/manifests/profile/pacemaker/database/redis_bundle.pp +++ b/manifests/profile/pacemaker/database/redis_bundle.pp @@ -45,7 +45,7 @@ class tripleo::profile::pacemaker::database::redis_bundle ( $redis_docker_image = hiera('tripleo::profile::pacemaker::database::redis_bundle::redis_docker_image', undef), $redis_docker_control_port = hiera('tripleo::profile::pacemaker::database::redis_bundle::control_port', '3124'), $pcs_tries = hiera('pcs_tries', 20), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true diff --git a/manifests/profile/pacemaker/haproxy.pp b/manifests/profile/pacemaker/haproxy.pp index f006f78..7331071 100644 --- a/manifests/profile/pacemaker/haproxy.pp +++ b/manifests/profile/pacemaker/haproxy.pp @@ -38,7 +38,7 @@ class tripleo::profile::pacemaker::haproxy ( $bootstrap_node = hiera('haproxy_short_bootstrap_node_name'), $enable_load_balancer = hiera('enable_load_balancer', true), - $step = hiera('step'), + $step = Integer(hiera('step')), $pcs_tries = hiera('pcs_tries', 20), ) { include ::tripleo::profile::base::haproxy diff --git a/manifests/profile/pacemaker/haproxy_bundle.pp b/manifests/profile/pacemaker/haproxy_bundle.pp index 292c9dd..9c1bdf3 100644 --- a/manifests/profile/pacemaker/haproxy_bundle.pp +++ b/manifests/profile/pacemaker/haproxy_bundle.pp @@ -43,7 +43,7 @@ class tripleo::profile::pacemaker::haproxy_bundle ( $haproxy_docker_image = hiera('tripleo::profile::pacemaker::haproxy::haproxy_docker_image', undef), $bootstrap_node = hiera('haproxy_short_bootstrap_node_name'), $enable_load_balancer = hiera('enable_load_balancer', true), - $step = hiera('step'), + $step = Integer(hiera('step')), $pcs_tries = hiera('pcs_tries', 20), ) { include ::tripleo::profile::base::haproxy diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp index 7bcf8d6..c22a033 100644 --- a/manifests/profile/pacemaker/manila.pp +++ b/manifests/profile/pacemaker/manila.pp @@ -55,7 +55,7 @@ class tripleo::profile::pacemaker::manila ( $backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false), $ceph_mds_enabled = hiera('ceph_mds_enabled', false), $bootstrap_node = hiera('manila_share_short_bootstrap_node_name'), - $step = hiera('step'), + $step = Integer(hiera('step')), $pcs_tries = hiera('pcs_tries', 20), ) { if $::hostname == downcase($bootstrap_node) { diff --git a/manifests/profile/pacemaker/neutron/lbaas.pp b/manifests/profile/pacemaker/neutron/lbaas.pp index 96712d4..9e86dfe 100644 --- a/manifests/profile/pacemaker/neutron/lbaas.pp +++ b/manifests/profile/pacemaker/neutron/lbaas.pp @@ -28,7 +28,7 @@ # Defaults to hiera('bootstrap_nodeid') # class tripleo::profile::pacemaker::neutron::lbaas ( - $step = hiera('step'), + $step = Integer(hiera('step')), $pacemaker_master = hiera('bootstrap_nodeid'), ) { diff --git a/manifests/profile/pacemaker/ovn_northd.pp b/manifests/profile/pacemaker/ovn_northd.pp index 57bbc35..212c345 100644 --- a/manifests/profile/pacemaker/ovn_northd.pp +++ b/manifests/profile/pacemaker/ovn_northd.pp @@ -47,7 +47,7 @@ class tripleo::profile::pacemaker::ovn_northd ( $pacemaker_master = hiera('ovn_dbs_short_bootstrap_node_name'), - $step = hiera('step'), + $step = Integer(hiera('step')), $pcs_tries = hiera('pcs_tries', 20), $ovn_dbs_vip = hiera('ovn_dbs_vip'), $nb_db_port = 6641, diff --git a/manifests/profile/pacemaker/rabbitmq.pp b/manifests/profile/pacemaker/rabbitmq.pp index bf6a38d..3d87598 100644 --- a/manifests/profile/pacemaker/rabbitmq.pp +++ b/manifests/profile/pacemaker/rabbitmq.pp @@ -51,7 +51,7 @@ class tripleo::profile::pacemaker::rabbitmq ( $user_ha_queues = hiera('rabbitmq::nr_ha_queues', 0), $rabbit_nodes = hiera('rabbitmq_node_names'), $pcs_tries = hiera('pcs_tries', 20), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true diff --git a/manifests/profile/pacemaker/rabbitmq_bundle.pp b/manifests/profile/pacemaker/rabbitmq_bundle.pp index f6c5044..0a6295c 100644 --- a/manifests/profile/pacemaker/rabbitmq_bundle.pp +++ b/manifests/profile/pacemaker/rabbitmq_bundle.pp @@ -61,7 +61,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle ( $user_ha_queues = hiera('rabbitmq::nr_ha_queues', 0), $rabbit_nodes = hiera('rabbitmq_node_names'), $pcs_tries = hiera('pcs_tries', 20), - $step = hiera('step'), + $step = Integer(hiera('step')), ) { if $::hostname == downcase($bootstrap_node) { $pacemaker_master = true diff --git a/releasenotes/notes/add-mysql_maxconn-to-haproxy-84a5ad07d8d14ddd.yaml b/releasenotes/notes/add-mysql_maxconn-to-haproxy-84a5ad07d8d14ddd.yaml new file mode 100644 index 0000000..8359456 --- /dev/null +++ b/releasenotes/notes/add-mysql_maxconn-to-haproxy-84a5ad07d8d14ddd.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Added new parameter mysql_maxconn to the tripleo::haproxy class, + allowing haproxy maxconn to be configured for the MySQL server. diff --git a/releasenotes/notes/nf_conntrack_proto_sctp-a64300a3fc7b4e55.yaml b/releasenotes/notes/nf_conntrack_proto_sctp-a64300a3fc7b4e55.yaml new file mode 100644 index 0000000..9aad5ee --- /dev/null +++ b/releasenotes/notes/nf_conntrack_proto_sctp-a64300a3fc7b4e55.yaml @@ -0,0 +1,9 @@ +--- +issues: + - | + Ignore failures if nf_conntrack_proto_sctp module failed to load. + Since RHEL 7.4, nf_conntrack_proto_sctp module is compiled into the + kernel instead of as a module as the sctp support. + TripleO will still try to load the module to support RHEL 7.3, but + in the future will remove the module management and rely on the kernel + provided in newer versions of RHEL. diff --git a/spec/classes/tripleo_haproxy_spec.rb b/spec/classes/tripleo_haproxy_spec.rb new file mode 100644 index 0000000..966729a --- /dev/null +++ b/spec/classes/tripleo_haproxy_spec.rb @@ -0,0 +1,115 @@ +# Copyright 2016 Red Hat, Inc. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + +require 'spec_helper' + +describe 'tripleo::haproxy' do + + shared_examples_for 'tripleo::haproxy' do + let :params do { + :controller_virtual_ip => '10.1.0.1', + :public_virtual_ip => '192.168.0.1' + } + end + + describe "default settings" do + it 'should configure haproxy' do + is_expected.to contain_haproxy__listen('mysql').with( + :options => { + 'timeout client' => "90m", + 'timeout server' => "90m", + 'maxconn' => :undef + } + ) + end + end + + describe "set clustercheck" do + before :each do + params.merge!({ + :mysql_clustercheck => true, + }) + end + + it 'should configure haproxy with clustercheck' do + is_expected.to contain_haproxy__listen('mysql').with( + :options => { + 'timeout client' => "90m", + 'timeout server' => "90m", + 'option' => ["tcpka", "httpchk"], + 'timeout client' => "90m", + 'timeout server' => "90m", + 'stick-table' => "type ip size 1000", + 'stick' => "on dst", + 'maxconn' => :undef + } + ) + end + end + + describe "override maxconn with clustercheck" do + before :each do + params.merge!({ + :mysql_clustercheck => true, + :mysql_max_conn => 6500, + }) + end + + it 'should configure haproxy' do + is_expected.to contain_haproxy__listen('mysql').with( + :options => { + 'option' => ["tcpka", "httpchk"], + 'timeout client' => "90m", + 'timeout server' => "90m", + 'stick-table' => "type ip size 1000", + 'stick' => "on dst", + 'maxconn' => 6500 + } + ) + end + end + + describe "override maxconn without clustercheck" do + before :each do + params.merge!({ + :mysql_max_conn => 6500, + }) + end + + it 'should configure haproxy' do + is_expected.to contain_haproxy__listen('mysql').with( + :options => { + 'timeout client' => "90m", + 'timeout server' => "90m", + 'maxconn' => 6500 + } + ) + end + end + + end + + on_supported_os.each do |os, facts| + context "on #{os}" do + let(:facts) do + facts.merge({ }) + end + + it_behaves_like 'tripleo::haproxy' + end + end + +end
\ No newline at end of file diff --git a/spec/classes/tripleo_profile_base_database_redis_spec.rb b/spec/classes/tripleo_profile_base_database_redis_spec.rb new file mode 100644 index 0000000..8f94cc9 --- /dev/null +++ b/spec/classes/tripleo_profile_base_database_redis_spec.rb @@ -0,0 +1,106 @@ +# +# Copyright (C) 2017 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + +require 'spec_helper' + +describe 'tripleo::profile::base::database::redis' do + shared_examples_for 'tripleo::profile::base::database::redis' do + + context 'with step less than 2' do + let(:params) { { + :step => 1, + :bootstrap_nodeid => 'node.example.com', + :redis_node_ips => [] + } } + + it 'should do nothing' do + is_expected.to contain_class('tripleo::profile::base::database::redis') + is_expected.to_not contain_class('redis') + is_expected.to_not contain_class('redis::sentinel') + is_expected.to_not contain_class('tripleo::redis_notification') + end + end + + context 'with step 2 on bootstrap node' do + let(:params) { { + :step => 2, + :bootstrap_nodeid => 'node.example.com', + :redis_node_ips => ['10.0.0.1'] + } } + + it 'should configure redis' do + is_expected.to contain_class('tripleo::profile::base::database::redis') + is_expected.to contain_class('redis') + is_expected.to_not contain_class('redis::sentinel') + is_expected.to_not contain_class('tripleo::redis_notification') + end + end + + context 'with step 2 on bootstrap node with capital letters' do + let(:params) { { + :step => 2, + :bootstrap_nodeid => 'NODE.example.com', + :redis_node_ips => ['10.0.0.1'] + } } + + it 'should configure redis' do + is_expected.to contain_class('tripleo::profile::base::database::redis') + is_expected.to contain_class('redis').with(:slaveof => nil) + end + end + + context 'with step 2 not on bootstrap node' do + let(:params) { { + :step => 2, + :bootstrap_nodeid => 'othernode.example.com', + :redis_node_ips => ['10.0.0.1'] + } } + + it 'should configure redis' do + is_expected.to contain_class('tripleo::profile::base::database::redis') + is_expected.to contain_class('redis').with(:slaveof => "#{params[:bootstrap_nodeid]} 6379") + is_expected.to_not contain_class('redis::sentinel') + is_expected.to_not contain_class('tripleo::redis_notification') + end + end + + context 'with step 2 with multiple nodes' do + let(:params) { { + :step => 2, + :bootstrap_nodeid => 'othernode.example.com', + :redis_node_ips => ['10.0.0.1', '10.0.0.2'] + } } + + it 'should configure redis' do + is_expected.to contain_class('tripleo::profile::base::database::redis') + is_expected.to contain_class('redis').with(:slaveof => "#{params[:bootstrap_nodeid]} 6379") + is_expected.to contain_class('redis::sentinel') + is_expected.to contain_class('tripleo::redis_notification') + end + end + + end + + on_supported_os.each do |os, facts| + context "on #{os}" do + let(:facts) do + facts.merge({ :hostname => 'node.example.com' }) + end + + it_behaves_like 'tripleo::profile::base::database::redis' + end + end +end diff --git a/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb b/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb index 6c04e9d..90bdea0 100644 --- a/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb +++ b/spec/classes/tripleo_profile_base_gnocchi_api_spec.rb @@ -36,9 +36,9 @@ describe 'tripleo::profile::base::gnocchi::api' do } end - context 'with step 3 on bootstrap' do + context 'with step 4 on bootstrap' do let(:params) { { - :step => 3, + :step => 4, :bootstrap_node => 'node.example.com', :gnocchi_redis_password => 'gnocchi', :redis_vip => '127.0.0.1' @@ -51,20 +51,6 @@ describe 'tripleo::profile::base::gnocchi::api' do } end - context 'with step 3' do - let(:params) { { - :step => 3, - :gnocchi_redis_password => 'gnocchi', - :redis_vip => '127.0.0.1' - } } - - it { - is_expected.to_not contain_class('gnocchi::db::sync') - is_expected.to contain_class('gnocchi::api') - is_expected.to contain_class('gnocchi::wsgi::apache') - } - end - context 'with step 4' do let(:params) { { :step => 4, @@ -129,10 +115,6 @@ describe 'tripleo::profile::base::gnocchi::api' do it { is_expected.to contain_class('gnocchi::api') is_expected.to contain_class('gnocchi::wsgi::apache') - is_expected.to contain_exec('run gnocchi upgrade with storage').with( - :command => 'gnocchi-upgrade --config-file=/etc/gnocchi/gnocchi.conf', - :path => ['/usr/bin', '/usr/sbin'] - ) } end end diff --git a/spec/classes/tripleo_profile_base_kernel_spec.rb b/spec/classes/tripleo_profile_base_kernel_spec.rb new file mode 100644 index 0000000..4c2aab2 --- /dev/null +++ b/spec/classes/tripleo_profile_base_kernel_spec.rb @@ -0,0 +1,59 @@ +# +# Copyright (C) 2017 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# + +require 'spec_helper' + +describe 'tripleo::profile::base::kernel' do + + shared_examples_for 'tripleo::profile::base::kernel' do + context 'with kernel modules' do + let :params do + { + :module_list => { + 'nf_conntrack' => {}, + } + } + end + + it 'should load kernel module' do + is_expected.to contain_kmod__load('nf_conntrack') + end + end + context 'with sysctl settings' do + let :params do + { + :sysctl_settings => { + 'net.ipv4.tcp_keepalive_intvl' => { 'value' => '1'}, + } + } + end + + it 'should load kernel module' do + is_expected.to contain_sysctl__value('net.ipv4.tcp_keepalive_intvl') + end + end + end + + on_supported_os.each do |os, facts| + context "on #{os}" do + let(:facts) { + facts + } + + it_behaves_like 'tripleo::profile::base::kernel' + end + end +end diff --git a/spec/fixtures/hieradata/default.yaml b/spec/fixtures/hieradata/default.yaml index ad2da39..a0f4efc 100644 --- a/spec/fixtures/hieradata/default.yaml +++ b/spec/fixtures/hieradata/default.yaml @@ -6,6 +6,7 @@ not_hash: string aodh::rabbit_password: 'password' aodh_redis_password: 'password' redis_vip: '127.0.0.1' +redis::bind: '10.0.0.1' aodh::auth::auth_password: 'password' aodh::db::mysql::password: 'password' aodh::keystone::authtoken::password: 'password' @@ -32,6 +33,9 @@ cinder::keystone::authtoken::password: 'password' gnocchi::keystone::authtoken::password: 'password' gnocchi::storage::ceph::ceph_username: 'gnocchi' gnocchi::storage::ceph::ceph_secret: 'password' +# haproxy related items +mysql_enabled: true +controller_node_ips: '10.1.0.1,10.1.0.2' # nova related items nova::rabbit_password: 'password' nova::keystone::authtoken::password: 'password' |