Merge "Ensure hiera step value is an integer"

This commit is contained in:
Jenkins 2017-06-16 23:25:23 +00:00 committed by Gerrit Code Review
commit 8ca7a1e390
176 changed files with 177 additions and 177 deletions

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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'),

View File

@ -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',
)
{

View File

@ -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 {

View File

@ -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'),

View File

@ -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)),

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -25,7 +25,7 @@
#
class tripleo::profile::base::barbican (
$step = hiera('step'),
$step = Integer(hiera('step')),
) {
if $step >= 3 {

View File

@ -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'),

View File

@ -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'),

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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', []),

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -35,7 +35,7 @@
#
class tripleo::profile::base::ceph::mon (
$ceph_pools = {},
$step = hiera('step'),
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::ceph

View File

@ -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

View File

@ -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

View File

@ -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'),

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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'),

View File

@ -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 {

View File

@ -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) {

View File

@ -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

View File

@ -34,7 +34,7 @@
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 downcase($bootstrap_nodeid) == $::hostname {

View File

@ -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', [])

View File

@ -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)

View File

@ -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,

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 {

View File

@ -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'),

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 {

View File

@ -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'),

View File

@ -23,7 +23,7 @@
# Defaults to hiera('step')
#
class tripleo::profile::base::ironic::api (
$step = hiera('step'),
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::ironic

View File

@ -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

View File

@ -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) {

View File

@ -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){

View File

@ -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

View File

@ -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,

View File

@ -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'),

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -47,7 +47,7 @@
# 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')),
$collectd_server = undef,
$collectd_port = undef,

View File

@ -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'),

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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':

View File

@ -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
}
}

View File

@ -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'),

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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':

View File

@ -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,
) {

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

Some files were not shown because too many files have changed in this diff Show More