diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-16 23:25:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-16 23:25:23 +0000 |
| commit | 8ca7a1e390ce50ac66a6861dae59bb44fbf0324a (patch) | |
| tree | 04380590acfa8f36ed5ec661adc4ddb8c74bec01 /manifests/profile/base | |
| parent | bb7e1829f683ca1cac2034ce0b450c0f7ce483ed (diff) | |
| parent | 94f13e66089cc0b18d5b4b2f6e204160d836ac3e (diff) | |
Merge "Ensure hiera step value is an integer"
Diffstat (limited to 'manifests/profile/base')
151 files changed, 152 insertions, 152 deletions
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 3890244..e357359 100644 --- a/manifests/profile/base/database/redis.pp +++ b/manifests/profile/base/database/redis.pp @@ -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 { 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 910375f..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 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..94b7efe 100644 --- a/manifests/profile/base/ironic/api.pp +++ b/manifests/profile/base/ironic/api.pp @@ -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 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/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..098f795 100644 --- a/manifests/profile/base/metrics/collectd.pp +++ b/manifests/profile/base/metrics/collectd.pp @@ -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, 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/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..f7a2935 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 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/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 bd92c98..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', []), diff --git a/manifests/profile/base/pacemaker_remote.pp b/manifests/profile/base/pacemaker_remote.pp index 8264132..f4265ff 100644 --- a/manifests/profile/base/pacemaker_remote.pp +++ b/manifests/profile/base/pacemaker_remote.pp @@ -39,7 +39,7 @@ 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, 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 |