summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 23:25:23 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 23:25:23 +0000
commit8ca7a1e390ce50ac66a6861dae59bb44fbf0324a (patch)
tree04380590acfa8f36ed5ec661adc4ddb8c74bec01
parentbb7e1829f683ca1cac2034ce0b450c0f7ce483ed (diff)
parent94f13e66089cc0b18d5b4b2f6e204160d836ac3e (diff)
Merge "Ensure hiera step value is an integer"
-rw-r--r--manifests/network/contrail/analytics.pp2
-rw-r--r--manifests/network/contrail/analyticsdatabase.pp2
-rw-r--r--manifests/network/contrail/config.pp2
-rw-r--r--manifests/network/contrail/control.pp2
-rw-r--r--manifests/network/contrail/database.pp2
-rw-r--r--manifests/network/contrail/heat.pp2
-rw-r--r--manifests/network/contrail/provision.pp2
-rw-r--r--manifests/network/contrail/vrouter.pp2
-rw-r--r--manifests/profile/base/aodh.pp2
-rw-r--r--manifests/profile/base/aodh/api.pp2
-rw-r--r--manifests/profile/base/aodh/evaluator.pp2
-rw-r--r--manifests/profile/base/aodh/listener.pp2
-rw-r--r--manifests/profile/base/aodh/notifier.pp2
-rw-r--r--manifests/profile/base/auditd.pp2
-rw-r--r--manifests/profile/base/barbican.pp2
-rw-r--r--manifests/profile/base/barbican/api.pp2
-rw-r--r--manifests/profile/base/ceilometer.pp2
-rw-r--r--manifests/profile/base/ceilometer/agent/central.pp2
-rw-r--r--manifests/profile/base/ceilometer/agent/compute.pp2
-rw-r--r--manifests/profile/base/ceilometer/agent/notification.pp2
-rw-r--r--manifests/profile/base/ceilometer/agent/polling.pp2
-rw-r--r--manifests/profile/base/ceilometer/api.pp2
-rw-r--r--manifests/profile/base/ceilometer/collector.pp2
-rw-r--r--manifests/profile/base/ceilometer/expirer.pp2
-rw-r--r--manifests/profile/base/ceilometer/upgrade.pp2
-rw-r--r--manifests/profile/base/ceph.pp2
-rw-r--r--manifests/profile/base/ceph/client.pp2
-rw-r--r--manifests/profile/base/ceph/mds.pp2
-rw-r--r--manifests/profile/base/ceph/mon.pp2
-rw-r--r--manifests/profile/base/ceph/osd.pp2
-rw-r--r--manifests/profile/base/ceph/rgw.pp2
-rw-r--r--manifests/profile/base/cinder.pp2
-rw-r--r--manifests/profile/base/cinder/api.pp2
-rw-r--r--manifests/profile/base/cinder/backup.pp2
-rw-r--r--manifests/profile/base/cinder/backup/ceph.pp2
-rw-r--r--manifests/profile/base/cinder/backup/swift.pp2
-rw-r--r--manifests/profile/base/cinder/scheduler.pp2
-rw-r--r--manifests/profile/base/cinder/volume.pp2
-rw-r--r--manifests/profile/base/cinder/volume/dellps.pp2
-rw-r--r--manifests/profile/base/cinder/volume/dellsc.pp2
-rw-r--r--manifests/profile/base/cinder/volume/hpelefthand.pp2
-rw-r--r--manifests/profile/base/cinder/volume/iscsi.pp2
-rw-r--r--manifests/profile/base/cinder/volume/netapp.pp2
-rw-r--r--manifests/profile/base/cinder/volume/nfs.pp2
-rw-r--r--manifests/profile/base/cinder/volume/pure.pp2
-rw-r--r--manifests/profile/base/cinder/volume/rbd.pp2
-rw-r--r--manifests/profile/base/cinder/volume/scaleio.pp2
-rw-r--r--manifests/profile/base/congress.pp2
-rw-r--r--manifests/profile/base/database/mongodb.pp2
-rw-r--r--manifests/profile/base/database/mysql.pp2
-rw-r--r--manifests/profile/base/database/mysql/client.pp2
-rw-r--r--manifests/profile/base/database/redis.pp2
-rw-r--r--manifests/profile/base/docker.pp2
-rw-r--r--manifests/profile/base/etcd.pp2
-rw-r--r--manifests/profile/base/glance/api.pp2
-rw-r--r--manifests/profile/base/gnocchi.pp2
-rw-r--r--manifests/profile/base/gnocchi/api.pp2
-rw-r--r--manifests/profile/base/gnocchi/metricd.pp2
-rw-r--r--manifests/profile/base/gnocchi/statsd.pp2
-rw-r--r--manifests/profile/base/haproxy.pp2
-rw-r--r--manifests/profile/base/heat.pp2
-rw-r--r--manifests/profile/base/heat/api.pp2
-rw-r--r--manifests/profile/base/heat/api_cfn.pp2
-rw-r--r--manifests/profile/base/heat/api_cloudwatch.pp2
-rw-r--r--manifests/profile/base/heat/engine.pp2
-rw-r--r--manifests/profile/base/horizon.pp2
-rw-r--r--manifests/profile/base/ironic.pp2
-rw-r--r--manifests/profile/base/ironic/api.pp2
-rw-r--r--manifests/profile/base/ironic/conductor.pp2
-rw-r--r--manifests/profile/base/ironic_inspector.pp2
-rw-r--r--manifests/profile/base/keepalived.pp2
-rw-r--r--manifests/profile/base/keystone.pp2
-rw-r--r--manifests/profile/base/logging/fluentd.pp2
-rw-r--r--manifests/profile/base/manila.pp2
-rw-r--r--manifests/profile/base/manila/api.pp2
-rw-r--r--manifests/profile/base/manila/scheduler.pp2
-rw-r--r--manifests/profile/base/manila/share.pp2
-rw-r--r--manifests/profile/base/memcached.pp2
-rw-r--r--manifests/profile/base/metrics/collectd.pp2
-rw-r--r--manifests/profile/base/mistral.pp2
-rw-r--r--manifests/profile/base/mistral/api.pp2
-rw-r--r--manifests/profile/base/mistral/engine.pp2
-rw-r--r--manifests/profile/base/mistral/event_engine.pp2
-rw-r--r--manifests/profile/base/mistral/executor.pp2
-rw-r--r--manifests/profile/base/monitoring/sensu.pp2
-rw-r--r--manifests/profile/base/monitoring/uchiwa.pp4
-rw-r--r--manifests/profile/base/neutron.pp2
-rw-r--r--manifests/profile/base/neutron/agents/bagpipe.pp2
-rw-r--r--manifests/profile/base/neutron/agents/bigswitch.pp2
-rw-r--r--manifests/profile/base/neutron/agents/l2gw.pp2
-rw-r--r--manifests/profile/base/neutron/agents/midonet.pp2
-rw-r--r--manifests/profile/base/neutron/agents/nuage.pp2
-rw-r--r--manifests/profile/base/neutron/agents/ovn.pp2
-rw-r--r--manifests/profile/base/neutron/agents/vpp.pp2
-rw-r--r--manifests/profile/base/neutron/bgpvpn.pp2
-rw-r--r--manifests/profile/base/neutron/dhcp.pp2
-rw-r--r--manifests/profile/base/neutron/l2gw.pp2
-rw-r--r--manifests/profile/base/neutron/l3.pp2
-rw-r--r--manifests/profile/base/neutron/lbaas.pp2
-rw-r--r--manifests/profile/base/neutron/linuxbridge.pp2
-rw-r--r--manifests/profile/base/neutron/metadata.pp2
-rw-r--r--manifests/profile/base/neutron/midonet.pp2
-rw-r--r--manifests/profile/base/neutron/n1k.pp2
-rw-r--r--manifests/profile/base/neutron/opencontrail/vrouter.pp2
-rw-r--r--manifests/profile/base/neutron/opendaylight.pp2
-rw-r--r--manifests/profile/base/neutron/ovn_northd.pp2
-rw-r--r--manifests/profile/base/neutron/ovs.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/ml2.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/ml2/bagpipe.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/ml2/opendaylight.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/ml2/ovn.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/ml2/vpp.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/nsx_v3.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/nuage.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/opencontrail.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/ovs/opendaylight.pp2
-rw-r--r--manifests/profile/base/neutron/plugins/plumgrid.pp2
-rw-r--r--manifests/profile/base/neutron/plumgrid.pp2
-rw-r--r--manifests/profile/base/neutron/server.pp2
-rw-r--r--manifests/profile/base/neutron/sriov.pp2
-rw-r--r--manifests/profile/base/nova.pp2
-rw-r--r--manifests/profile/base/nova/api.pp2
-rw-r--r--manifests/profile/base/nova/authtoken.pp2
-rw-r--r--manifests/profile/base/nova/compute.pp2
-rw-r--r--manifests/profile/base/nova/compute/ironic.pp2
-rw-r--r--manifests/profile/base/nova/compute/libvirt.pp2
-rw-r--r--manifests/profile/base/nova/conductor.pp2
-rw-r--r--manifests/profile/base/nova/consoleauth.pp2
-rw-r--r--manifests/profile/base/nova/ec2api.pp2
-rw-r--r--manifests/profile/base/nova/libvirt.pp2
-rw-r--r--manifests/profile/base/nova/placement.pp2
-rw-r--r--manifests/profile/base/nova/scheduler.pp2
-rw-r--r--manifests/profile/base/nova/vncproxy.pp2
-rw-r--r--manifests/profile/base/novajoin.pp2
-rw-r--r--manifests/profile/base/octavia.pp2
-rw-r--r--manifests/profile/base/octavia/api.pp2
-rw-r--r--manifests/profile/base/octavia/health_manager.pp2
-rw-r--r--manifests/profile/base/octavia/housekeeping.pp2
-rw-r--r--manifests/profile/base/octavia/worker.pp2
-rw-r--r--manifests/profile/base/pacemaker.pp2
-rw-r--r--manifests/profile/base/pacemaker_remote.pp2
-rw-r--r--manifests/profile/base/panko.pp2
-rw-r--r--manifests/profile/base/panko/api.pp2
-rw-r--r--manifests/profile/base/qdr.pp2
-rw-r--r--manifests/profile/base/rabbitmq.pp2
-rw-r--r--manifests/profile/base/sahara.pp2
-rw-r--r--manifests/profile/base/sahara/api.pp2
-rw-r--r--manifests/profile/base/sahara/engine.pp2
-rw-r--r--manifests/profile/base/securetty.pp2
-rw-r--r--manifests/profile/base/snmp.pp2
-rw-r--r--manifests/profile/base/swift/proxy.pp2
-rw-r--r--manifests/profile/base/swift/ringbuilder.pp2
-rw-r--r--manifests/profile/base/swift/storage.pp2
-rw-r--r--manifests/profile/base/tacker.pp2
-rw-r--r--manifests/profile/base/trove/api.pp2
-rw-r--r--manifests/profile/base/trove/conductor.pp2
-rw-r--r--manifests/profile/base/trove/taskmanager.pp2
-rw-r--r--manifests/profile/base/vpp.pp2
-rw-r--r--manifests/profile/base/zaqar.pp2
-rw-r--r--manifests/profile/pacemaker/ceph/rbdmirror.pp2
-rw-r--r--manifests/profile/pacemaker/cinder/backup.pp2
-rw-r--r--manifests/profile/pacemaker/cinder/backup_bundle.pp2
-rw-r--r--manifests/profile/pacemaker/cinder/volume.pp2
-rw-r--r--manifests/profile/pacemaker/cinder/volume_bundle.pp2
-rw-r--r--manifests/profile/pacemaker/clustercheck.pp2
-rw-r--r--manifests/profile/pacemaker/database/mysql.pp2
-rw-r--r--manifests/profile/pacemaker/database/mysql_bundle.pp2
-rw-r--r--manifests/profile/pacemaker/database/redis.pp2
-rw-r--r--manifests/profile/pacemaker/database/redis_bundle.pp2
-rw-r--r--manifests/profile/pacemaker/haproxy.pp2
-rw-r--r--manifests/profile/pacemaker/haproxy_bundle.pp2
-rw-r--r--manifests/profile/pacemaker/manila.pp2
-rw-r--r--manifests/profile/pacemaker/neutron/lbaas.pp2
-rw-r--r--manifests/profile/pacemaker/ovn_northd.pp2
-rw-r--r--manifests/profile/pacemaker/rabbitmq.pp2
-rw-r--r--manifests/profile/pacemaker/rabbitmq_bundle.pp2
176 files changed, 177 insertions, 177 deletions
diff --git a/manifests/network/contrail/analytics.pp b/manifests/network/contrail/analytics.pp
index e34c7e6..296fa19 100644
--- a/manifests/network/contrail/analytics.pp
+++ b/manifests/network/contrail/analytics.pp
@@ -189,7 +189,7 @@
189# Defaults to hiera('contrail::zk_server_ip') 189# Defaults to hiera('contrail::zk_server_ip')
190# 190#
191class tripleo::network::contrail::analytics( 191class tripleo::network::contrail::analytics(
192 $step = hiera('step'), 192 $step = Integer(hiera('step')),
193 $admin_password = hiera('contrail::admin_password'), 193 $admin_password = hiera('contrail::admin_password'),
194 $admin_tenant_name = hiera('contrail::admin_tenant_name'), 194 $admin_tenant_name = hiera('contrail::admin_tenant_name'),
195 $admin_token = hiera('contrail::admin_token'), 195 $admin_token = hiera('contrail::admin_token'),
diff --git a/manifests/network/contrail/analyticsdatabase.pp b/manifests/network/contrail/analyticsdatabase.pp
index 88b0327..cf3016a 100644
--- a/manifests/network/contrail/analyticsdatabase.pp
+++ b/manifests/network/contrail/analyticsdatabase.pp
@@ -120,7 +120,7 @@
120# Defaults to hiera('contrail_database_node_ips') 120# Defaults to hiera('contrail_database_node_ips')
121# 121#
122class tripleo::network::contrail::analyticsdatabase( 122class tripleo::network::contrail::analyticsdatabase(
123 $step = hiera('step'), 123 $step = Integer(hiera('step')),
124 $auth_host = hiera('contrail::auth_host'), 124 $auth_host = hiera('contrail::auth_host'),
125 $api_server = hiera('contrail_config_vip'), 125 $api_server = hiera('contrail_config_vip'),
126 $api_port = hiera('contrail::api_port'), 126 $api_port = hiera('contrail::api_port'),
diff --git a/manifests/network/contrail/config.pp b/manifests/network/contrail/config.pp
index d02ab44..3fc4fd8 100644
--- a/manifests/network/contrail/config.pp
+++ b/manifests/network/contrail/config.pp
@@ -216,7 +216,7 @@
216# Defaults to hiera('contrail_database_node_ips') 216# Defaults to hiera('contrail_database_node_ips')
217# 217#
218class tripleo::network::contrail::config( 218class tripleo::network::contrail::config(
219 $step = hiera('step'), 219 $step = Integer(hiera('step')),
220 $aaa_mode = hiera('contrail::aaa_mode'), 220 $aaa_mode = hiera('contrail::aaa_mode'),
221 $admin_password = hiera('contrail::admin_password'), 221 $admin_password = hiera('contrail::admin_password'),
222 $admin_tenant_name = hiera('contrail::admin_tenant_name'), 222 $admin_tenant_name = hiera('contrail::admin_tenant_name'),
diff --git a/manifests/network/contrail/control.pp b/manifests/network/contrail/control.pp
index e9c7a9e..530d607 100644
--- a/manifests/network/contrail/control.pp
+++ b/manifests/network/contrail/control.pp
@@ -117,7 +117,7 @@
117# Defaults to hiera('step') 117# Defaults to hiera('step')
118# 118#
119class tripleo::network::contrail::control( 119class tripleo::network::contrail::control(
120 $step = hiera('step'), 120 $step = Integer(hiera('step')),
121 $admin_password = hiera('contrail::admin_password'), 121 $admin_password = hiera('contrail::admin_password'),
122 $admin_tenant_name = hiera('contrail::admin_tenant_name'), 122 $admin_tenant_name = hiera('contrail::admin_tenant_name'),
123 $admin_user = hiera('contrail::admin_user'), 123 $admin_user = hiera('contrail::admin_user'),
diff --git a/manifests/network/contrail/database.pp b/manifests/network/contrail/database.pp
index f74eb1c..3d6b40b 100644
--- a/manifests/network/contrail/database.pp
+++ b/manifests/network/contrail/database.pp
@@ -117,7 +117,7 @@ class tripleo::network::contrail::database(
117 $host_ip = hiera('contrail::database::host_ip'), 117 $host_ip = hiera('contrail::database::host_ip'),
118 $host_name = $::hostname, 118 $host_name = $::hostname,
119 $public_vip = hiera('public_virtual_ip'), 119 $public_vip = hiera('public_virtual_ip'),
120 $step = hiera('step'), 120 $step = Integer(hiera('step')),
121 $zookeeper_client_ip = hiera('contrail::database::host_ip'), 121 $zookeeper_client_ip = hiera('contrail::database::host_ip'),
122 $zookeeper_hostnames = hiera('contrail_database_short_node_names'), 122 $zookeeper_hostnames = hiera('contrail_database_short_node_names'),
123 $zookeeper_server_ips = hiera('contrail_database_node_ips'), 123 $zookeeper_server_ips = hiera('contrail_database_node_ips'),
diff --git a/manifests/network/contrail/heat.pp b/manifests/network/contrail/heat.pp
index 637fdda..4ef2a31 100644
--- a/manifests/network/contrail/heat.pp
+++ b/manifests/network/contrail/heat.pp
@@ -60,7 +60,7 @@ class tripleo::network::contrail::heat(
60 $api_port = 8082, 60 $api_port = 8082,
61 $api_server = hiera('contrail_config_vip'), 61 $api_server = hiera('contrail_config_vip'),
62 $auth_host = hiera('contrail::auth_host'), 62 $auth_host = hiera('contrail::auth_host'),
63 $step = hiera('step'), 63 $step = Integer(hiera('step')),
64 $use_ssl = 'False', 64 $use_ssl = 'False',
65) 65)
66{ 66{
diff --git a/manifests/network/contrail/provision.pp b/manifests/network/contrail/provision.pp
index 3025737..742c4a2 100644
--- a/manifests/network/contrail/provision.pp
+++ b/manifests/network/contrail/provision.pp
@@ -71,7 +71,7 @@ class tripleo::network::contrail::provision(
71 $auth_host = hiera('contrail::auth_host'), 71 $auth_host = hiera('contrail::auth_host'),
72 $auth_port = hiera('contrail::auth_port'), 72 $auth_port = hiera('contrail::auth_port'),
73 $auth_protocol = hiera('contrail::auth_protocol'), 73 $auth_protocol = hiera('contrail::auth_protocol'),
74 $step = hiera('step'), 74 $step = Integer(hiera('step')),
75) 75)
76{ 76{
77 if $step >= 5 { 77 if $step >= 5 {
diff --git a/manifests/network/contrail/vrouter.pp b/manifests/network/contrail/vrouter.pp
index 2bccd1d..678a77d 100644
--- a/manifests/network/contrail/vrouter.pp
+++ b/manifests/network/contrail/vrouter.pp
@@ -143,7 +143,7 @@
143# Defaults to hiera('contrail::vrouter::is_tsn',false) 143# Defaults to hiera('contrail::vrouter::is_tsn',false)
144# 144#
145class tripleo::network::contrail::vrouter ( 145class tripleo::network::contrail::vrouter (
146 $step = hiera('step'), 146 $step = Integer(hiera('step')),
147 $admin_password = hiera('contrail::admin_password'), 147 $admin_password = hiera('contrail::admin_password'),
148 $admin_tenant_name = hiera('contrail::admin_tenant_name'), 148 $admin_tenant_name = hiera('contrail::admin_tenant_name'),
149 $admin_token = hiera('contrail::admin_token'), 149 $admin_token = hiera('contrail::admin_token'),
diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp
index da8aaa6..bc219fa 100644
--- a/manifests/profile/base/aodh.pp
+++ b/manifests/profile/base/aodh.pp
@@ -72,7 +72,7 @@
72# Defaults to hiera('aodh::rabbit_use_ssl', '0') 72# Defaults to hiera('aodh::rabbit_use_ssl', '0')
73 73
74class tripleo::profile::base::aodh ( 74class tripleo::profile::base::aodh (
75 $step = hiera('step'), 75 $step = Integer(hiera('step')),
76 $bootstrap_node = hiera('bootstrap_nodeid', undef), 76 $bootstrap_node = hiera('bootstrap_nodeid', undef),
77 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), 77 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
78 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), 78 $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 (
49 $aodh_network = hiera('aodh_api_network', undef), 49 $aodh_network = hiera('aodh_api_network', undef),
50 $certificates_specs = hiera('apache_certificates_specs', {}), 50 $certificates_specs = hiera('apache_certificates_specs', {}),
51 $enable_internal_tls = hiera('enable_internal_tls', false), 51 $enable_internal_tls = hiera('enable_internal_tls', false),
52 $step = hiera('step'), 52 $step = Integer(hiera('step')),
53) { 53) {
54 54
55 include ::tripleo::profile::base::aodh 55 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::aodh::evaluator ( 26class tripleo::profile::base::aodh::evaluator (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 29
30 include ::tripleo::profile::base::aodh 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::aodh::listener ( 26class tripleo::profile::base::aodh::listener (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 29
30 include ::tripleo::profile::base::aodh 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::aodh::notifier ( 26class tripleo::profile::base::aodh::notifier (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 29
30 include ::tripleo::profile::base::aodh 30 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 @@
22# Defaults to hiera('step') 22# Defaults to hiera('step')
23# 23#
24class tripleo::profile::base::auditd ( 24class tripleo::profile::base::auditd (
25 $step = hiera('step'), 25 $step = Integer(hiera('step')),
26) { 26) {
27 if $step >= 4 { 27 if $step >= 4 {
28 include ::auditd 28 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 @@
25# 25#
26 26
27class tripleo::profile::base::barbican ( 27class tripleo::profile::base::barbican (
28 $step = hiera('step'), 28 $step = Integer(hiera('step')),
29) { 29) {
30 30
31 if $step >= 3 { 31 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 (
97 $bootstrap_node = hiera('bootstrap_nodeid', undef), 97 $bootstrap_node = hiera('bootstrap_nodeid', undef),
98 $certificates_specs = hiera('apache_certificates_specs', {}), 98 $certificates_specs = hiera('apache_certificates_specs', {}),
99 $enable_internal_tls = hiera('enable_internal_tls', false), 99 $enable_internal_tls = hiera('enable_internal_tls', false),
100 $step = hiera('step'), 100 $step = Integer(hiera('step')),
101 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), 101 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
102 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), 102 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
103 $oslomsg_rpc_password = hiera('barbican::api::rabbit_password'), 103 $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 @@
68# Defaults to hiera('ceilometer::rabbit_use_ssl', '0') 68# Defaults to hiera('ceilometer::rabbit_use_ssl', '0')
69 69
70class tripleo::profile::base::ceilometer ( 70class tripleo::profile::base::ceilometer (
71 $step = hiera('step'), 71 $step = Integer(hiera('step')),
72 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), 72 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
73 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), 73 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
74 $oslomsg_rpc_password = hiera('ceilometer::rabbit_password'), 74 $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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::ceilometer::agent::central ( 26class tripleo::profile::base::ceilometer::agent::central (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::ceilometer 29 include ::tripleo::profile::base::ceilometer
30 30
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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::ceilometer::agent::compute ( 26class tripleo::profile::base::ceilometer::agent::compute (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::ceilometer 29 include ::tripleo::profile::base::ceilometer
30 30
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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::ceilometer::agent::notification ( 26class tripleo::profile::base::ceilometer::agent::notification (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::ceilometer 29 include ::tripleo::profile::base::ceilometer
30 include ::tripleo::profile::base::ceilometer::upgrade 30 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 (
47 $ipmi_namespace = hiera('ipmi_namespace', false), 47 $ipmi_namespace = hiera('ipmi_namespace', false),
48 $ceilometer_redis_password = hiera('ceilometer_redis_password', undef), 48 $ceilometer_redis_password = hiera('ceilometer_redis_password', undef),
49 $redis_vip = hiera('redis_vip', undef), 49 $redis_vip = hiera('redis_vip', undef),
50 $step = hiera('step'), 50 $step = Integer(hiera('step')),
51) { 51) {
52 include ::tripleo::profile::base::ceilometer 52 include ::tripleo::profile::base::ceilometer
53 53
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 (
48 $ceilometer_network = hiera('ceilometer_api_network', undef), 48 $ceilometer_network = hiera('ceilometer_api_network', undef),
49 $certificates_specs = hiera('apache_certificates_specs', {}), 49 $certificates_specs = hiera('apache_certificates_specs', {}),
50 $enable_internal_tls = hiera('enable_internal_tls', false), 50 $enable_internal_tls = hiera('enable_internal_tls', false),
51 $step = hiera('step'), 51 $step = Integer(hiera('step')),
52) { 52) {
53 include ::tripleo::profile::base::ceilometer 53 include ::tripleo::profile::base::ceilometer
54 54
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 @@
46# 46#
47class tripleo::profile::base::ceilometer::collector ( 47class tripleo::profile::base::ceilometer::collector (
48 $bootstrap_node = hiera('bootstrap_nodeid', undef), 48 $bootstrap_node = hiera('bootstrap_nodeid', undef),
49 $step = hiera('step'), 49 $step = Integer(hiera('step')),
50 $ceilometer_backend = hiera('ceilometer_backend', 'mongodb'), 50 $ceilometer_backend = hiera('ceilometer_backend', 'mongodb'),
51 $mongodb_ipv6 = hiera('mongodb::server::ipv6', false), 51 $mongodb_ipv6 = hiera('mongodb::server::ipv6', false),
52 $mongodb_node_ips = hiera('mongodb_node_ips', []), 52 $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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::ceilometer::expirer ( 26class tripleo::profile::base::ceilometer::expirer (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::ceilometer 29 include ::tripleo::profile::base::ceilometer
30 30
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 @@
30 30
31class tripleo::profile::base::ceilometer::upgrade ( 31class tripleo::profile::base::ceilometer::upgrade (
32 $bootstrap_node = hiera('bootstrap_nodeid', undef), 32 $bootstrap_node = hiera('bootstrap_nodeid', undef),
33 $step = hiera('step'), 33 $step = Integer(hiera('step')),
34) { 34) {
35 if $::hostname == downcase($bootstrap_node) { 35 if $::hostname == downcase($bootstrap_node) {
36 $sync_db = true 36 $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 (
39 $ceph_mon_initial_members = hiera('ceph_mon_short_node_names', undef), 39 $ceph_mon_initial_members = hiera('ceph_mon_short_node_names', undef),
40 $ceph_mon_host = hiera('ceph_mon_node_ips', '127.0.0.1'), 40 $ceph_mon_host = hiera('ceph_mon_node_ips', '127.0.0.1'),
41 $enable_ceph_storage = false, 41 $enable_ceph_storage = false,
42 $step = hiera('step'), 42 $step = Integer(hiera('step')),
43) { 43) {
44 if ! $ceph_mon_initial_members { 44 if ! $ceph_mon_initial_members {
45 $ceph_mon_initial_members_real = hiera('ceph_mon_node_names', undef) 45 $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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::ceph::client ( 26class tripleo::profile::base::ceph::client (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::ceph 29 include ::tripleo::profile::base::ceph
30 30
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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::ceph::mds ( 26class tripleo::profile::base::ceph::mds (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 29
30 include ::tripleo::profile::base::ceph 30 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 @@
35# 35#
36class tripleo::profile::base::ceph::mon ( 36class tripleo::profile::base::ceph::mon (
37 $ceph_pools = {}, 37 $ceph_pools = {},
38 $step = hiera('step'), 38 $step = Integer(hiera('step')),
39) { 39) {
40 include ::tripleo::profile::base::ceph 40 include ::tripleo::profile::base::ceph
41 41
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 @@
29# 29#
30class tripleo::profile::base::ceph::osd ( 30class tripleo::profile::base::ceph::osd (
31 $ceph_osd_selinux_permissive = false, 31 $ceph_osd_selinux_permissive = false,
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 include ::tripleo::profile::base::ceph 34 include ::tripleo::profile::base::ceph
35 35
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 (
51 $civetweb_bind_ip = '127.0.0.1', 51 $civetweb_bind_ip = '127.0.0.1',
52 $civetweb_bind_port = '8080', 52 $civetweb_bind_port = '8080',
53 $rgw_keystone_version = 'v2.0', 53 $rgw_keystone_version = 'v2.0',
54 $step = hiera('step'), 54 $step = Integer(hiera('step')),
55) { 55) {
56 56
57 include ::tripleo::profile::base::ceph 57 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 @@
77class tripleo::profile::base::cinder ( 77class tripleo::profile::base::cinder (
78 $bootstrap_node = hiera('bootstrap_nodeid', undef), 78 $bootstrap_node = hiera('bootstrap_nodeid', undef),
79 $cinder_enable_db_purge = true, 79 $cinder_enable_db_purge = true,
80 $step = hiera('step'), 80 $step = Integer(hiera('step')),
81 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), 81 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
82 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), 82 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
83 $oslomsg_rpc_password = hiera('cinder::rabbit_password'), 83 $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 (
53 $certificates_specs = hiera('apache_certificates_specs', {}), 53 $certificates_specs = hiera('apache_certificates_specs', {}),
54 $cinder_api_network = hiera('cinder_api_network', undef), 54 $cinder_api_network = hiera('cinder_api_network', undef),
55 $enable_internal_tls = hiera('enable_internal_tls', false), 55 $enable_internal_tls = hiera('enable_internal_tls', false),
56 $step = hiera('step'), 56 $step = Integer(hiera('step')),
57) { 57) {
58 if $::hostname == downcase($bootstrap_node) { 58 if $::hostname == downcase($bootstrap_node) {
59 $sync_db = true 59 $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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::cinder::backup ( 26class tripleo::profile::base::cinder::backup (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 29
30 include ::tripleo::profile::base::cinder 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::cinder::backup::ceph ( 26class tripleo::profile::base::cinder::backup::ceph (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 29
30 include ::tripleo::profile::base::cinder::backup 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::cinder::backup::swift ( 26class tripleo::profile::base::cinder::backup::swift (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 29
30 include ::tripleo::profile::base::cinder::backup 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::cinder::scheduler ( 26class tripleo::profile::base::cinder::scheduler (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::cinder 29 include ::tripleo::profile::base::cinder
30 30
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 (
74 $cinder_enable_rbd_backend = false, 74 $cinder_enable_rbd_backend = false,
75 $cinder_enable_scaleio_backend = false, 75 $cinder_enable_scaleio_backend = false,
76 $cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef), 76 $cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef),
77 $step = hiera('step'), 77 $step = Integer(hiera('step')),
78) { 78) {
79 include ::tripleo::profile::base::cinder 79 include ::tripleo::profile::base::cinder
80 80
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 @@
29# 29#
30class tripleo::profile::base::cinder::volume::dellps ( 30class tripleo::profile::base::cinder::volume::dellps (
31 $backend_name = hiera('cinder::backend::eqlx::volume_backend_name', 'tripleo_dellps'), 31 $backend_name = hiera('cinder::backend::eqlx::volume_backend_name', 'tripleo_dellps'),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 include ::tripleo::profile::base::cinder::volume 34 include ::tripleo::profile::base::cinder::volume
35 35
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 @@
29# 29#
30class tripleo::profile::base::cinder::volume::dellsc ( 30class tripleo::profile::base::cinder::volume::dellsc (
31 $backend_name = hiera('cinder::backend::dellsc_iscsi::volume_backend_name', 'tripleo_dellsc'), 31 $backend_name = hiera('cinder::backend::dellsc_iscsi::volume_backend_name', 'tripleo_dellsc'),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 include ::tripleo::profile::base::cinder::volume 34 include ::tripleo::profile::base::cinder::volume
35 35
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 (
53 $cinder_hpelefthand_api_url = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_api_url', undef), 53 $cinder_hpelefthand_api_url = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_api_url', undef),
54 $cinder_hpelefthand_iscsi_chap_enabled = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_iscsi_chap_enabled', undef), 54 $cinder_hpelefthand_iscsi_chap_enabled = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_iscsi_chap_enabled', undef),
55 $cinder_hpelefthand_debug = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_debug', undef), 55 $cinder_hpelefthand_debug = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_debug', undef),
56 $step = hiera('step'), 56 $step = Integer(hiera('step')),
57) { 57) {
58 include ::tripleo::profile::base::cinder::volume 58 include ::tripleo::profile::base::cinder::volume
59 59
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 (
48 $cinder_iscsi_helper = 'tgtadm', 48 $cinder_iscsi_helper = 'tgtadm',
49 $cinder_iscsi_protocol = 'iscsi', 49 $cinder_iscsi_protocol = 'iscsi',
50 $cinder_lvm_loop_device_size = '10280', 50 $cinder_lvm_loop_device_size = '10280',
51 $step = hiera('step'), 51 $step = Integer(hiera('step')),
52) { 52) {
53 include ::tripleo::profile::base::cinder::volume 53 include ::tripleo::profile::base::cinder::volume
54 54
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 @@
29# 29#
30class tripleo::profile::base::cinder::volume::netapp ( 30class tripleo::profile::base::cinder::volume::netapp (
31 $backend_name = hiera('cinder::backend::netapp::volume_backend_name', 'tripleo_netapp'), 31 $backend_name = hiera('cinder::backend::netapp::volume_backend_name', 'tripleo_netapp'),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 include ::tripleo::profile::base::cinder::volume 34 include ::tripleo::profile::base::cinder::volume
35 35
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 (
57 $cinder_nfs_mount_options = '', 57 $cinder_nfs_mount_options = '',
58 $cinder_nas_secure_file_operations = $::os_service_default, 58 $cinder_nas_secure_file_operations = $::os_service_default,
59 $cinder_nas_secure_file_permissions = $::os_service_default, 59 $cinder_nas_secure_file_permissions = $::os_service_default,
60 $step = hiera('step'), 60 $step = Integer(hiera('step')),
61) { 61) {
62 include ::tripleo::profile::base::cinder::volume 62 include ::tripleo::profile::base::cinder::volume
63 63
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 @@
48# 48#
49class tripleo::profile::base::cinder::volume::pure ( 49class tripleo::profile::base::cinder::volume::pure (
50 $backend_name = hiera('cinder::backend::pure::volume_backend_name', 'tripleo_pure'), 50 $backend_name = hiera('cinder::backend::pure::volume_backend_name', 'tripleo_pure'),
51 $step = hiera('step'), 51 $step = Integer(hiera('step')),
52) { 52) {
53 include ::tripleo::profile::base::cinder::volume 53 include ::tripleo::profile::base::cinder::volume
54 54
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 (
49 $cinder_rbd_pool_name = 'volumes', 49 $cinder_rbd_pool_name = 'volumes',
50 $cinder_rbd_secret_uuid = hiera('ceph::profile::params::fsid', undef), 50 $cinder_rbd_secret_uuid = hiera('ceph::profile::params::fsid', undef),
51 $cinder_rbd_user_name = 'openstack', 51 $cinder_rbd_user_name = 'openstack',
52 $step = hiera('step'), 52 $step = Integer(hiera('step')),
53) { 53) {
54 include ::tripleo::profile::base::cinder::volume 54 include ::tripleo::profile::base::cinder::volume
55 55
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 @@
29# 29#
30class tripleo::profile::base::cinder::volume::scaleio ( 30class tripleo::profile::base::cinder::volume::scaleio (
31 $backend_name = hiera('cinder::backend::scaleio::volume_backend_name', 'tripleo_scaleio'), 31 $backend_name = hiera('cinder::backend::scaleio::volume_backend_name', 'tripleo_scaleio'),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 include ::tripleo::profile::base::cinder::volume 34 include ::tripleo::profile::base::cinder::volume
35 35
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 @@
52 52
53class tripleo::profile::base::congress ( 53class tripleo::profile::base::congress (
54 $bootstrap_node = hiera('bootstrap_nodeid', undef), 54 $bootstrap_node = hiera('bootstrap_nodeid', undef),
55 $step = hiera('step'), 55 $step = Integer(hiera('step')),
56 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), 56 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
57 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), 57 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
58 $oslomsg_rpc_password = hiera('congress::rabbit_password'), 58 $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 @@
37class tripleo::profile::base::database::mongodb ( 37class tripleo::profile::base::database::mongodb (
38 $mongodb_replset, 38 $mongodb_replset,
39 $bootstrap_node = downcase(hiera('bootstrap_nodeid')), 39 $bootstrap_node = downcase(hiera('bootstrap_nodeid')),
40 $step = hiera('step'), 40 $step = Integer(hiera('step')),
41 $memory_limit = '20G', 41 $memory_limit = '20G',
42) { 42) {
43 if $step >= 2 { 43 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 (
80 $mysql_server_options = {}, 80 $mysql_server_options = {},
81 $mysql_max_connections = hiera('mysql_max_connections', undef), 81 $mysql_max_connections = hiera('mysql_max_connections', undef),
82 $remove_default_accounts = true, 82 $remove_default_accounts = true,
83 $step = hiera('step'), 83 $step = Integer(hiera('step')),
84) { 84) {
85 85
86 if $::hostname == downcase($bootstrap_node) { 86 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 (
50 $mysql_read_default_group = 'tripleo', 50 $mysql_read_default_group = 'tripleo',
51 $mysql_client_bind_address = undef, 51 $mysql_client_bind_address = undef,
52 $ssl_ca = '/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt', 52 $ssl_ca = '/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt',
53 $step = hiera('step'), 53 $step = Integer(hiera('step')),
54) { 54) {
55 if $step >= 1 { 55 if $step >= 1 {
56 # If the folder /etc/my.cnf.d does not exist (e.g. if mariadb is not 56 # 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 @@
34class tripleo::profile::base::database::redis ( 34class tripleo::profile::base::database::redis (
35 $bootstrap_nodeid = hiera('bootstrap_nodeid'), 35 $bootstrap_nodeid = hiera('bootstrap_nodeid'),
36 $redis_node_ips = hiera('redis_node_ips'), 36 $redis_node_ips = hiera('redis_node_ips'),
37 $step = hiera('step'), 37 $step = Integer(hiera('step')),
38) { 38) {
39 if $step >= 2 { 39 if $step >= 2 {
40 if downcase($bootstrap_nodeid) == $::hostname { 40 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 (
66 $docker_options = '--log-driver=journald --signature-verification=false', 66 $docker_options = '--log-driver=journald --signature-verification=false',
67 $configure_storage = true, 67 $configure_storage = true,
68 $storage_options = '-s overlay2', 68 $storage_options = '-s overlay2',
69 $step = hiera('step'), 69 $step = Integer(hiera('step')),
70 $configure_libvirt_polkit = undef, 70 $configure_libvirt_polkit = undef,
71 $docker_nova_uid = 42436, 71 $docker_nova_uid = 42436,
72 $services_enabled = hiera('service_names', []) 72 $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 (
62 $nodes = hiera('etcd_node_names', []), 62 $nodes = hiera('etcd_node_names', []),
63 $certificate_specs = {}, 63 $certificate_specs = {},
64 $enable_internal_tls = hiera('enable_internal_tls', false), 64 $enable_internal_tls = hiera('enable_internal_tls', false),
65 $step = hiera('step'), 65 $step = Integer(hiera('step')),
66) { 66) {
67 67
68 validate_hash($certificate_specs) 68 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 (
86 $glance_backend = downcase(hiera('glance_backend', 'swift')), 86 $glance_backend = downcase(hiera('glance_backend', 'swift')),
87 $glance_network = hiera('glance_api_network', undef), 87 $glance_network = hiera('glance_api_network', undef),
88 $glance_nfs_enabled = false, 88 $glance_nfs_enabled = false,
89 $step = hiera('step'), 89 $step = Integer(hiera('step')),
90 $rabbit_hosts = hiera('rabbitmq_node_names', undef), 90 $rabbit_hosts = hiera('rabbitmq_node_names', undef),
91 $rabbit_port = hiera('glance::notify::rabbitmq::rabbit_port', 5672), 91 $rabbit_port = hiera('glance::notify::rabbitmq::rabbit_port', 5672),
92 $tls_proxy_bind_ip = undef, 92 $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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::gnocchi ( 26class tripleo::profile::base::gnocchi (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 if $step >= 3 { 29 if $step >= 3 {
30 include ::gnocchi 30 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 (
68 $gnocchi_network = hiera('gnocchi_api_network', undef), 68 $gnocchi_network = hiera('gnocchi_api_network', undef),
69 $gnocchi_redis_password = hiera('gnocchi_redis_password'), 69 $gnocchi_redis_password = hiera('gnocchi_redis_password'),
70 $redis_vip = hiera('redis_vip'), 70 $redis_vip = hiera('redis_vip'),
71 $step = hiera('step'), 71 $step = Integer(hiera('step')),
72) { 72) {
73 if $::hostname == downcase($bootstrap_node) { 73 if $::hostname == downcase($bootstrap_node) {
74 $sync_db = true 74 $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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::gnocchi::metricd ( 26class tripleo::profile::base::gnocchi::metricd (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::gnocchi 29 include ::tripleo::profile::base::gnocchi
30 30
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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::gnocchi::statsd ( 26class tripleo::profile::base::gnocchi::statsd (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::gnocchi 29 include ::tripleo::profile::base::gnocchi
30 30
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 @@
44class tripleo::profile::base::haproxy ( 44class tripleo::profile::base::haproxy (
45 $certificates_specs = {}, 45 $certificates_specs = {},
46 $enable_load_balancer = hiera('enable_load_balancer', true), 46 $enable_load_balancer = hiera('enable_load_balancer', true),
47 $step = hiera('step'), 47 $step = Integer(hiera('step')),
48) { 48) {
49 if $step >= 1 { 49 if $step >= 1 {
50 if $enable_load_balancer { 50 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 (
83 $bootstrap_node = downcase(hiera('bootstrap_nodeid')), 83 $bootstrap_node = downcase(hiera('bootstrap_nodeid')),
84 $manage_db_purge = hiera('heat_enable_db_purge', true), 84 $manage_db_purge = hiera('heat_enable_db_purge', true),
85 $notification_driver = 'messaging', 85 $notification_driver = 'messaging',
86 $step = hiera('step'), 86 $step = Integer(hiera('step')),
87 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), 87 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
88 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), 88 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
89 $oslomsg_rpc_password = hiera('heat::rabbit_password'), 89 $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 (
48 $certificates_specs = hiera('apache_certificates_specs', {}), 48 $certificates_specs = hiera('apache_certificates_specs', {}),
49 $enable_internal_tls = hiera('enable_internal_tls', false), 49 $enable_internal_tls = hiera('enable_internal_tls', false),
50 $heat_api_network = hiera('heat_api_network', undef), 50 $heat_api_network = hiera('heat_api_network', undef),
51 $step = hiera('step'), 51 $step = Integer(hiera('step')),
52) { 52) {
53 include ::tripleo::profile::base::heat 53 include ::tripleo::profile::base::heat
54 54
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 (
48 $certificates_specs = hiera('apache_certificates_specs', {}), 48 $certificates_specs = hiera('apache_certificates_specs', {}),
49 $enable_internal_tls = hiera('enable_internal_tls', false), 49 $enable_internal_tls = hiera('enable_internal_tls', false),
50 $heat_api_cfn_network = hiera('heat_api_cfn_network', undef), 50 $heat_api_cfn_network = hiera('heat_api_cfn_network', undef),
51 $step = hiera('step'), 51 $step = Integer(hiera('step')),
52) { 52) {
53 include ::tripleo::profile::base::heat 53 include ::tripleo::profile::base::heat
54 54
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 (
48 $certificates_specs = hiera('apache_certificates_specs', {}), 48 $certificates_specs = hiera('apache_certificates_specs', {}),
49 $enable_internal_tls = hiera('enable_internal_tls', false), 49 $enable_internal_tls = hiera('enable_internal_tls', false),
50 $heat_api_cloudwatch_network = hiera('heat_api_cloudwatch_network', undef), 50 $heat_api_cloudwatch_network = hiera('heat_api_cloudwatch_network', undef),
51 $step = hiera('step'), 51 $step = Integer(hiera('step')),
52) { 52) {
53 include ::tripleo::profile::base::heat 53 include ::tripleo::profile::base::heat
54 54
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 @@
29# 29#
30class tripleo::profile::base::heat::engine ( 30class tripleo::profile::base::heat::engine (
31 $bootstrap_node = hiera('bootstrap_nodeid', undef), 31 $bootstrap_node = hiera('bootstrap_nodeid', undef),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 if $::hostname == downcase($bootstrap_node) { 34 if $::hostname == downcase($bootstrap_node) {
35 $sync_db = true 35 $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 @@
28# Defaults to hiera('horizon::neutron_options', {}) 28# Defaults to hiera('horizon::neutron_options', {})
29# 29#
30class tripleo::profile::base::horizon ( 30class tripleo::profile::base::horizon (
31 $step = hiera('step'), 31 $step = Integer(hiera('step')),
32 $neutron_options = hiera('horizon::neutron_options', {}), 32 $neutron_options = hiera('horizon::neutron_options', {}),
33) { 33) {
34 if $step >= 3 { 34 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 @@
52 52
53class tripleo::profile::base::ironic ( 53class tripleo::profile::base::ironic (
54 $bootstrap_node = hiera('bootstrap_nodeid', undef), 54 $bootstrap_node = hiera('bootstrap_nodeid', undef),
55 $step = hiera('step'), 55 $step = Integer(hiera('step')),
56 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), 56 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
57 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), 57 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
58 $oslomsg_rpc_password = hiera('ironic::rabbit_password'), 58 $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 @@
23# Defaults to hiera('step') 23# Defaults to hiera('step')
24# 24#
25class tripleo::profile::base::ironic::api ( 25class tripleo::profile::base::ironic::api (
26 $step = hiera('step'), 26 $step = Integer(hiera('step')),
27) { 27) {
28 include ::tripleo::profile::base::ironic 28 include ::tripleo::profile::base::ironic
29 29
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 @@
27# Defaults to true 27# Defaults to true
28# 28#
29class tripleo::profile::base::ironic::conductor ( 29class tripleo::profile::base::ironic::conductor (
30 $step = hiera('step'), 30 $step = Integer(hiera('step')),
31 $manage_pxe = true, 31 $manage_pxe = true,
32) { 32) {
33 include ::tripleo::profile::base::ironic 33 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 @@
28 28
29class tripleo::profile::base::ironic_inspector ( 29class tripleo::profile::base::ironic_inspector (
30 $bootstrap_node = hiera('bootstrap_nodeid', undef), 30 $bootstrap_node = hiera('bootstrap_nodeid', undef),
31 $step = hiera('step'), 31 $step = Integer(hiera('step')),
32) { 32) {
33 33
34 if $::hostname == downcase($bootstrap_node) { 34 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 (
49 $control_virtual_ip = hiera('tripleo::keepalived::controller_virtual_ip'), 49 $control_virtual_ip = hiera('tripleo::keepalived::controller_virtual_ip'),
50 $public_virtual_interface = hiera('tripleo::keepalived::public_virtual_interface', false), 50 $public_virtual_interface = hiera('tripleo::keepalived::public_virtual_interface', false),
51 $public_virtual_ip = hiera('tripleo::keepalived::public_virtual_ip'), 51 $public_virtual_ip = hiera('tripleo::keepalived::public_virtual_ip'),
52 $step = hiera('step'), 52 $step = Integer(hiera('step')),
53) { 53) {
54 if $step >= 1 { 54 if $step >= 1 {
55 if $enable_load_balancer and hiera('enable_keepalived', true){ 55 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 (
150 $oslomsg_notify_port = hiera('keystone::rabbit_port', '5672'), 150 $oslomsg_notify_port = hiera('keystone::rabbit_port', '5672'),
151 $oslomsg_notify_username = hiera('keystone::rabbit_userid', 'guest'), 151 $oslomsg_notify_username = hiera('keystone::rabbit_userid', 'guest'),
152 $oslomsg_use_ssl = hiera('keystone::rabbit_use_ssl', '0'), 152 $oslomsg_use_ssl = hiera('keystone::rabbit_use_ssl', '0'),
153 $step = hiera('step'), 153 $step = Integer(hiera('step')),
154) { 154) {
155 if $::hostname == downcase($bootstrap_node) { 155 if $::hostname == downcase($bootstrap_node) {
156 $sync_db = true 156 $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 @@
59# (Optional, default 42185) Port on which fluentd should listen if 59# (Optional, default 42185) Port on which fluentd should listen if
60# $fluentd_listen_syslog is true. 60# $fluentd_listen_syslog is true.
61class tripleo::profile::base::logging::fluentd ( 61class tripleo::profile::base::logging::fluentd (
62 $step = hiera('step', undef), 62 $step = Integer(hiera('step')),
63 $fluentd_sources = undef, 63 $fluentd_sources = undef,
64 $fluentd_filters = undef, 64 $fluentd_filters = undef,
65 $fluentd_servers = undef, 65 $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 @@
72 72
73class tripleo::profile::base::manila ( 73class tripleo::profile::base::manila (
74 $bootstrap_node = hiera('bootstrap_nodeid', undef), 74 $bootstrap_node = hiera('bootstrap_nodeid', undef),
75 $step = hiera('step'), 75 $step = Integer(hiera('step')),
76 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), 76 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
77 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), 77 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
78 $oslomsg_rpc_password = hiera('manila::rabbit_password'), 78 $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 (
44 $backend_netapp_enabled = hiera('manila_backend_netapp_enabled', false), 44 $backend_netapp_enabled = hiera('manila_backend_netapp_enabled', false),
45 $backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false), 45 $backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false),
46 $bootstrap_node = hiera('bootstrap_nodeid', undef), 46 $bootstrap_node = hiera('bootstrap_nodeid', undef),
47 $step = hiera('step'), 47 $step = Integer(hiera('step')),
48) { 48) {
49 if $::hostname == downcase($bootstrap_node) { 49 if $::hostname == downcase($bootstrap_node) {
50 $sync_db = true 50 $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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::manila::scheduler ( 26class tripleo::profile::base::manila::scheduler (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::manila 29 include ::tripleo::profile::base::manila
30 30
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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::manila::share ( 26class tripleo::profile::base::manila::share (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::manila 29 include ::tripleo::profile::base::manila
30 30
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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::memcached ( 26class tripleo::profile::base::memcached (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 if $step >= 1 { 29 if $step >= 1 {
30 include ::memcached 30 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 @@
47# deployment. This is used to look up service-specific plugins that 47# deployment. This is used to look up service-specific plugins that
48# need to be installed. 48# need to be installed.
49class tripleo::profile::base::metrics::collectd ( 49class tripleo::profile::base::metrics::collectd (
50 $step = hiera('step'), 50 $step = Integer(hiera('step')),
51 51
52 $collectd_server = undef, 52 $collectd_server = undef,
53 $collectd_port = undef, 53 $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 @@
73 73
74class tripleo::profile::base::mistral ( 74class tripleo::profile::base::mistral (
75 $bootstrap_node = hiera('bootstrap_nodeid', undef), 75 $bootstrap_node = hiera('bootstrap_nodeid', undef),
76 $step = hiera('step'), 76 $step = Integer(hiera('step')),
77 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), 77 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
78 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), 78 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
79 $oslomsg_rpc_password = hiera('mistral::rabbit_password'), 79 $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 (
53 $certificates_specs = hiera('apache_certificates_specs', {}), 53 $certificates_specs = hiera('apache_certificates_specs', {}),
54 $enable_internal_tls = hiera('enable_internal_tls', false), 54 $enable_internal_tls = hiera('enable_internal_tls', false),
55 $mistral_api_network = hiera('mistral_api_network', undef), 55 $mistral_api_network = hiera('mistral_api_network', undef),
56 $step = hiera('step'), 56 $step = Integer(hiera('step')),
57) { 57) {
58 if $::hostname == downcase($bootstrap_node) { 58 if $::hostname == downcase($bootstrap_node) {
59 $sync_db = true 59 $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 @@
29# 29#
30class tripleo::profile::base::mistral::engine ( 30class tripleo::profile::base::mistral::engine (
31 $bootstrap_node = hiera('bootstrap_nodeid', undef), 31 $bootstrap_node = hiera('bootstrap_nodeid', undef),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 if $::hostname == downcase($bootstrap_node) { 34 if $::hostname == downcase($bootstrap_node) {
35 $sync_db = true 35 $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 @@
29# 29#
30class tripleo::profile::base::mistral::event_engine ( 30class tripleo::profile::base::mistral::event_engine (
31 $bootstrap_node = hiera('bootstrap_nodeid', undef), 31 $bootstrap_node = hiera('bootstrap_nodeid', undef),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 if $::hostname == downcase($bootstrap_node) { 34 if $::hostname == downcase($bootstrap_node) {
35 $sync_db = true 35 $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 @@
29# 29#
30class tripleo::profile::base::mistral::executor ( 30class tripleo::profile::base::mistral::executor (
31 $bootstrap_node = hiera('bootstrap_nodeid', undef), 31 $bootstrap_node = hiera('bootstrap_nodeid', undef),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 if $::hostname == downcase($bootstrap_node) { 34 if $::hostname == downcase($bootstrap_node) {
35 $sync_db = true 35 $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 @@
23# Defaults to hiera('step') 23# Defaults to hiera('step')
24# 24#
25class tripleo::profile::base::monitoring::sensu ( 25class tripleo::profile::base::monitoring::sensu (
26 $step = hiera('step', undef), 26 $step = Integer(hiera('step')),
27) { 27) {
28 include ::sensu 28 include ::sensu
29 package { 'osops-tools-monitoring-oschecks': 29 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 @@
23# Defaults to hiera('step') 23# Defaults to hiera('step')
24# 24#
25class tripleo::profile::base::monitoring::uchiwa ( 25class tripleo::profile::base::monitoring::uchiwa (
26 $step = hiera('step', undef), 26 $step = Integer(hiera('step')),
27) { 27) {
28 if $step == undef or $step >= 3 { 28 if $step >= 3 {
29 include ::uchiwa 29 include ::uchiwa
30 } 30 }
31} 31}
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 @@
80# 80#
81 81
82class tripleo::profile::base::neutron ( 82class tripleo::profile::base::neutron (
83 $step = hiera('step'), 83 $step = Integer(hiera('step')),
84 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), 84 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
85 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), 85 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
86 $oslomsg_rpc_password = hiera('neutron::rabbit_password'), 86 $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 @@
27# Defaults to hiera('step') 27# Defaults to hiera('step')
28# 28#
29class tripleo::profile::base::neutron::agents::bagpipe ( 29class tripleo::profile::base::neutron::agents::bagpipe (
30 $step = hiera('step'), 30 $step = Integer(hiera('step')),
31) { 31) {
32 include ::tripleo::profile::base::neutron 32 include ::tripleo::profile::base::neutron
33 33
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 @@
23# Defaults to hiera('step') 23# Defaults to hiera('step')
24# 24#
25class tripleo::profile::base::neutron::agents::bigswitch( 25class tripleo::profile::base::neutron::agents::bigswitch(
26 $step = hiera('step'), 26 $step = Integer(hiera('step')),
27) { 27) {
28 if $step >= 4 { 28 if $step >= 4 {
29 include ::neutron::agents::bigswitch 29 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 @@
27# Defaults to hiera('step') 27# Defaults to hiera('step')
28# 28#
29class tripleo::profile::base::neutron::agents::l2gw ( 29class tripleo::profile::base::neutron::agents::l2gw (
30 $step = hiera('step'), 30 $step = Integer(hiera('step')),
31) { 31) {
32 if $step >= 4 { 32 if $step >= 4 {
33 include ::neutron::agents::l2gw 33 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 @@
33class tripleo::profile::base::neutron::agents::midonet ( 33class tripleo::profile::base::neutron::agents::midonet (
34 $midonet_libvirt_qemu_data = hiera('midonet_libvirt_qemu_data', ''), 34 $midonet_libvirt_qemu_data = hiera('midonet_libvirt_qemu_data', ''),
35 $neutron_api_node_ips = hiera('neutron_api_node_ips', ''), 35 $neutron_api_node_ips = hiera('neutron_api_node_ips', ''),
36 $step = hiera('step'), 36 $step = Integer(hiera('step')),
37) { 37) {
38 if $step >= 4 { 38 if $step >= 4 {
39 # TODO(devvesa) provide non-controller ips for these services 39 # 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 (
43 $nova_metadata_ip = hiera('nova_metadata_node_ips', ''), 43 $nova_metadata_ip = hiera('nova_metadata_node_ips', ''),
44 $nova_os_password = hiera('nova_password', ''), 44 $nova_os_password = hiera('nova_password', ''),
45 $nova_os_tenant_name = hiera('nova::api::admin_tenant_name', ''), 45 $nova_os_tenant_name = hiera('nova::api::admin_tenant_name', ''),
46 $step = hiera('step'), 46 $step = Integer(hiera('step')),
47) { 47) {
48 if $step >= 4 { 48 if $step >= 4 {
49 include ::nuage::vrs 49 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 @@
32class tripleo::profile::base::neutron::agents::ovn ( 32class tripleo::profile::base::neutron::agents::ovn (
33 $ovn_db_host = hiera('ovn_dbs_vip'), 33 $ovn_db_host = hiera('ovn_dbs_vip'),
34 $ovn_sbdb_port = hiera('ovn::southbound::port'), 34 $ovn_sbdb_port = hiera('ovn::southbound::port'),
35 $step = hiera('step') 35 $step = Integer(hiera('step'))
36) { 36) {
37 if $step >= 4 { 37 if $step >= 4 {
38 class { '::ovn::controller': 38 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 @@
32# Defaults to 2379 32# Defaults to 2379
33# 33#
34class tripleo::profile::base::neutron::agents::vpp( 34class tripleo::profile::base::neutron::agents::vpp(
35 $step = hiera('step'), 35 $step = Integer(hiera('step')),
36 $etcd_host = hiera('etcd_vip'), 36 $etcd_host = hiera('etcd_vip'),
37 $etcd_port = 2379, 37 $etcd_port = 2379,
38) { 38) {
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 @@
27# Defaults to hiera('step') 27# Defaults to hiera('step')
28# 28#
29class tripleo::profile::base::neutron::bgpvpn ( 29class tripleo::profile::base::neutron::bgpvpn (
30 $step = hiera('step'), 30 $step = Integer(hiera('step')),
31) { 31) {
32 include ::tripleo::profile::base::neutron 32 include ::tripleo::profile::base::neutron
33 33
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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::neutron::dhcp ( 26class tripleo::profile::base::neutron::dhcp (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 if $step >= 4 { 29 if $step >= 4 {
30 include ::tripleo::profile::base::neutron 30 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 @@
27# Defaults to hiera('step') 27# Defaults to hiera('step')
28# 28#
29class tripleo::profile::base::neutron::l2gw ( 29class tripleo::profile::base::neutron::l2gw (
30 $step = hiera('step'), 30 $step = Integer(hiera('step')),
31) { 31) {
32 include ::tripleo::profile::base::neutron 32 include ::tripleo::profile::base::neutron
33 33
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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::neutron::l3 ( 26class tripleo::profile::base::neutron::l3 (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 if $step >= 4 { 29 if $step >= 4 {
30 include ::tripleo::profile::base::neutron 30 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 @@
29# 29#
30class tripleo::profile::base::neutron::lbaas( 30class tripleo::profile::base::neutron::lbaas(
31 $manage_haproxy_package = hiera('manage_haproxy_package', false), 31 $manage_haproxy_package = hiera('manage_haproxy_package', false),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 34
35 include ::tripleo::profile::base::neutron 35 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 @@
10# Defaults to hiera('step') 10# Defaults to hiera('step')
11# 11#
12class tripleo::profile::base::neutron::linuxbridge( 12class tripleo::profile::base::neutron::linuxbridge(
13 $step = hiera('step'), 13 $step = Integer(hiera('step')),
14) { 14) {
15 include ::tripleo::profile::base::neutron 15 include ::tripleo::profile::base::neutron
16 16
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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::neutron::metadata ( 26class tripleo::profile::base::neutron::metadata (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 if $step >= 4 { 29 if $step >= 4 {
30 include ::tripleo::profile::base::neutron 30 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 (
69 $neutron_api_node_ips = hiera('neutron_api_node_ips', ''), 69 $neutron_api_node_ips = hiera('neutron_api_node_ips', ''),
70 $neutron_auth_password = hiera('neutron::keystone::authtoken::password', ''), 70 $neutron_auth_password = hiera('neutron::keystone::authtoken::password', ''),
71 $neutron_auth_tenant = hiera('neutron::keystone::authtoken::project_name', ''), 71 $neutron_auth_tenant = hiera('neutron::keystone::authtoken::project_name', ''),
72 $step = hiera('step'), 72 $step = Integer(hiera('step')),
73 $vip = hiera('public_virtual_ip'), 73 $vip = hiera('public_virtual_ip'),
74 $zk_on_controller = hiera('enable_zookeeper_on_controller', ''), 74 $zk_on_controller = hiera('enable_zookeeper_on_controller', ''),
75 $zookeeper_client_ip = hiera('neutron::bind_host', ''), 75 $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 @@
34class tripleo::profile::base::neutron::n1k ( 34class tripleo::profile::base::neutron::n1k (
35 $n1kv_source = hiera('n1kv_vem_source', undef), 35 $n1kv_source = hiera('n1kv_vem_source', undef),
36 $n1kv_version = hiera('n1kv_vem_version', undef), 36 $n1kv_version = hiera('n1kv_vem_version', undef),
37 $step = hiera('step'), 37 $step = Integer(hiera('step')),
38) { 38) {
39 include ::neutron::plugins::ml2::cisco::nexus1000v 39 include ::neutron::plugins::ml2::cisco::nexus1000v
40 include ::tripleo::profile::base::neutron 40 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 @@
23# Defaults to hiera('step') 23# Defaults to hiera('step')
24# 24#
25class tripleo::profile::base::neutron::opencontrail::vrouter ( 25class tripleo::profile::base::neutron::opencontrail::vrouter (
26 $step = hiera('step'), 26 $step = Integer(hiera('step')),
27) { 27) {
28 28
29 if $step >= 4 { 29 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 @@
31# Defaults to hiera('bootstack_nodeid') 31# Defaults to hiera('bootstack_nodeid')
32# 32#
33class tripleo::profile::base::neutron::opendaylight ( 33class tripleo::profile::base::neutron::opendaylight (
34 $step = hiera('step'), 34 $step = Integer(hiera('step')),
35 $odl_api_ips = hiera('opendaylight_api_node_ips'), 35 $odl_api_ips = hiera('opendaylight_api_node_ips'),
36 $node_name = hiera('bootstack_nodeid') 36 $node_name = hiera('bootstack_nodeid')
37) { 37) {
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 @@
27# 27#
28class tripleo::profile::base::neutron::ovn_northd ( 28class tripleo::profile::base::neutron::ovn_northd (
29 $bootstrap_node = hiera('bootstrap_nodeid', undef), 29 $bootstrap_node = hiera('bootstrap_nodeid', undef),
30 $step = hiera('step'), 30 $step = Integer(hiera('step')),
31) { 31) {
32 if $step >= 4 { 32 if $step >= 4 {
33 # Note this only runs on the first node in the cluster when 33 # 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 @@
29# client mode. 29# client mode.
30 30
31class tripleo::profile::base::neutron::ovs( 31class tripleo::profile::base::neutron::ovs(
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33 $vhostuser_socket_dir = hiera('neutron::agents::ml2::ovs::vhostuser_socket_dir', undef) 33 $vhostuser_socket_dir = hiera('neutron::agents::ml2::ovs::vhostuser_socket_dir', undef)
34) { 34) {
35 include ::tripleo::profile::base::neutron 35 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 @@
34class tripleo::profile::base::neutron::plugins::ml2 ( 34class tripleo::profile::base::neutron::plugins::ml2 (
35 $bootstrap_node = hiera('bootstrap_nodeid', undef), 35 $bootstrap_node = hiera('bootstrap_nodeid', undef),
36 $mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'), 36 $mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
37 $step = hiera('step'), 37 $step = Integer(hiera('step')),
38) { 38) {
39 if $::hostname == downcase($bootstrap_node) { 39 if $::hostname == downcase($bootstrap_node) {
40 $sync_db = true 40 $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 @@
27# Defaults to hiera('step') 27# Defaults to hiera('step')
28# 28#
29class tripleo::profile::base::neutron::plugins::ml2::bagpipe ( 29class tripleo::profile::base::neutron::plugins::ml2::bagpipe (
30 $step = hiera('step'), 30 $step = Integer(hiera('step')),
31) { 31) {
32 include ::tripleo::profile::base::neutron 32 include ::tripleo::profile::base::neutron
33 33
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 (
49 $odl_password = hiera('opendaylight::password'), 49 $odl_password = hiera('opendaylight::password'),
50 $odl_url_ip = hiera('opendaylight_api_vip'), 50 $odl_url_ip = hiera('opendaylight_api_vip'),
51 $conn_proto = hiera('opendaylight::nb_connection_protocol'), 51 $conn_proto = hiera('opendaylight::nb_connection_protocol'),
52 $step = hiera('step'), 52 $step = Integer(hiera('step')),
53) { 53) {
54 54
55 if $step >= 4 { 55 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 (
37 $ovn_db_host = hiera('ovn_dbs_vip'), 37 $ovn_db_host = hiera('ovn_dbs_vip'),
38 $ovn_nb_port = hiera('ovn::northbound::port'), 38 $ovn_nb_port = hiera('ovn::northbound::port'),
39 $ovn_sb_port = hiera('ovn::southbound::port'), 39 $ovn_sb_port = hiera('ovn::southbound::port'),
40 $step = hiera('step') 40 $step = Integer(hiera('step'))
41) { 41) {
42 if $step >= 4 { 42 if $step >= 4 {
43 class { '::neutron::plugins::ml2::ovn': 43 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 @@
32# Defaults to 2379 32# Defaults to 2379
33# 33#
34class tripleo::profile::base::neutron::plugins::ml2::vpp ( 34class tripleo::profile::base::neutron::plugins::ml2::vpp (
35 $step = hiera('step'), 35 $step = Integer(hiera('step')),
36 $etcd_host = hiera('etcd_vip'), 36 $etcd_host = hiera('etcd_vip'),
37 $etcd_port = 2379, 37 $etcd_port = 2379,
38) { 38) {
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 @@
29# 29#
30class tripleo::profile::base::neutron::plugins::nsx_v3 ( 30class tripleo::profile::base::neutron::plugins::nsx_v3 (
31 $bootstrap_node = hiera('bootstrap_nodeid', undef), 31 $bootstrap_node = hiera('bootstrap_nodeid', undef),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 if $::hostname == downcase($bootstrap_node) { 34 if $::hostname == downcase($bootstrap_node) {
35 $sync_db = true 35 $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 @@
27# 27#
28class tripleo::profile::base::neutron::plugins::nuage ( 28class tripleo::profile::base::neutron::plugins::nuage (
29 $bootstrap_node = hiera('bootstrap_nodeid', undef), 29 $bootstrap_node = hiera('bootstrap_nodeid', undef),
30 $step = hiera('step'), 30 $step = Integer(hiera('step')),
31) { 31) {
32 if $::hostname == downcase($bootstrap_node) { 32 if $::hostname == downcase($bootstrap_node) {
33 $sync_db = true 33 $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 @@
27# 27#
28class tripleo::profile::base::neutron::plugins::opencontrail ( 28class tripleo::profile::base::neutron::plugins::opencontrail (
29 $bootstrap_node = hiera('bootstrap_nodeid', undef), 29 $bootstrap_node = hiera('bootstrap_nodeid', undef),
30 $step = hiera('step'), 30 $step = Integer(hiera('step')),
31) { 31) {
32 if $::hostname == downcase($bootstrap_node) { 32 if $::hostname == downcase($bootstrap_node) {
33 $sync_db = true 33 $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 (
49 $odl_api_ips = hiera('opendaylight_api_node_ips'), 49 $odl_api_ips = hiera('opendaylight_api_node_ips'),
50 $odl_url_ip = hiera('opendaylight_api_vip'), 50 $odl_url_ip = hiera('opendaylight_api_vip'),
51 $conn_proto = hiera('opendaylight::nb_connection_protocol'), 51 $conn_proto = hiera('opendaylight::nb_connection_protocol'),
52 $step = hiera('step'), 52 $step = Integer(hiera('step')),
53) { 53) {
54 54
55 if $step >= 4 { 55 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 @@
29# 29#
30class tripleo::profile::base::neutron::plugins::plumgrid ( 30class tripleo::profile::base::neutron::plugins::plumgrid (
31 $bootstrap_node = hiera('bootstrap_nodeid', undef), 31 $bootstrap_node = hiera('bootstrap_nodeid', undef),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 if $::hostname == downcase($bootstrap_node) { 34 if $::hostname == downcase($bootstrap_node) {
35 $sync_db = true 35 $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 @@
22# Defaults to hiera('step') 22# Defaults to hiera('step')
23# 23#
24class tripleo::profile::base::neutron::plumgrid ( 24class tripleo::profile::base::neutron::plumgrid (
25 $step = hiera('step'), 25 $step = Integer(hiera('step')),
26) { 26) {
27 27
28 if $step >= 4 { 28 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 (
90 $l3_ha_override = '', 90 $l3_ha_override = '',
91 $l3_nodes = hiera('neutron_l3_short_node_names', []), 91 $l3_nodes = hiera('neutron_l3_short_node_names', []),
92 $neutron_network = hiera('neutron_api_network', undef), 92 $neutron_network = hiera('neutron_api_network', undef),
93 $step = hiera('step'), 93 $step = Integer(hiera('step')),
94 $tls_proxy_bind_ip = undef, 94 $tls_proxy_bind_ip = undef,
95 $tls_proxy_fqdn = undef, 95 $tls_proxy_fqdn = undef,
96 $tls_proxy_port = 9696, 96 $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 @@
25# 25#
26 26
27class tripleo::profile::base::neutron::sriov( 27class tripleo::profile::base::neutron::sriov(
28 $step = hiera('step') 28 $step = Integer(hiera('step'))
29) { 29) {
30 30
31 include ::tripleo::profile::base::neutron 31 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 (
112 $oslomsg_notify_username = hiera('nova::rabbit_userid', 'guest'), 112 $oslomsg_notify_username = hiera('nova::rabbit_userid', 'guest'),
113 $oslomsg_use_ssl = hiera('nova::rabbit_use_ssl', '0'), 113 $oslomsg_use_ssl = hiera('nova::rabbit_use_ssl', '0'),
114 $nova_compute_enabled = false, 114 $nova_compute_enabled = false,
115 $step = hiera('step'), 115 $step = Integer(hiera('step')),
116 $migration_ssh_key = {}, 116 $migration_ssh_key = {},
117 $migration_ssh_localaddrs = [], 117 $migration_ssh_localaddrs = [],
118 $libvirt_tls = false 118 $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 (
57 $enable_internal_tls = hiera('enable_internal_tls', false), 57 $enable_internal_tls = hiera('enable_internal_tls', false),
58 $nova_api_network = hiera('nova_api_network', undef), 58 $nova_api_network = hiera('nova_api_network', undef),
59 $nova_api_wsgi_enabled = hiera('nova_wsgi_enabled', false), 59 $nova_api_wsgi_enabled = hiera('nova_wsgi_enabled', false),
60 $step = hiera('step'), 60 $step = Integer(hiera('step')),
61) { 61) {
62 if $::hostname == downcase($bootstrap_node) { 62 if $::hostname == downcase($bootstrap_node) {
63 $sync_db = true 63 $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 @@
35# Defaults to hiera('memcached_node_ips', ['127.0.0.1']) 35# Defaults to hiera('memcached_node_ips', ['127.0.0.1'])
36# 36#
37class tripleo::profile::base::nova::authtoken ( 37class tripleo::profile::base::nova::authtoken (
38 $step = hiera('step'), 38 $step = Integer(hiera('step')),
39 $use_ipv6 = hiera('nova::use_ipv6', false), 39 $use_ipv6 = hiera('nova::use_ipv6', false),
40 $memcache_nodes_ipv6 = hiera('memcached_node_ips_v6', ['::1']), 40 $memcache_nodes_ipv6 = hiera('memcached_node_ips_v6', ['::1']),
41 $memcache_nodes_ipv4 = hiera('memcached_node_ips', ['127.0.0.1']), 41 $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 @@
28# Defaults to hiera('cinder_enable_nfs_backend', false) 28# Defaults to hiera('cinder_enable_nfs_backend', false)
29# 29#
30class tripleo::profile::base::nova::compute ( 30class tripleo::profile::base::nova::compute (
31 $step = hiera('step'), 31 $step = Integer(hiera('step')),
32 $cinder_nfs_backend = hiera('cinder_enable_nfs_backend', false), 32 $cinder_nfs_backend = hiera('cinder_enable_nfs_backend', false),
33) { 33) {
34 34
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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::nova::compute::ironic ( 26class tripleo::profile::base::nova::compute::ironic (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 if $step >= 4 { 29 if $step >= 4 {
30 include ::tripleo::profile::base::nova::compute 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::nova::compute::libvirt ( 26class tripleo::profile::base::nova::compute::libvirt (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 if $step >= 4 { 29 if $step >= 4 {
30 include ::tripleo::profile::base::nova::compute 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::nova::conductor ( 26class tripleo::profile::base::nova::conductor (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::nova 29 include ::tripleo::profile::base::nova
30 if $step >= 4 { 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::nova::consoleauth ( 26class tripleo::profile::base::nova::consoleauth (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 if $step >= 4 { 29 if $step >= 4 {
30 include ::tripleo::profile::base::nova 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::nova::ec2api ( 26class tripleo::profile::base::nova::ec2api (
27 $step = hiera('step') 27 $step = Integer(hiera('step'))
28) { 28) {
29 if $step >= 4 { 29 if $step >= 4 {
30 include ::ec2api 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::nova::libvirt ( 26class tripleo::profile::base::nova::libvirt (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 if $step >= 4 { 29 if $step >= 4 {
30 include ::tripleo::profile::base::nova 30 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 (
51 $certificates_specs = hiera('apache_certificates_specs', {}), 51 $certificates_specs = hiera('apache_certificates_specs', {}),
52 $enable_internal_tls = hiera('enable_internal_tls', false), 52 $enable_internal_tls = hiera('enable_internal_tls', false),
53 $nova_placement_network = hiera('nova_placement_network', undef), 53 $nova_placement_network = hiera('nova_placement_network', undef),
54 $step = hiera('step'), 54 $step = Integer(hiera('step')),
55) { 55) {
56 if $::hostname == downcase($bootstrap_node) { 56 if $::hostname == downcase($bootstrap_node) {
57 $sync_db = true 57 $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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::nova::scheduler ( 26class tripleo::profile::base::nova::scheduler (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 if $step >= 4 { 29 if $step >= 4 {
30 include ::tripleo::profile::base::nova 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::nova::vncproxy ( 26class tripleo::profile::base::nova::vncproxy (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 if $step >= 4 { 29 if $step >= 4 {
30 include ::tripleo::profile::base::nova 30 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 (
63 $oslomsg_rpc_port = '5672', 63 $oslomsg_rpc_port = '5672',
64 $oslomsg_rpc_username = 'guest', 64 $oslomsg_rpc_username = 'guest',
65 $oslomsg_use_ssl = '0', 65 $oslomsg_use_ssl = '0',
66 $step = hiera('step'), 66 $step = Integer(hiera('step')),
67) { 67) {
68 if $step >= 3 { 68 if $step >= 3 {
69 $oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl))) 69 $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 @@
47# Defaults to hiera('octavia::rabbit_use_ssl', '0') 47# Defaults to hiera('octavia::rabbit_use_ssl', '0')
48 48
49class tripleo::profile::base::octavia ( 49class tripleo::profile::base::octavia (
50 $step = hiera('step'), 50 $step = Integer(hiera('step')),
51 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), 51 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
52 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), 52 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
53 $oslomsg_rpc_password = hiera('octavia::rabbit_password'), 53 $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 @@
29# 29#
30class tripleo::profile::base::octavia::api ( 30class tripleo::profile::base::octavia::api (
31 $bootstrap_node = hiera('bootstrap_nodeid', undef), 31 $bootstrap_node = hiera('bootstrap_nodeid', undef),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 if $::hostname == downcase($bootstrap_node) { 34 if $::hostname == downcase($bootstrap_node) {
35 $sync_db = true 35 $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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::octavia::health_manager ( 26class tripleo::profile::base::octavia::health_manager (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::octavia 29 include ::tripleo::profile::base::octavia
30 if $step >= 5 { 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::octavia::housekeeping ( 26class tripleo::profile::base::octavia::housekeeping (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::octavia 29 include ::tripleo::profile::base::octavia
30 30
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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::octavia::worker ( 26class tripleo::profile::base::octavia::worker (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::octavia 29 include ::tripleo::profile::base::octavia
30 30
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 @@
64# Defaults to hiera('pacemaker_cluster_recheck_interval', undef) 64# Defaults to hiera('pacemaker_cluster_recheck_interval', undef)
65# 65#
66class tripleo::profile::base::pacemaker ( 66class tripleo::profile::base::pacemaker (
67 $step = hiera('step'), 67 $step = Integer(hiera('step')),
68 $pcs_tries = hiera('pcs_tries', 20), 68 $pcs_tries = hiera('pcs_tries', 20),
69 $remote_short_node_names = hiera('pacemaker_remote_short_node_names', []), 69 $remote_short_node_names = hiera('pacemaker_remote_short_node_names', []),
70 $remote_node_ips = hiera('pacemaker_remote_node_ips', []), 70 $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 (
39 $remote_authkey, 39 $remote_authkey,
40 $pcs_tries = hiera('pcs_tries', 20), 40 $pcs_tries = hiera('pcs_tries', 20),
41 $enable_fencing = hiera('enable_fencing', false), 41 $enable_fencing = hiera('enable_fencing', false),
42 $step = hiera('step'), 42 $step = Integer(hiera('step')),
43) { 43) {
44 class { '::pacemaker::remote': 44 class { '::pacemaker::remote':
45 remote_authkey => $remote_authkey, 45 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 @@
25# 25#
26 26
27class tripleo::profile::base::panko ( 27class tripleo::profile::base::panko (
28 $step = hiera('step'), 28 $step = Integer(hiera('step')),
29) { 29) {
30 if $step >= 3 { 30 if $step >= 3 {
31 include ::panko 31 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 (
53 $certificates_specs = hiera('apache_certificates_specs', {}), 53 $certificates_specs = hiera('apache_certificates_specs', {}),
54 $enable_internal_tls = hiera('enable_internal_tls', false), 54 $enable_internal_tls = hiera('enable_internal_tls', false),
55 $panko_network = hiera('panko_api_network', undef), 55 $panko_network = hiera('panko_api_network', undef),
56 $step = hiera('step'), 56 $step = Integer(hiera('step')),
57) { 57) {
58 if $::hostname == downcase($bootstrap_node) { 58 if $::hostname == downcase($bootstrap_node) {
59 $sync_db = true 59 $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 (
40 $qdr_username = undef, 40 $qdr_username = undef,
41 $qdr_password = undef, 41 $qdr_password = undef,
42 $qdr_listener_port = hiera('tripleo::profile::base::qdr::qdr_listener_port', 5672), 42 $qdr_listener_port = hiera('tripleo::profile::base::qdr::qdr_listener_port', 5672),
43 $step = hiera('step'), 43 $step = Integer(hiera('step')),
44) { 44) {
45 if $step >= 1 { 45 if $step >= 1 {
46 class { '::qdr': 46 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 (
88 $rabbitmq_pass = hiera('rabbitmq::default_pass'), 88 $rabbitmq_pass = hiera('rabbitmq::default_pass'),
89 $rabbitmq_user = hiera('rabbitmq::default_user'), 89 $rabbitmq_user = hiera('rabbitmq::default_user'),
90 $stack_action = hiera('stack_action'), 90 $stack_action = hiera('stack_action'),
91 $step = hiera('step'), 91 $step = Integer(hiera('step')),
92) { 92) {
93 if $enable_internal_tls { 93 if $enable_internal_tls {
94 $tls_certfile = $certificate_specs['service_certificate'] 94 $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 @@
72 72
73class tripleo::profile::base::sahara ( 73class tripleo::profile::base::sahara (
74 $bootstrap_node = hiera('bootstrap_nodeid', undef), 74 $bootstrap_node = hiera('bootstrap_nodeid', undef),
75 $step = hiera('step'), 75 $step = Integer(hiera('step')),
76 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'), 76 $oslomsg_rpc_proto = hiera('messaging_rpc_service_name', 'rabbit'),
77 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)), 77 $oslomsg_rpc_hosts = any2array(hiera('rabbitmq_node_names', undef)),
78 $oslomsg_rpc_password = hiera('sahara::rabbit_password'), 78 $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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::sahara::api ( 26class tripleo::profile::base::sahara::api (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 include ::tripleo::profile::base::sahara 29 include ::tripleo::profile::base::sahara
30 30
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 @@
29# 29#
30class tripleo::profile::base::sahara::engine ( 30class tripleo::profile::base::sahara::engine (
31 $bootstrap_node = hiera('bootstrap_nodeid', undef), 31 $bootstrap_node = hiera('bootstrap_nodeid', undef),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 if $::hostname == downcase($bootstrap_node) { 34 if $::hostname == downcase($bootstrap_node) {
35 $sync_db = true 35 $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 @@
29# Defaults to hiera('securetty::tty_list') 29# Defaults to hiera('securetty::tty_list')
30# 30#
31class tripleo::profile::base::securetty ( 31class tripleo::profile::base::securetty (
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33 $tty_list = hiera('tty_list', []), 33 $tty_list = hiera('tty_list', []),
34) { 34) {
35 validate_array($tty_list) 35 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 @@
34class tripleo::profile::base::snmp ( 34class tripleo::profile::base::snmp (
35 $snmpd_password = hiera('snmpd_readonly_user_password'), 35 $snmpd_password = hiera('snmpd_readonly_user_password'),
36 $snmpd_user = hiera('snmpd_readonly_user_name'), 36 $snmpd_user = hiera('snmpd_readonly_user_name'),
37 $step = hiera('step'), 37 $step = Integer(hiera('step')),
38) { 38) {
39 if $step >= 4 { 39 if $step >= 4 {
40 snmp::snmpv3_user { $snmpd_user: 40 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 (
107 $enable_internal_tls = hiera('enable_internal_tls', false), 107 $enable_internal_tls = hiera('enable_internal_tls', false),
108 $memcache_port = 11211, 108 $memcache_port = 11211,
109 $memcache_servers = hiera('memcached_node_ips'), 109 $memcache_servers = hiera('memcached_node_ips'),
110 $step = hiera('step'), 110 $step = Integer(hiera('step')),
111 $swift_proxy_network = hiera('swift_proxy_network', undef), 111 $swift_proxy_network = hiera('swift_proxy_network', undef),
112 $tls_proxy_bind_ip = undef, 112 $tls_proxy_bind_ip = undef,
113 $tls_proxy_fqdn = undef, 113 $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 (
77 $replicas, 77 $replicas,
78 $build_ring = true, 78 $build_ring = true,
79 $devices = undef, 79 $devices = undef,
80 $step = hiera('step'), 80 $step = Integer(hiera('step')),
81 $swift_zones = '1', 81 $swift_zones = '1',
82 $raw_disk_prefix = 'r1z1-', 82 $raw_disk_prefix = 'r1z1-',
83 $raw_disks = [], 83 $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 @@
30class tripleo::profile::base::swift::storage ( 30class tripleo::profile::base::swift::storage (
31 # Deprecated conditional to support ControllerEnableSwiftStorage parameter 31 # Deprecated conditional to support ControllerEnableSwiftStorage parameter
32 $enable_swift_storage = true, 32 $enable_swift_storage = true,
33 $step = hiera('step'), 33 $step = Integer(hiera('step')),
34) { 34) {
35 if $step >= 4 { 35 if $step >= 4 {
36 if $enable_swift_storage { 36 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 (
58 $oslomsg_rpc_port = hiera('tacker::rabbit_port', '5672'), 58 $oslomsg_rpc_port = hiera('tacker::rabbit_port', '5672'),
59 $oslomsg_rpc_username = hiera('tacker::rabbit_userid', 'guest'), 59 $oslomsg_rpc_username = hiera('tacker::rabbit_userid', 'guest'),
60 $oslomsg_use_ssl = hiera('tacker::rabbit_use_ssl', '0'), 60 $oslomsg_use_ssl = hiera('tacker::rabbit_use_ssl', '0'),
61 $step = hiera('step'), 61 $step = Integer(hiera('step')),
62) { 62) {
63 if $::hostname == downcase($bootstrap_node) { 63 if $::hostname == downcase($bootstrap_node) {
64 $sync_db = true 64 $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 @@
29# 29#
30class tripleo::profile::base::trove::api ( 30class tripleo::profile::base::trove::api (
31 $bootstrap_node = hiera('bootstrap_nodeid', undef), 31 $bootstrap_node = hiera('bootstrap_nodeid', undef),
32 $step = hiera('step'), 32 $step = Integer(hiera('step')),
33) { 33) {
34 if $::hostname == downcase($bootstrap_node) { 34 if $::hostname == downcase($bootstrap_node) {
35 $sync_db = true 35 $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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::trove::conductor ( 26class tripleo::profile::base::trove::conductor (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 29
30 if $step >= 4 { 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::trove::taskmanager ( 26class tripleo::profile::base::trove::taskmanager (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 29
30 if $step >= 4 { 30 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 @@
24# Defaults to hiera('step') 24# Defaults to hiera('step')
25# 25#
26class tripleo::profile::base::vpp ( 26class tripleo::profile::base::vpp (
27 $step = hiera('step'), 27 $step = Integer(hiera('step')),
28) { 28) {
29 if $step >= 1 { 29 if $step >= 1 {
30 include ::fdio 30 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 @@
28# Defaults to hiera('step') 28# Defaults to hiera('step')
29# 29#
30class tripleo::profile::base::zaqar ( 30class tripleo::profile::base::zaqar (
31 $step = hiera('step'), 31 $step = Integer(hiera('step')),
32) { 32) {
33 if $step >= 4 { 33 if $step >= 4 {
34 include ::zaqar 34 include ::zaqar
diff --git a/manifests/profile/pacemaker/ceph/rbdmirror.pp b/manifests/profile/pacemaker/ceph/rbdmirror.pp
index 4066225..6b566a7 100644
--- a/manifests/profile/pacemaker/ceph/rbdmirror.pp
+++ b/manifests/profile/pacemaker/ceph/rbdmirror.pp
@@ -45,7 +45,7 @@ class tripleo::profile::pacemaker::ceph::rbdmirror (
45 $client_name = 'openstack', 45 $client_name = 'openstack',
46 $pcs_tries = hiera('pcs_tries', 20), 46 $pcs_tries = hiera('pcs_tries', 20),
47 $stack_action = hiera('stack_action'), 47 $stack_action = hiera('stack_action'),
48 $step = hiera('step'), 48 $step = Integer(hiera('step')),
49) { 49) {
50 Service <| tag == 'ceph-rbd-mirror' |> { 50 Service <| tag == 'ceph-rbd-mirror' |> {
51 hasrestart => true, 51 hasrestart => true,
diff --git a/manifests/profile/pacemaker/cinder/backup.pp b/manifests/profile/pacemaker/cinder/backup.pp
index ff0d8c9..933a735 100644
--- a/manifests/profile/pacemaker/cinder/backup.pp
+++ b/manifests/profile/pacemaker/cinder/backup.pp
@@ -33,7 +33,7 @@
33# 33#
34class tripleo::profile::pacemaker::cinder::backup ( 34class tripleo::profile::pacemaker::cinder::backup (
35 $bootstrap_node = hiera('cinder_backup_short_bootstrap_node_name'), 35 $bootstrap_node = hiera('cinder_backup_short_bootstrap_node_name'),
36 $step = hiera('step'), 36 $step = Integer(hiera('step')),
37 $pcs_tries = hiera('pcs_tries', 20), 37 $pcs_tries = hiera('pcs_tries', 20),
38) { 38) {
39 39
diff --git a/manifests/profile/pacemaker/cinder/backup_bundle.pp b/manifests/profile/pacemaker/cinder/backup_bundle.pp
index cd06986..a5e1a9b 100644
--- a/manifests/profile/pacemaker/cinder/backup_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/backup_bundle.pp
@@ -40,7 +40,7 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
40 $bootstrap_node = hiera('cinder_backup_short_bootstrap_node_name'), 40 $bootstrap_node = hiera('cinder_backup_short_bootstrap_node_name'),
41 $cinder_backup_docker_image = hiera('tripleo::profile::pacemaker::cinder::backup_bundle::cinder_backup_docker_image', undef), 41 $cinder_backup_docker_image = hiera('tripleo::profile::pacemaker::cinder::backup_bundle::cinder_backup_docker_image', undef),
42 $pcs_tries = hiera('pcs_tries', 20), 42 $pcs_tries = hiera('pcs_tries', 20),
43 $step = hiera('step'), 43 $step = Integer(hiera('step')),
44) { 44) {
45 if $::hostname == downcase($bootstrap_node) { 45 if $::hostname == downcase($bootstrap_node) {
46 $pacemaker_master = true 46 $pacemaker_master = true
diff --git a/manifests/profile/pacemaker/cinder/volume.pp b/manifests/profile/pacemaker/cinder/volume.pp
index 0d6a598..e993426 100644
--- a/manifests/profile/pacemaker/cinder/volume.pp
+++ b/manifests/profile/pacemaker/cinder/volume.pp
@@ -33,7 +33,7 @@
33# 33#
34class tripleo::profile::pacemaker::cinder::volume ( 34class tripleo::profile::pacemaker::cinder::volume (
35 $bootstrap_node = hiera('cinder_volume_short_bootstrap_node_name'), 35 $bootstrap_node = hiera('cinder_volume_short_bootstrap_node_name'),
36 $step = hiera('step'), 36 $step = Integer(hiera('step')),
37 $pcs_tries = hiera('pcs_tries', 20), 37 $pcs_tries = hiera('pcs_tries', 20),
38) { 38) {
39 Service <| tag == 'cinder::volume' |> { 39 Service <| tag == 'cinder::volume' |> {
diff --git a/manifests/profile/pacemaker/cinder/volume_bundle.pp b/manifests/profile/pacemaker/cinder/volume_bundle.pp
index f0858c9..39199a5 100644
--- a/manifests/profile/pacemaker/cinder/volume_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/volume_bundle.pp
@@ -40,7 +40,7 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
40 $bootstrap_node = hiera('cinder_volume_short_bootstrap_node_name'), 40 $bootstrap_node = hiera('cinder_volume_short_bootstrap_node_name'),
41 $cinder_volume_docker_image = hiera('tripleo::profile::pacemaker::cinder::volume_bundle::cinder_volume_docker_image', undef), 41 $cinder_volume_docker_image = hiera('tripleo::profile::pacemaker::cinder::volume_bundle::cinder_volume_docker_image', undef),
42 $pcs_tries = hiera('pcs_tries', 20), 42 $pcs_tries = hiera('pcs_tries', 20),
43 $step = hiera('step'), 43 $step = Integer(hiera('step')),
44) { 44) {
45 if $::hostname == downcase($bootstrap_node) { 45 if $::hostname == downcase($bootstrap_node) {
46 $pacemaker_master = true 46 $pacemaker_master = true
diff --git a/manifests/profile/pacemaker/clustercheck.pp b/manifests/profile/pacemaker/clustercheck.pp
index fad30da..958f4a2 100644
--- a/manifests/profile/pacemaker/clustercheck.pp
+++ b/manifests/profile/pacemaker/clustercheck.pp
@@ -32,7 +32,7 @@
32# 32#
33# 33#
34class tripleo::profile::pacemaker::clustercheck ( 34class tripleo::profile::pacemaker::clustercheck (
35 $step = hiera('step'), 35 $step = Integer(hiera('step')),
36 $clustercheck_password = hiera('mysql::server::root_password'), 36 $clustercheck_password = hiera('mysql::server::root_password'),
37 $bind_address = hiera('mysql_bind_host'), 37 $bind_address = hiera('mysql_bind_host'),
38) { 38) {
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index d42d557..3aff62f 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -44,7 +44,7 @@ class tripleo::profile::pacemaker::database::mysql (
44 $bootstrap_node = hiera('mysql_short_bootstrap_node_name'), 44 $bootstrap_node = hiera('mysql_short_bootstrap_node_name'),
45 $bind_address = $::hostname, 45 $bind_address = $::hostname,
46 $gmcast_listen_addr = hiera('mysql_bind_host'), 46 $gmcast_listen_addr = hiera('mysql_bind_host'),
47 $step = hiera('step'), 47 $step = Integer(hiera('step')),
48 $pcs_tries = hiera('pcs_tries', 20), 48 $pcs_tries = hiera('pcs_tries', 20),
49) { 49) {
50 if $::hostname == downcase($bootstrap_node) { 50 if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/pacemaker/database/mysql_bundle.pp b/manifests/profile/pacemaker/database/mysql_bundle.pp
index a127a5c..56e9e28 100644
--- a/manifests/profile/pacemaker/database/mysql_bundle.pp
+++ b/manifests/profile/pacemaker/database/mysql_bundle.pp
@@ -56,7 +56,7 @@ class tripleo::profile::pacemaker::database::mysql_bundle (
56 $bind_address = $::hostname, 56 $bind_address = $::hostname,
57 $gmcast_listen_addr = hiera('mysql_bind_host'), 57 $gmcast_listen_addr = hiera('mysql_bind_host'),
58 $pcs_tries = hiera('pcs_tries', 20), 58 $pcs_tries = hiera('pcs_tries', 20),
59 $step = hiera('step'), 59 $step = Integer(hiera('step')),
60) { 60) {
61 if $::hostname == downcase($bootstrap_node) { 61 if $::hostname == downcase($bootstrap_node) {
62 $pacemaker_master = true 62 $pacemaker_master = true
diff --git a/manifests/profile/pacemaker/database/redis.pp b/manifests/profile/pacemaker/database/redis.pp
index 4f5a861..bc91be7 100644
--- a/manifests/profile/pacemaker/database/redis.pp
+++ b/manifests/profile/pacemaker/database/redis.pp
@@ -46,7 +46,7 @@
46class tripleo::profile::pacemaker::database::redis ( 46class tripleo::profile::pacemaker::database::redis (
47 $bootstrap_node = hiera('redis_short_bootstrap_node_name'), 47 $bootstrap_node = hiera('redis_short_bootstrap_node_name'),
48 $enable_load_balancer = hiera('enable_load_balancer', true), 48 $enable_load_balancer = hiera('enable_load_balancer', true),
49 $step = hiera('step'), 49 $step = Integer(hiera('step')),
50 $redis_file_limit = undef, 50 $redis_file_limit = undef,
51 $pcs_tries = hiera('pcs_tries', 20), 51 $pcs_tries = hiera('pcs_tries', 20),
52) { 52) {
diff --git a/manifests/profile/pacemaker/database/redis_bundle.pp b/manifests/profile/pacemaker/database/redis_bundle.pp
index 8e30c2f..dd090d7 100644
--- a/manifests/profile/pacemaker/database/redis_bundle.pp
+++ b/manifests/profile/pacemaker/database/redis_bundle.pp
@@ -45,7 +45,7 @@ class tripleo::profile::pacemaker::database::redis_bundle (
45 $redis_docker_image = hiera('tripleo::profile::pacemaker::database::redis_bundle::redis_docker_image', undef), 45 $redis_docker_image = hiera('tripleo::profile::pacemaker::database::redis_bundle::redis_docker_image', undef),
46 $redis_docker_control_port = hiera('tripleo::profile::pacemaker::database::redis_bundle::control_port', '3124'), 46 $redis_docker_control_port = hiera('tripleo::profile::pacemaker::database::redis_bundle::control_port', '3124'),
47 $pcs_tries = hiera('pcs_tries', 20), 47 $pcs_tries = hiera('pcs_tries', 20),
48 $step = hiera('step'), 48 $step = Integer(hiera('step')),
49) { 49) {
50 if $::hostname == downcase($bootstrap_node) { 50 if $::hostname == downcase($bootstrap_node) {
51 $pacemaker_master = true 51 $pacemaker_master = true
diff --git a/manifests/profile/pacemaker/haproxy.pp b/manifests/profile/pacemaker/haproxy.pp
index f006f78..7331071 100644
--- a/manifests/profile/pacemaker/haproxy.pp
+++ b/manifests/profile/pacemaker/haproxy.pp
@@ -38,7 +38,7 @@
38class tripleo::profile::pacemaker::haproxy ( 38class tripleo::profile::pacemaker::haproxy (
39 $bootstrap_node = hiera('haproxy_short_bootstrap_node_name'), 39 $bootstrap_node = hiera('haproxy_short_bootstrap_node_name'),
40 $enable_load_balancer = hiera('enable_load_balancer', true), 40 $enable_load_balancer = hiera('enable_load_balancer', true),
41 $step = hiera('step'), 41 $step = Integer(hiera('step')),
42 $pcs_tries = hiera('pcs_tries', 20), 42 $pcs_tries = hiera('pcs_tries', 20),
43) { 43) {
44 include ::tripleo::profile::base::haproxy 44 include ::tripleo::profile::base::haproxy
diff --git a/manifests/profile/pacemaker/haproxy_bundle.pp b/manifests/profile/pacemaker/haproxy_bundle.pp
index 292c9dd..9c1bdf3 100644
--- a/manifests/profile/pacemaker/haproxy_bundle.pp
+++ b/manifests/profile/pacemaker/haproxy_bundle.pp
@@ -43,7 +43,7 @@ class tripleo::profile::pacemaker::haproxy_bundle (
43 $haproxy_docker_image = hiera('tripleo::profile::pacemaker::haproxy::haproxy_docker_image', undef), 43 $haproxy_docker_image = hiera('tripleo::profile::pacemaker::haproxy::haproxy_docker_image', undef),
44 $bootstrap_node = hiera('haproxy_short_bootstrap_node_name'), 44 $bootstrap_node = hiera('haproxy_short_bootstrap_node_name'),
45 $enable_load_balancer = hiera('enable_load_balancer', true), 45 $enable_load_balancer = hiera('enable_load_balancer', true),
46 $step = hiera('step'), 46 $step = Integer(hiera('step')),
47 $pcs_tries = hiera('pcs_tries', 20), 47 $pcs_tries = hiera('pcs_tries', 20),
48) { 48) {
49 include ::tripleo::profile::base::haproxy 49 include ::tripleo::profile::base::haproxy
diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp
index 7bcf8d6..c22a033 100644
--- a/manifests/profile/pacemaker/manila.pp
+++ b/manifests/profile/pacemaker/manila.pp
@@ -55,7 +55,7 @@ class tripleo::profile::pacemaker::manila (
55 $backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false), 55 $backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false),
56 $ceph_mds_enabled = hiera('ceph_mds_enabled', false), 56 $ceph_mds_enabled = hiera('ceph_mds_enabled', false),
57 $bootstrap_node = hiera('manila_share_short_bootstrap_node_name'), 57 $bootstrap_node = hiera('manila_share_short_bootstrap_node_name'),
58 $step = hiera('step'), 58 $step = Integer(hiera('step')),
59 $pcs_tries = hiera('pcs_tries', 20), 59 $pcs_tries = hiera('pcs_tries', 20),
60) { 60) {
61 if $::hostname == downcase($bootstrap_node) { 61 if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/pacemaker/neutron/lbaas.pp b/manifests/profile/pacemaker/neutron/lbaas.pp
index 96712d4..9e86dfe 100644
--- a/manifests/profile/pacemaker/neutron/lbaas.pp
+++ b/manifests/profile/pacemaker/neutron/lbaas.pp
@@ -28,7 +28,7 @@
28# Defaults to hiera('bootstrap_nodeid') 28# Defaults to hiera('bootstrap_nodeid')
29# 29#
30class tripleo::profile::pacemaker::neutron::lbaas ( 30class tripleo::profile::pacemaker::neutron::lbaas (
31 $step = hiera('step'), 31 $step = Integer(hiera('step')),
32 $pacemaker_master = hiera('bootstrap_nodeid'), 32 $pacemaker_master = hiera('bootstrap_nodeid'),
33) { 33) {
34 34
diff --git a/manifests/profile/pacemaker/ovn_northd.pp b/manifests/profile/pacemaker/ovn_northd.pp
index 57bbc35..212c345 100644
--- a/manifests/profile/pacemaker/ovn_northd.pp
+++ b/manifests/profile/pacemaker/ovn_northd.pp
@@ -47,7 +47,7 @@
47 47
48class tripleo::profile::pacemaker::ovn_northd ( 48class tripleo::profile::pacemaker::ovn_northd (
49 $pacemaker_master = hiera('ovn_dbs_short_bootstrap_node_name'), 49 $pacemaker_master = hiera('ovn_dbs_short_bootstrap_node_name'),
50 $step = hiera('step'), 50 $step = Integer(hiera('step')),
51 $pcs_tries = hiera('pcs_tries', 20), 51 $pcs_tries = hiera('pcs_tries', 20),
52 $ovn_dbs_vip = hiera('ovn_dbs_vip'), 52 $ovn_dbs_vip = hiera('ovn_dbs_vip'),
53 $nb_db_port = 6641, 53 $nb_db_port = 6641,
diff --git a/manifests/profile/pacemaker/rabbitmq.pp b/manifests/profile/pacemaker/rabbitmq.pp
index bf6a38d..3d87598 100644
--- a/manifests/profile/pacemaker/rabbitmq.pp
+++ b/manifests/profile/pacemaker/rabbitmq.pp
@@ -51,7 +51,7 @@ class tripleo::profile::pacemaker::rabbitmq (
51 $user_ha_queues = hiera('rabbitmq::nr_ha_queues', 0), 51 $user_ha_queues = hiera('rabbitmq::nr_ha_queues', 0),
52 $rabbit_nodes = hiera('rabbitmq_node_names'), 52 $rabbit_nodes = hiera('rabbitmq_node_names'),
53 $pcs_tries = hiera('pcs_tries', 20), 53 $pcs_tries = hiera('pcs_tries', 20),
54 $step = hiera('step'), 54 $step = Integer(hiera('step')),
55) { 55) {
56 if $::hostname == downcase($bootstrap_node) { 56 if $::hostname == downcase($bootstrap_node) {
57 $pacemaker_master = true 57 $pacemaker_master = true
diff --git a/manifests/profile/pacemaker/rabbitmq_bundle.pp b/manifests/profile/pacemaker/rabbitmq_bundle.pp
index f6c5044..0a6295c 100644
--- a/manifests/profile/pacemaker/rabbitmq_bundle.pp
+++ b/manifests/profile/pacemaker/rabbitmq_bundle.pp
@@ -61,7 +61,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
61 $user_ha_queues = hiera('rabbitmq::nr_ha_queues', 0), 61 $user_ha_queues = hiera('rabbitmq::nr_ha_queues', 0),
62 $rabbit_nodes = hiera('rabbitmq_node_names'), 62 $rabbit_nodes = hiera('rabbitmq_node_names'),
63 $pcs_tries = hiera('pcs_tries', 20), 63 $pcs_tries = hiera('pcs_tries', 20),
64 $step = hiera('step'), 64 $step = Integer(hiera('step')),
65) { 65) {
66 if $::hostname == downcase($bootstrap_node) { 66 if $::hostname == downcase($bootstrap_node) {
67 $pacemaker_master = true 67 $pacemaker_master = true