diff --git a/manifests/network/contrail/analytics.pp b/manifests/network/contrail/analytics.pp
index e34c7e683..296fa19df 100644
--- a/manifests/network/contrail/analytics.pp
+++ b/manifests/network/contrail/analytics.pp
@@ -189,7 +189,7 @@
 #  Defaults to hiera('contrail::zk_server_ip')
 #
 class tripleo::network::contrail::analytics(
-  $step                       = hiera('step'),
+  $step                       = Integer(hiera('step')),
   $admin_password             = hiera('contrail::admin_password'),
   $admin_tenant_name          = hiera('contrail::admin_tenant_name'),
   $admin_token                = hiera('contrail::admin_token'),
diff --git a/manifests/network/contrail/analyticsdatabase.pp b/manifests/network/contrail/analyticsdatabase.pp
index 88b032791..cf3016a71 100644
--- a/manifests/network/contrail/analyticsdatabase.pp
+++ b/manifests/network/contrail/analyticsdatabase.pp
@@ -120,7 +120,7 @@
 #  Defaults to hiera('contrail_database_node_ips')
 #
 class tripleo::network::contrail::analyticsdatabase(
-  $step                 = hiera('step'),
+  $step                 = Integer(hiera('step')),
   $auth_host            = hiera('contrail::auth_host'),
   $api_server           = hiera('contrail_config_vip'),
   $api_port             = hiera('contrail::api_port'),
diff --git a/manifests/network/contrail/config.pp b/manifests/network/contrail/config.pp
index d02ab4416..3fc4fd88d 100644
--- a/manifests/network/contrail/config.pp
+++ b/manifests/network/contrail/config.pp
@@ -216,7 +216,7 @@
 #  Defaults to hiera('contrail_database_node_ips')
 #
 class tripleo::network::contrail::config(
-  $step  = hiera('step'),
+  $step  = Integer(hiera('step')),
   $aaa_mode               = hiera('contrail::aaa_mode'),
   $admin_password         = hiera('contrail::admin_password'),
   $admin_tenant_name      = hiera('contrail::admin_tenant_name'),
diff --git a/manifests/network/contrail/control.pp b/manifests/network/contrail/control.pp
index e9c7a9e1c..530d6078d 100644
--- a/manifests/network/contrail/control.pp
+++ b/manifests/network/contrail/control.pp
@@ -117,7 +117,7 @@
 #  Defaults to hiera('step')
 #
 class tripleo::network::contrail::control(
-  $step              = hiera('step'),
+  $step              = Integer(hiera('step')),
   $admin_password    = hiera('contrail::admin_password'),
   $admin_tenant_name = hiera('contrail::admin_tenant_name'),
   $admin_user        = hiera('contrail::admin_user'),
diff --git a/manifests/network/contrail/database.pp b/manifests/network/contrail/database.pp
index f74eb1c81..3d6b40b69 100644
--- a/manifests/network/contrail/database.pp
+++ b/manifests/network/contrail/database.pp
@@ -117,7 +117,7 @@ class tripleo::network::contrail::database(
   $host_ip              = hiera('contrail::database::host_ip'),
   $host_name            = $::hostname,
   $public_vip           = hiera('public_virtual_ip'),
-  $step                 = hiera('step'),
+  $step                 = Integer(hiera('step')),
   $zookeeper_client_ip  = hiera('contrail::database::host_ip'),
   $zookeeper_hostnames  = hiera('contrail_database_short_node_names'),
   $zookeeper_server_ips = hiera('contrail_database_node_ips'),
diff --git a/manifests/network/contrail/heat.pp b/manifests/network/contrail/heat.pp
index 637fddac6..4ef2a3145 100644
--- a/manifests/network/contrail/heat.pp
+++ b/manifests/network/contrail/heat.pp
@@ -60,7 +60,7 @@ class tripleo::network::contrail::heat(
   $api_port       = 8082,
   $api_server     = hiera('contrail_config_vip'),
   $auth_host      = hiera('contrail::auth_host'),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
   $use_ssl        = 'False',
 )
 {
diff --git a/manifests/network/contrail/provision.pp b/manifests/network/contrail/provision.pp
index 30257371e..742c4a2d6 100644
--- a/manifests/network/contrail/provision.pp
+++ b/manifests/network/contrail/provision.pp
@@ -71,7 +71,7 @@ class tripleo::network::contrail::provision(
   $auth_host         = hiera('contrail::auth_host'),
   $auth_port         = hiera('contrail::auth_port'),
   $auth_protocol     = hiera('contrail::auth_protocol'),
-  $step              = hiera('step'),
+  $step              = Integer(hiera('step')),
 )
 {
   if $step >= 5 {
diff --git a/manifests/network/contrail/vrouter.pp b/manifests/network/contrail/vrouter.pp
index 2bccd1d18..678a77d21 100644
--- a/manifests/network/contrail/vrouter.pp
+++ b/manifests/network/contrail/vrouter.pp
@@ -143,7 +143,7 @@
 #  Defaults to hiera('contrail::vrouter::is_tsn',false)
 #
 class tripleo::network::contrail::vrouter (
-  $step               = hiera('step'),
+  $step               = Integer(hiera('step')),
   $admin_password     = hiera('contrail::admin_password'),
   $admin_tenant_name  = hiera('contrail::admin_tenant_name'),
   $admin_token        = hiera('contrail::admin_token'),
diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp
index da8aaa6e9..bc219fac4 100644
--- a/manifests/profile/base/aodh.pp
+++ b/manifests/profile/base/aodh.pp
@@ -72,7 +72,7 @@
 #   Defaults to hiera('aodh::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::aodh (
-  $step                    = hiera('step'),
+  $step                    = Integer(hiera('step')),
   $bootstrap_node          = hiera('bootstrap_nodeid', undef),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp
index 5c539fc12..300c0ca91 100644
--- a/manifests/profile/base/aodh/api.pp
+++ b/manifests/profile/base/aodh/api.pp
@@ -49,7 +49,7 @@ class tripleo::profile::base::aodh::api (
   $aodh_network                  = hiera('aodh_api_network', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
 
   include ::tripleo::profile::base::aodh
diff --git a/manifests/profile/base/aodh/evaluator.pp b/manifests/profile/base/aodh/evaluator.pp
index d9b48b3ce..1b25b3760 100644
--- a/manifests/profile/base/aodh/evaluator.pp
+++ b/manifests/profile/base/aodh/evaluator.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::aodh::evaluator (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
 
   include ::tripleo::profile::base::aodh
diff --git a/manifests/profile/base/aodh/listener.pp b/manifests/profile/base/aodh/listener.pp
index d36e1bb44..d225e71de 100644
--- a/manifests/profile/base/aodh/listener.pp
+++ b/manifests/profile/base/aodh/listener.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::aodh::listener (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
 
   include ::tripleo::profile::base::aodh
diff --git a/manifests/profile/base/aodh/notifier.pp b/manifests/profile/base/aodh/notifier.pp
index d2a394552..bb79ed248 100644
--- a/manifests/profile/base/aodh/notifier.pp
+++ b/manifests/profile/base/aodh/notifier.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::aodh::notifier (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
 
   include ::tripleo::profile::base::aodh
diff --git a/manifests/profile/base/auditd.pp b/manifests/profile/base/auditd.pp
index 628db088e..46eb5643c 100644
--- a/manifests/profile/base/auditd.pp
+++ b/manifests/profile/base/auditd.pp
@@ -22,7 +22,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::auditd (
-  $step  = hiera('step'),
+  $step  = Integer(hiera('step')),
 ) {
   if $step >= 4 {
       include ::auditd
diff --git a/manifests/profile/base/barbican.pp b/manifests/profile/base/barbican.pp
index f4d623030..7113fd072 100644
--- a/manifests/profile/base/barbican.pp
+++ b/manifests/profile/base/barbican.pp
@@ -25,7 +25,7 @@
 #
 
 class tripleo::profile::base::barbican (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
 
   if $step >= 3 {
diff --git a/manifests/profile/base/barbican/api.pp b/manifests/profile/base/barbican/api.pp
index 211e44231..40a0a9978 100644
--- a/manifests/profile/base/barbican/api.pp
+++ b/manifests/profile/base/barbican/api.pp
@@ -97,7 +97,7 @@ class tripleo::profile::base::barbican::api (
   $bootstrap_node                = hiera('bootstrap_nodeid', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
   $oslomsg_rpc_proto             = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts             = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password          = hiera('barbican::api::rabbit_password'),
diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp
index a85be5d54..02ef0375f 100644
--- a/manifests/profile/base/ceilometer.pp
+++ b/manifests/profile/base/ceilometer.pp
@@ -68,7 +68,7 @@
 #   Defaults to hiera('ceilometer::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::ceilometer (
-  $step                    = hiera('step'),
+  $step                    = Integer(hiera('step')),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password    = hiera('ceilometer::rabbit_password'),
diff --git a/manifests/profile/base/ceilometer/agent/central.pp b/manifests/profile/base/ceilometer/agent/central.pp
index 033d34cc8..b8f5d073c 100644
--- a/manifests/profile/base/ceilometer/agent/central.pp
+++ b/manifests/profile/base/ceilometer/agent/central.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::ceilometer::agent::central (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::ceilometer
 
diff --git a/manifests/profile/base/ceilometer/agent/compute.pp b/manifests/profile/base/ceilometer/agent/compute.pp
index 749bc644b..c054c35f6 100644
--- a/manifests/profile/base/ceilometer/agent/compute.pp
+++ b/manifests/profile/base/ceilometer/agent/compute.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::ceilometer::agent::compute (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::ceilometer
 
diff --git a/manifests/profile/base/ceilometer/agent/notification.pp b/manifests/profile/base/ceilometer/agent/notification.pp
index 3fa139a6f..428600117 100644
--- a/manifests/profile/base/ceilometer/agent/notification.pp
+++ b/manifests/profile/base/ceilometer/agent/notification.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::ceilometer::agent::notification (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::ceilometer
   include ::tripleo::profile::base::ceilometer::upgrade
diff --git a/manifests/profile/base/ceilometer/agent/polling.pp b/manifests/profile/base/ceilometer/agent/polling.pp
index fedf03583..84f5e46c4 100644
--- a/manifests/profile/base/ceilometer/agent/polling.pp
+++ b/manifests/profile/base/ceilometer/agent/polling.pp
@@ -47,7 +47,7 @@ class tripleo::profile::base::ceilometer::agent::polling (
   $ipmi_namespace            = hiera('ipmi_namespace', false),
   $ceilometer_redis_password = hiera('ceilometer_redis_password', undef),
   $redis_vip                 = hiera('redis_vip', undef),
-  $step                      = hiera('step'),
+  $step                      = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::ceilometer
 
diff --git a/manifests/profile/base/ceilometer/api.pp b/manifests/profile/base/ceilometer/api.pp
index 01763806f..6a30a4020 100644
--- a/manifests/profile/base/ceilometer/api.pp
+++ b/manifests/profile/base/ceilometer/api.pp
@@ -48,7 +48,7 @@ class tripleo::profile::base::ceilometer::api (
   $ceilometer_network            = hiera('ceilometer_api_network', undef),
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::ceilometer
 
diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp
index a2c1e2959..9fcee7bf3 100644
--- a/manifests/profile/base/ceilometer/collector.pp
+++ b/manifests/profile/base/ceilometer/collector.pp
@@ -46,7 +46,7 @@
 #
 class tripleo::profile::base::ceilometer::collector (
   $bootstrap_node     = hiera('bootstrap_nodeid', undef),
-  $step               = hiera('step'),
+  $step               = Integer(hiera('step')),
   $ceilometer_backend = hiera('ceilometer_backend', 'mongodb'),
   $mongodb_ipv6       = hiera('mongodb::server::ipv6', false),
   $mongodb_node_ips   = hiera('mongodb_node_ips', []),
diff --git a/manifests/profile/base/ceilometer/expirer.pp b/manifests/profile/base/ceilometer/expirer.pp
index eaaaefc12..20fa9d868 100644
--- a/manifests/profile/base/ceilometer/expirer.pp
+++ b/manifests/profile/base/ceilometer/expirer.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::ceilometer::expirer (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::ceilometer
 
diff --git a/manifests/profile/base/ceilometer/upgrade.pp b/manifests/profile/base/ceilometer/upgrade.pp
index d0fc9be50..f192b4833 100644
--- a/manifests/profile/base/ceilometer/upgrade.pp
+++ b/manifests/profile/base/ceilometer/upgrade.pp
@@ -30,7 +30,7 @@
 
 class tripleo::profile::base::ceilometer::upgrade (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/ceph.pp b/manifests/profile/base/ceph.pp
index f4404e081..6ada505b5 100644
--- a/manifests/profile/base/ceph.pp
+++ b/manifests/profile/base/ceph.pp
@@ -39,7 +39,7 @@ class tripleo::profile::base::ceph (
   $ceph_mon_initial_members = hiera('ceph_mon_short_node_names', undef),
   $ceph_mon_host            = hiera('ceph_mon_node_ips', '127.0.0.1'),
   $enable_ceph_storage      = false,
-  $step                     = hiera('step'),
+  $step                     = Integer(hiera('step')),
 ) {
   if ! $ceph_mon_initial_members {
     $ceph_mon_initial_members_real = hiera('ceph_mon_node_names', undef)
diff --git a/manifests/profile/base/ceph/client.pp b/manifests/profile/base/ceph/client.pp
index 53f09c204..a38a6c561 100644
--- a/manifests/profile/base/ceph/client.pp
+++ b/manifests/profile/base/ceph/client.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::ceph::client (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::ceph
 
diff --git a/manifests/profile/base/ceph/mds.pp b/manifests/profile/base/ceph/mds.pp
index c5c7654ad..9cc2b2068 100644
--- a/manifests/profile/base/ceph/mds.pp
+++ b/manifests/profile/base/ceph/mds.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::ceph::mds (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
 
   include ::tripleo::profile::base::ceph
diff --git a/manifests/profile/base/ceph/mon.pp b/manifests/profile/base/ceph/mon.pp
index c0768b696..21c69e707 100644
--- a/manifests/profile/base/ceph/mon.pp
+++ b/manifests/profile/base/ceph/mon.pp
@@ -35,7 +35,7 @@
 #
 class tripleo::profile::base::ceph::mon (
   $ceph_pools = {},
-  $step       = hiera('step'),
+  $step       = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::ceph
 
diff --git a/manifests/profile/base/ceph/osd.pp b/manifests/profile/base/ceph/osd.pp
index 6940bcace..8b3d3c23a 100644
--- a/manifests/profile/base/ceph/osd.pp
+++ b/manifests/profile/base/ceph/osd.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::ceph::osd (
   $ceph_osd_selinux_permissive = false,
-  $step                        = hiera('step'),
+  $step                        = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::ceph
 
diff --git a/manifests/profile/base/ceph/rgw.pp b/manifests/profile/base/ceph/rgw.pp
index d00f7cdb3..8a81efae8 100644
--- a/manifests/profile/base/ceph/rgw.pp
+++ b/manifests/profile/base/ceph/rgw.pp
@@ -51,7 +51,7 @@ class tripleo::profile::base::ceph::rgw (
   $civetweb_bind_ip            = '127.0.0.1',
   $civetweb_bind_port          = '8080',
   $rgw_keystone_version        = 'v2.0',
-  $step                        = hiera('step'),
+  $step                        = Integer(hiera('step')),
 ) {
 
   include ::tripleo::profile::base::ceph
diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp
index fc3c65905..9b1b35a19 100644
--- a/manifests/profile/base/cinder.pp
+++ b/manifests/profile/base/cinder.pp
@@ -77,7 +77,7 @@
 class tripleo::profile::base::cinder (
   $bootstrap_node          = hiera('bootstrap_nodeid', undef),
   $cinder_enable_db_purge  = true,
-  $step                    = hiera('step'),
+  $step                    = Integer(hiera('step')),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password    = hiera('cinder::rabbit_password'),
diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp
index 2fd9a6516..54880ad83 100644
--- a/manifests/profile/base/cinder/api.pp
+++ b/manifests/profile/base/cinder/api.pp
@@ -53,7 +53,7 @@ class tripleo::profile::base::cinder::api (
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $cinder_api_network            = hiera('cinder_api_network', undef),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/cinder/backup.pp b/manifests/profile/base/cinder/backup.pp
index df015f72b..ecf65ea7e 100644
--- a/manifests/profile/base/cinder/backup.pp
+++ b/manifests/profile/base/cinder/backup.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::cinder::backup (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
 
   include ::tripleo::profile::base::cinder
diff --git a/manifests/profile/base/cinder/backup/ceph.pp b/manifests/profile/base/cinder/backup/ceph.pp
index 67a666eb2..d6eb47ba0 100644
--- a/manifests/profile/base/cinder/backup/ceph.pp
+++ b/manifests/profile/base/cinder/backup/ceph.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::cinder::backup::ceph (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
 
   include ::tripleo::profile::base::cinder::backup
diff --git a/manifests/profile/base/cinder/backup/swift.pp b/manifests/profile/base/cinder/backup/swift.pp
index 12561bf01..b9a38fe0f 100644
--- a/manifests/profile/base/cinder/backup/swift.pp
+++ b/manifests/profile/base/cinder/backup/swift.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::cinder::backup::swift (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
 
   include ::tripleo::profile::base::cinder::backup
diff --git a/manifests/profile/base/cinder/scheduler.pp b/manifests/profile/base/cinder/scheduler.pp
index 458692934..9fd172f46 100644
--- a/manifests/profile/base/cinder/scheduler.pp
+++ b/manifests/profile/base/cinder/scheduler.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::cinder::scheduler (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::cinder
 
diff --git a/manifests/profile/base/cinder/volume.pp b/manifests/profile/base/cinder/volume.pp
index e1370a303..358154062 100644
--- a/manifests/profile/base/cinder/volume.pp
+++ b/manifests/profile/base/cinder/volume.pp
@@ -74,7 +74,7 @@ class tripleo::profile::base::cinder::volume (
   $cinder_enable_rbd_backend         = false,
   $cinder_enable_scaleio_backend     = false,
   $cinder_user_enabled_backends      = hiera('cinder_user_enabled_backends', undef),
-  $step                              = hiera('step'),
+  $step                              = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::cinder
 
diff --git a/manifests/profile/base/cinder/volume/dellps.pp b/manifests/profile/base/cinder/volume/dellps.pp
index e825b6166..e81a7e819 100644
--- a/manifests/profile/base/cinder/volume/dellps.pp
+++ b/manifests/profile/base/cinder/volume/dellps.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::cinder::volume::dellps (
   $backend_name = hiera('cinder::backend::eqlx::volume_backend_name', 'tripleo_dellps'),
-  $step         = hiera('step'),
+  $step         = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::cinder::volume
 
diff --git a/manifests/profile/base/cinder/volume/dellsc.pp b/manifests/profile/base/cinder/volume/dellsc.pp
index a60eadff6..3f3f61ef2 100644
--- a/manifests/profile/base/cinder/volume/dellsc.pp
+++ b/manifests/profile/base/cinder/volume/dellsc.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::cinder::volume::dellsc (
   $backend_name = hiera('cinder::backend::dellsc_iscsi::volume_backend_name', 'tripleo_dellsc'),
-  $step         = hiera('step'),
+  $step         = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::cinder::volume
 
diff --git a/manifests/profile/base/cinder/volume/hpelefthand.pp b/manifests/profile/base/cinder/volume/hpelefthand.pp
index 32f097627..473791c01 100644
--- a/manifests/profile/base/cinder/volume/hpelefthand.pp
+++ b/manifests/profile/base/cinder/volume/hpelefthand.pp
@@ -53,7 +53,7 @@ class tripleo::profile::base::cinder::volume::hpelefthand (
   $cinder_hpelefthand_api_url            = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_api_url', undef),
   $cinder_hpelefthand_iscsi_chap_enabled = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_iscsi_chap_enabled', undef),
   $cinder_hpelefthand_debug              = hiera('cinder::backend::hpelefthand_iscsi::hpelefthand_debug', undef),
-  $step                                  = hiera('step'),
+  $step                                  = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::cinder::volume
 
diff --git a/manifests/profile/base/cinder/volume/iscsi.pp b/manifests/profile/base/cinder/volume/iscsi.pp
index 4d333c82c..7db50220d 100644
--- a/manifests/profile/base/cinder/volume/iscsi.pp
+++ b/manifests/profile/base/cinder/volume/iscsi.pp
@@ -48,7 +48,7 @@ class tripleo::profile::base::cinder::volume::iscsi (
   $cinder_iscsi_helper         = 'tgtadm',
   $cinder_iscsi_protocol       = 'iscsi',
   $cinder_lvm_loop_device_size = '10280',
-  $step                        = hiera('step'),
+  $step                        = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::cinder::volume
 
diff --git a/manifests/profile/base/cinder/volume/netapp.pp b/manifests/profile/base/cinder/volume/netapp.pp
index 43978da08..c58d93763 100644
--- a/manifests/profile/base/cinder/volume/netapp.pp
+++ b/manifests/profile/base/cinder/volume/netapp.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::cinder::volume::netapp (
   $backend_name = hiera('cinder::backend::netapp::volume_backend_name', 'tripleo_netapp'),
-  $step         = hiera('step'),
+  $step         = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::cinder::volume
 
diff --git a/manifests/profile/base/cinder/volume/nfs.pp b/manifests/profile/base/cinder/volume/nfs.pp
index e384a79c3..16a49e491 100644
--- a/manifests/profile/base/cinder/volume/nfs.pp
+++ b/manifests/profile/base/cinder/volume/nfs.pp
@@ -57,7 +57,7 @@ class tripleo::profile::base::cinder::volume::nfs (
   $cinder_nfs_mount_options           = '',
   $cinder_nas_secure_file_operations  = $::os_service_default,
   $cinder_nas_secure_file_permissions = $::os_service_default,
-  $step                               = hiera('step'),
+  $step                               = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::cinder::volume
 
diff --git a/manifests/profile/base/cinder/volume/pure.pp b/manifests/profile/base/cinder/volume/pure.pp
index e524919ef..c7ab1d19c 100644
--- a/manifests/profile/base/cinder/volume/pure.pp
+++ b/manifests/profile/base/cinder/volume/pure.pp
@@ -48,7 +48,7 @@
 #
 class tripleo::profile::base::cinder::volume::pure (
   $backend_name = hiera('cinder::backend::pure::volume_backend_name', 'tripleo_pure'),
-  $step         = hiera('step'),
+  $step         = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::cinder::volume
 
diff --git a/manifests/profile/base/cinder/volume/rbd.pp b/manifests/profile/base/cinder/volume/rbd.pp
index 1246de84f..dee2e726f 100644
--- a/manifests/profile/base/cinder/volume/rbd.pp
+++ b/manifests/profile/base/cinder/volume/rbd.pp
@@ -49,7 +49,7 @@ class tripleo::profile::base::cinder::volume::rbd (
   $cinder_rbd_pool_name    = 'volumes',
   $cinder_rbd_secret_uuid  = hiera('ceph::profile::params::fsid', undef),
   $cinder_rbd_user_name    = 'openstack',
-  $step                    = hiera('step'),
+  $step                    = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::cinder::volume
 
diff --git a/manifests/profile/base/cinder/volume/scaleio.pp b/manifests/profile/base/cinder/volume/scaleio.pp
index a30cffa44..bdd4dc9b3 100644
--- a/manifests/profile/base/cinder/volume/scaleio.pp
+++ b/manifests/profile/base/cinder/volume/scaleio.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::cinder::volume::scaleio (
   $backend_name = hiera('cinder::backend::scaleio::volume_backend_name', 'tripleo_scaleio'),
-  $step         = hiera('step'),
+  $step         = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::cinder::volume
 
diff --git a/manifests/profile/base/congress.pp b/manifests/profile/base/congress.pp
index 3d1a6936c..424cd950a 100644
--- a/manifests/profile/base/congress.pp
+++ b/manifests/profile/base/congress.pp
@@ -52,7 +52,7 @@
 
 class tripleo::profile::base::congress (
   $bootstrap_node       = hiera('bootstrap_nodeid', undef),
-  $step                 = hiera('step'),
+  $step                 = Integer(hiera('step')),
   $oslomsg_rpc_proto    = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts    = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password = hiera('congress::rabbit_password'),
diff --git a/manifests/profile/base/database/mongodb.pp b/manifests/profile/base/database/mongodb.pp
index 4740d679d..48bdd8260 100644
--- a/manifests/profile/base/database/mongodb.pp
+++ b/manifests/profile/base/database/mongodb.pp
@@ -37,7 +37,7 @@
 class tripleo::profile::base::database::mongodb (
   $mongodb_replset,
   $bootstrap_node = downcase(hiera('bootstrap_nodeid')),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
   $memory_limit   = '20G',
 ) {
   if $step >= 2 {
diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index 2dac02823..8eb6079b8 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -80,7 +80,7 @@ class tripleo::profile::base::database::mysql (
   $mysql_server_options          = {},
   $mysql_max_connections         = hiera('mysql_max_connections', undef),
   $remove_default_accounts       = true,
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
 
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/database/mysql/client.pp b/manifests/profile/base/database/mysql/client.pp
index 3de1e9762..1e55f05cd 100644
--- a/manifests/profile/base/database/mysql/client.pp
+++ b/manifests/profile/base/database/mysql/client.pp
@@ -50,7 +50,7 @@ class tripleo::profile::base::database::mysql::client (
   $mysql_read_default_group  = 'tripleo',
   $mysql_client_bind_address = undef,
   $ssl_ca                    = '/etc/pki/ca-trust/extracted/openssl/ca-bundle.trust.crt',
-  $step                      = hiera('step'),
+  $step                      = Integer(hiera('step')),
 ) {
   if $step >= 1 {
     # If the folder /etc/my.cnf.d does not exist (e.g. if mariadb is not
diff --git a/manifests/profile/base/database/redis.pp b/manifests/profile/base/database/redis.pp
index 14f6af459..830ffc693 100644
--- a/manifests/profile/base/database/redis.pp
+++ b/manifests/profile/base/database/redis.pp
@@ -34,7 +34,7 @@
 class tripleo::profile::base::database::redis (
   $bootstrap_nodeid = hiera('bootstrap_nodeid'),
   $redis_node_ips   = hiera('redis_node_ips'),
-  $step             = hiera('step'),
+  $step             = Integer(hiera('step')),
 ) {
   if $step >= 2 {
     if $bootstrap_nodeid == $::hostname {
diff --git a/manifests/profile/base/docker.pp b/manifests/profile/base/docker.pp
index 67fbd71f3..28a2764d9 100644
--- a/manifests/profile/base/docker.pp
+++ b/manifests/profile/base/docker.pp
@@ -66,7 +66,7 @@ class tripleo::profile::base::docker (
   $docker_options = '--log-driver=journald --signature-verification=false',
   $configure_storage = true,
   $storage_options = '-s overlay2',
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
   $configure_libvirt_polkit = undef,
   $docker_nova_uid = 42436,
   $services_enabled = hiera('service_names', [])
diff --git a/manifests/profile/base/etcd.pp b/manifests/profile/base/etcd.pp
index 9f5d1801d..86240be88 100644
--- a/manifests/profile/base/etcd.pp
+++ b/manifests/profile/base/etcd.pp
@@ -62,7 +62,7 @@ class tripleo::profile::base::etcd (
   $nodes               = hiera('etcd_node_names', []),
   $certificate_specs   = {},
   $enable_internal_tls = hiera('enable_internal_tls', false),
-  $step                = hiera('step'),
+  $step                = Integer(hiera('step')),
 ) {
 
   validate_hash($certificate_specs)
diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp
index 8ed7fb73f..28961857d 100644
--- a/manifests/profile/base/glance/api.pp
+++ b/manifests/profile/base/glance/api.pp
@@ -86,7 +86,7 @@ class tripleo::profile::base::glance::api (
   $glance_backend                = downcase(hiera('glance_backend', 'swift')),
   $glance_network                = hiera('glance_api_network', undef),
   $glance_nfs_enabled            = false,
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
   $rabbit_hosts                  = hiera('rabbitmq_node_names', undef),
   $rabbit_port                   = hiera('glance::notify::rabbitmq::rabbit_port', 5672),
   $tls_proxy_bind_ip             = undef,
diff --git a/manifests/profile/base/gnocchi.pp b/manifests/profile/base/gnocchi.pp
index 6a470ca77..5b8c5fccc 100644
--- a/manifests/profile/base/gnocchi.pp
+++ b/manifests/profile/base/gnocchi.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::gnocchi (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 3 {
     include ::gnocchi
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index a4e9a3026..457239753 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -68,7 +68,7 @@ class tripleo::profile::base::gnocchi::api (
   $gnocchi_network               = hiera('gnocchi_api_network', undef),
   $gnocchi_redis_password        = hiera('gnocchi_redis_password'),
   $redis_vip                     = hiera('redis_vip'),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/gnocchi/metricd.pp b/manifests/profile/base/gnocchi/metricd.pp
index f6f80cd2d..c585e57c6 100644
--- a/manifests/profile/base/gnocchi/metricd.pp
+++ b/manifests/profile/base/gnocchi/metricd.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::gnocchi::metricd (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::gnocchi
 
diff --git a/manifests/profile/base/gnocchi/statsd.pp b/manifests/profile/base/gnocchi/statsd.pp
index 7c98a0a4b..184ff7b3b 100644
--- a/manifests/profile/base/gnocchi/statsd.pp
+++ b/manifests/profile/base/gnocchi/statsd.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::gnocchi::statsd (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::gnocchi
 
diff --git a/manifests/profile/base/haproxy.pp b/manifests/profile/base/haproxy.pp
index 9a03487b6..4f3322ca5 100644
--- a/manifests/profile/base/haproxy.pp
+++ b/manifests/profile/base/haproxy.pp
@@ -44,7 +44,7 @@
 class tripleo::profile::base::haproxy (
   $certificates_specs            = {},
   $enable_load_balancer          = hiera('enable_load_balancer', true),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
   if $step >= 1 {
     if $enable_load_balancer {
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index 4ff5b41f9..ac1c6a251 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -83,7 +83,7 @@ class tripleo::profile::base::heat (
   $bootstrap_node          = downcase(hiera('bootstrap_nodeid')),
   $manage_db_purge         = hiera('heat_enable_db_purge', true),
   $notification_driver     = 'messaging',
-  $step                    = hiera('step'),
+  $step                    = Integer(hiera('step')),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password    = hiera('heat::rabbit_password'),
diff --git a/manifests/profile/base/heat/api.pp b/manifests/profile/base/heat/api.pp
index 79eb77ea8..ff9059045 100644
--- a/manifests/profile/base/heat/api.pp
+++ b/manifests/profile/base/heat/api.pp
@@ -48,7 +48,7 @@ class tripleo::profile::base::heat::api (
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $heat_api_network              = hiera('heat_api_network', undef),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::heat
 
diff --git a/manifests/profile/base/heat/api_cfn.pp b/manifests/profile/base/heat/api_cfn.pp
index dad7b7656..e14760acb 100644
--- a/manifests/profile/base/heat/api_cfn.pp
+++ b/manifests/profile/base/heat/api_cfn.pp
@@ -48,7 +48,7 @@ class tripleo::profile::base::heat::api_cfn (
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $heat_api_cfn_network          = hiera('heat_api_cfn_network', undef),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::heat
 
diff --git a/manifests/profile/base/heat/api_cloudwatch.pp b/manifests/profile/base/heat/api_cloudwatch.pp
index 428bcf24d..83d5307bf 100644
--- a/manifests/profile/base/heat/api_cloudwatch.pp
+++ b/manifests/profile/base/heat/api_cloudwatch.pp
@@ -48,7 +48,7 @@ class tripleo::profile::base::heat::api_cloudwatch (
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $heat_api_cloudwatch_network   = hiera('heat_api_cloudwatch_network', undef),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::heat
 
diff --git a/manifests/profile/base/heat/engine.pp b/manifests/profile/base/heat/engine.pp
index 479e1c6bc..b9b44d1d8 100644
--- a/manifests/profile/base/heat/engine.pp
+++ b/manifests/profile/base/heat/engine.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::heat::engine (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/horizon.pp b/manifests/profile/base/horizon.pp
index 10eaaa645..12482b629 100644
--- a/manifests/profile/base/horizon.pp
+++ b/manifests/profile/base/horizon.pp
@@ -28,7 +28,7 @@
 #   Defaults to hiera('horizon::neutron_options', {})
 #
 class tripleo::profile::base::horizon (
-  $step            = hiera('step'),
+  $step            = Integer(hiera('step')),
   $neutron_options = hiera('horizon::neutron_options', {}),
 ) {
   if $step >= 3 {
diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp
index 7ba629fb8..2739f33cc 100644
--- a/manifests/profile/base/ironic.pp
+++ b/manifests/profile/base/ironic.pp
@@ -52,7 +52,7 @@
 
 class tripleo::profile::base::ironic (
   $bootstrap_node       = hiera('bootstrap_nodeid', undef),
-  $step                 = hiera('step'),
+  $step                 = Integer(hiera('step')),
   $oslomsg_rpc_proto    = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts    = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password = hiera('ironic::rabbit_password'),
diff --git a/manifests/profile/base/ironic/api.pp b/manifests/profile/base/ironic/api.pp
index 020cacb2e..94b7efe21 100644
--- a/manifests/profile/base/ironic/api.pp
+++ b/manifests/profile/base/ironic/api.pp
@@ -23,7 +23,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::ironic::api (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::ironic
 
diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp
index f7a2eb0c8..390d5475a 100644
--- a/manifests/profile/base/ironic/conductor.pp
+++ b/manifests/profile/base/ironic/conductor.pp
@@ -27,7 +27,7 @@
 #   Defaults to true
 #
 class tripleo::profile::base::ironic::conductor (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
   $manage_pxe = true,
 ) {
   include ::tripleo::profile::base::ironic
diff --git a/manifests/profile/base/ironic_inspector.pp b/manifests/profile/base/ironic_inspector.pp
index b4276c654..4e5e92f55 100644
--- a/manifests/profile/base/ironic_inspector.pp
+++ b/manifests/profile/base/ironic_inspector.pp
@@ -28,7 +28,7 @@
 
 class tripleo::profile::base::ironic_inspector (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
 
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/base/keepalived.pp b/manifests/profile/base/keepalived.pp
index 8dd03dc92..a841e068d 100644
--- a/manifests/profile/base/keepalived.pp
+++ b/manifests/profile/base/keepalived.pp
@@ -49,7 +49,7 @@ class tripleo::profile::base::keepalived (
   $control_virtual_ip        = hiera('tripleo::keepalived::controller_virtual_ip'),
   $public_virtual_interface  = hiera('tripleo::keepalived::public_virtual_interface', false),
   $public_virtual_ip         = hiera('tripleo::keepalived::public_virtual_ip'),
-  $step                      = hiera('step'),
+  $step                      = Integer(hiera('step')),
 ) {
   if $step >= 1 {
     if $enable_load_balancer and hiera('enable_keepalived', true){
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index c7eea14a0..91a660cd7 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -150,7 +150,7 @@ class tripleo::profile::base::keystone (
   $oslomsg_notify_port           = hiera('keystone::rabbit_port', '5672'),
   $oslomsg_notify_username       = hiera('keystone::rabbit_userid', 'guest'),
   $oslomsg_use_ssl               = hiera('keystone::rabbit_use_ssl', '0'),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/logging/fluentd.pp b/manifests/profile/base/logging/fluentd.pp
index fc996e931..51869d6db 100644
--- a/manifests/profile/base/logging/fluentd.pp
+++ b/manifests/profile/base/logging/fluentd.pp
@@ -59,7 +59,7 @@
 #   (Optional, default 42185) Port on which fluentd should listen if
 #   $fluentd_listen_syslog is true.
 class tripleo::profile::base::logging::fluentd (
-  $step = hiera('step', undef),
+  $step = Integer(hiera('step')),
   $fluentd_sources = undef,
   $fluentd_filters = undef,
   $fluentd_servers = undef,
diff --git a/manifests/profile/base/manila.pp b/manifests/profile/base/manila.pp
index cad2cdf6c..6386e6cbd 100644
--- a/manifests/profile/base/manila.pp
+++ b/manifests/profile/base/manila.pp
@@ -72,7 +72,7 @@
 
 class tripleo::profile::base::manila (
   $bootstrap_node          = hiera('bootstrap_nodeid', undef),
-  $step                    = hiera('step'),
+  $step                    = Integer(hiera('step')),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password    = hiera('manila::rabbit_password'),
diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp
index 021fffd6a..95607aea7 100644
--- a/manifests/profile/base/manila/api.pp
+++ b/manifests/profile/base/manila/api.pp
@@ -44,7 +44,7 @@ class tripleo::profile::base::manila::api (
   $backend_netapp_enabled  = hiera('manila_backend_netapp_enabled', false),
   $backend_cephfs_enabled  = hiera('manila_backend_cephfs_enabled', false),
   $bootstrap_node          = hiera('bootstrap_nodeid', undef),
-  $step                    = hiera('step'),
+  $step                    = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/manila/scheduler.pp b/manifests/profile/base/manila/scheduler.pp
index 07ea67631..5c94bbea1 100644
--- a/manifests/profile/base/manila/scheduler.pp
+++ b/manifests/profile/base/manila/scheduler.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::manila::scheduler (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::manila
 
diff --git a/manifests/profile/base/manila/share.pp b/manifests/profile/base/manila/share.pp
index d39c55c34..13cedeca6 100644
--- a/manifests/profile/base/manila/share.pp
+++ b/manifests/profile/base/manila/share.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::manila::share (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::manila
 
diff --git a/manifests/profile/base/memcached.pp b/manifests/profile/base/memcached.pp
index 72a91e20b..e33999a12 100644
--- a/manifests/profile/base/memcached.pp
+++ b/manifests/profile/base/memcached.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::memcached (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 1 {
       include ::memcached
diff --git a/manifests/profile/base/metrics/collectd.pp b/manifests/profile/base/metrics/collectd.pp
index d8e6f8913..098f79542 100644
--- a/manifests/profile/base/metrics/collectd.pp
+++ b/manifests/profile/base/metrics/collectd.pp
@@ -47,7 +47,7 @@
 #   deployment. This is used to look up service-specific plugins that
 #   need to be installed.
 class tripleo::profile::base::metrics::collectd (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 
   $collectd_server = undef,
   $collectd_port = undef,
diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index 0eb849db1..89577b889 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -73,7 +73,7 @@
 
 class tripleo::profile::base::mistral (
   $bootstrap_node          = hiera('bootstrap_nodeid', undef),
-  $step                    = hiera('step'),
+  $step                    = Integer(hiera('step')),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password    = hiera('mistral::rabbit_password'),
diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp
index 4f8172577..2ea5c9ab8 100644
--- a/manifests/profile/base/mistral/api.pp
+++ b/manifests/profile/base/mistral/api.pp
@@ -53,7 +53,7 @@ class tripleo::profile::base::mistral::api (
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $mistral_api_network           = hiera('mistral_api_network', undef),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/mistral/engine.pp b/manifests/profile/base/mistral/engine.pp
index b2d8864cc..95581aa20 100644
--- a/manifests/profile/base/mistral/engine.pp
+++ b/manifests/profile/base/mistral/engine.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::mistral::engine (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/mistral/event_engine.pp b/manifests/profile/base/mistral/event_engine.pp
index 4214429e9..f9ea2f873 100644
--- a/manifests/profile/base/mistral/event_engine.pp
+++ b/manifests/profile/base/mistral/event_engine.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::mistral::event_engine (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp
index 8e3f2c92f..cce96dc1f 100644
--- a/manifests/profile/base/mistral/executor.pp
+++ b/manifests/profile/base/mistral/executor.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::mistral::executor (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/monitoring/sensu.pp b/manifests/profile/base/monitoring/sensu.pp
index 91b7ac796..41db598f6 100644
--- a/manifests/profile/base/monitoring/sensu.pp
+++ b/manifests/profile/base/monitoring/sensu.pp
@@ -23,7 +23,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::monitoring::sensu (
-  $step = hiera('step', undef),
+  $step = Integer(hiera('step')),
 ) {
   include ::sensu
   package { 'osops-tools-monitoring-oschecks':
diff --git a/manifests/profile/base/monitoring/uchiwa.pp b/manifests/profile/base/monitoring/uchiwa.pp
index 2674b5f61..153a0bd57 100644
--- a/manifests/profile/base/monitoring/uchiwa.pp
+++ b/manifests/profile/base/monitoring/uchiwa.pp
@@ -23,9 +23,9 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::monitoring::uchiwa (
-  $step = hiera('step', undef),
+  $step = Integer(hiera('step')),
 ) {
-  if $step == undef or $step >= 3 {
+  if $step >= 3 {
     include ::uchiwa
   }
 }
diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp
index 2f01b75a1..e4092615a 100644
--- a/manifests/profile/base/neutron.pp
+++ b/manifests/profile/base/neutron.pp
@@ -80,7 +80,7 @@
 #
 
 class tripleo::profile::base::neutron (
-  $step                    = hiera('step'),
+  $step                    = Integer(hiera('step')),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password    = hiera('neutron::rabbit_password'),
diff --git a/manifests/profile/base/neutron/agents/bagpipe.pp b/manifests/profile/base/neutron/agents/bagpipe.pp
index fb5e0003d..de5bc17a6 100644
--- a/manifests/profile/base/neutron/agents/bagpipe.pp
+++ b/manifests/profile/base/neutron/agents/bagpipe.pp
@@ -27,7 +27,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::agents::bagpipe (
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::neutron
 
diff --git a/manifests/profile/base/neutron/agents/bigswitch.pp b/manifests/profile/base/neutron/agents/bigswitch.pp
index 137dec0a7..e79c8a226 100644
--- a/manifests/profile/base/neutron/agents/bigswitch.pp
+++ b/manifests/profile/base/neutron/agents/bigswitch.pp
@@ -23,7 +23,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::agents::bigswitch(
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::neutron::agents::bigswitch
diff --git a/manifests/profile/base/neutron/agents/l2gw.pp b/manifests/profile/base/neutron/agents/l2gw.pp
index 10cd66266..a728fa32b 100644
--- a/manifests/profile/base/neutron/agents/l2gw.pp
+++ b/manifests/profile/base/neutron/agents/l2gw.pp
@@ -27,7 +27,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::agents::l2gw (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::neutron::agents::l2gw
diff --git a/manifests/profile/base/neutron/agents/midonet.pp b/manifests/profile/base/neutron/agents/midonet.pp
index f2ce94ab7..c967589b5 100644
--- a/manifests/profile/base/neutron/agents/midonet.pp
+++ b/manifests/profile/base/neutron/agents/midonet.pp
@@ -33,7 +33,7 @@
 class tripleo::profile::base::neutron::agents::midonet (
   $midonet_libvirt_qemu_data = hiera('midonet_libvirt_qemu_data', ''),
   $neutron_api_node_ips      = hiera('neutron_api_node_ips', ''),
-  $step                      = hiera('step'),
+  $step                      = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     # TODO(devvesa) provide non-controller ips for these services
diff --git a/manifests/profile/base/neutron/agents/nuage.pp b/manifests/profile/base/neutron/agents/nuage.pp
index 80becebd9..2358a04f4 100644
--- a/manifests/profile/base/neutron/agents/nuage.pp
+++ b/manifests/profile/base/neutron/agents/nuage.pp
@@ -43,7 +43,7 @@ class tripleo::profile::base::neutron::agents::nuage (
   $nova_metadata_ip    = hiera('nova_metadata_node_ips', ''),
   $nova_os_password    = hiera('nova_password', ''),
   $nova_os_tenant_name = hiera('nova::api::admin_tenant_name', ''),
-  $step                = hiera('step'),
+  $step                = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::nuage::vrs
diff --git a/manifests/profile/base/neutron/agents/ovn.pp b/manifests/profile/base/neutron/agents/ovn.pp
index a59309263..9f37bbffa 100644
--- a/manifests/profile/base/neutron/agents/ovn.pp
+++ b/manifests/profile/base/neutron/agents/ovn.pp
@@ -32,7 +32,7 @@
 class tripleo::profile::base::neutron::agents::ovn (
   $ovn_db_host    = hiera('ovn_dbs_vip'),
   $ovn_sbdb_port  = hiera('ovn::southbound::port'),
-  $step           = hiera('step')
+  $step           = Integer(hiera('step'))
 ) {
   if $step >= 4 {
     class { '::ovn::controller':
diff --git a/manifests/profile/base/neutron/agents/vpp.pp b/manifests/profile/base/neutron/agents/vpp.pp
index e961aa7f7..6c55b8674 100644
--- a/manifests/profile/base/neutron/agents/vpp.pp
+++ b/manifests/profile/base/neutron/agents/vpp.pp
@@ -32,7 +32,7 @@
 #   Defaults to 2379
 #
 class tripleo::profile::base::neutron::agents::vpp(
-  $step      = hiera('step'),
+  $step      = Integer(hiera('step')),
   $etcd_host = hiera('etcd_vip'),
   $etcd_port = 2379,
 ) {
diff --git a/manifests/profile/base/neutron/bgpvpn.pp b/manifests/profile/base/neutron/bgpvpn.pp
index d6fdf4e1c..b2187df51 100644
--- a/manifests/profile/base/neutron/bgpvpn.pp
+++ b/manifests/profile/base/neutron/bgpvpn.pp
@@ -27,7 +27,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::bgpvpn (
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::neutron
 
diff --git a/manifests/profile/base/neutron/dhcp.pp b/manifests/profile/base/neutron/dhcp.pp
index 24b1a3580..54904f2e5 100644
--- a/manifests/profile/base/neutron/dhcp.pp
+++ b/manifests/profile/base/neutron/dhcp.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::dhcp (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::neutron
diff --git a/manifests/profile/base/neutron/l2gw.pp b/manifests/profile/base/neutron/l2gw.pp
index da711081f..cd6239ee4 100644
--- a/manifests/profile/base/neutron/l2gw.pp
+++ b/manifests/profile/base/neutron/l2gw.pp
@@ -27,7 +27,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::l2gw (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::neutron
 
diff --git a/manifests/profile/base/neutron/l3.pp b/manifests/profile/base/neutron/l3.pp
index 14ffa8250..90d8ace21 100644
--- a/manifests/profile/base/neutron/l3.pp
+++ b/manifests/profile/base/neutron/l3.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::l3 (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::neutron
diff --git a/manifests/profile/base/neutron/lbaas.pp b/manifests/profile/base/neutron/lbaas.pp
index a6e42ee17..8bce0b189 100644
--- a/manifests/profile/base/neutron/lbaas.pp
+++ b/manifests/profile/base/neutron/lbaas.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::neutron::lbaas(
   $manage_haproxy_package = hiera('manage_haproxy_package', false),
-  $step                   = hiera('step'),
+  $step                   = Integer(hiera('step')),
 ) {
 
   include ::tripleo::profile::base::neutron
diff --git a/manifests/profile/base/neutron/linuxbridge.pp b/manifests/profile/base/neutron/linuxbridge.pp
index 9f4899ad3..36be214b2 100644
--- a/manifests/profile/base/neutron/linuxbridge.pp
+++ b/manifests/profile/base/neutron/linuxbridge.pp
@@ -10,7 +10,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::linuxbridge(
-    $step           = hiera('step'),
+    $step           = Integer(hiera('step')),
 ) {
     include ::tripleo::profile::base::neutron
 
diff --git a/manifests/profile/base/neutron/metadata.pp b/manifests/profile/base/neutron/metadata.pp
index 4cc6748ae..66de88331 100644
--- a/manifests/profile/base/neutron/metadata.pp
+++ b/manifests/profile/base/neutron/metadata.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::metadata (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::neutron
diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp
index 3ba9dd942..0e40ede02 100644
--- a/manifests/profile/base/neutron/midonet.pp
+++ b/manifests/profile/base/neutron/midonet.pp
@@ -69,7 +69,7 @@ class tripleo::profile::base::neutron::midonet (
   $neutron_api_node_ips  = hiera('neutron_api_node_ips', ''),
   $neutron_auth_password = hiera('neutron::keystone::authtoken::password', ''),
   $neutron_auth_tenant   = hiera('neutron::keystone::authtoken::project_name', ''),
-  $step                  = hiera('step'),
+  $step                  = Integer(hiera('step')),
   $vip                   = hiera('public_virtual_ip'),
   $zk_on_controller      = hiera('enable_zookeeper_on_controller', ''),
   $zookeeper_client_ip   = hiera('neutron::bind_host', ''),
diff --git a/manifests/profile/base/neutron/n1k.pp b/manifests/profile/base/neutron/n1k.pp
index 8c8cfbdcd..e61023d83 100644
--- a/manifests/profile/base/neutron/n1k.pp
+++ b/manifests/profile/base/neutron/n1k.pp
@@ -34,7 +34,7 @@
 class tripleo::profile::base::neutron::n1k (
   $n1kv_source  = hiera('n1kv_vem_source', undef),
   $n1kv_version = hiera('n1kv_vem_version', undef),
-  $step         = hiera('step'),
+  $step         = Integer(hiera('step')),
 ) {
   include ::neutron::plugins::ml2::cisco::nexus1000v
   include ::tripleo::profile::base::neutron
diff --git a/manifests/profile/base/neutron/opencontrail/vrouter.pp b/manifests/profile/base/neutron/opencontrail/vrouter.pp
index 90ab71c56..4330dc479 100644
--- a/manifests/profile/base/neutron/opencontrail/vrouter.pp
+++ b/manifests/profile/base/neutron/opencontrail/vrouter.pp
@@ -23,7 +23,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::opencontrail::vrouter (
-  $step                      = hiera('step'),
+  $step                      = Integer(hiera('step')),
 ) {
 
   if $step >= 4 {
diff --git a/manifests/profile/base/neutron/opendaylight.pp b/manifests/profile/base/neutron/opendaylight.pp
index b5e6d116f..5d25ae2d0 100644
--- a/manifests/profile/base/neutron/opendaylight.pp
+++ b/manifests/profile/base/neutron/opendaylight.pp
@@ -31,7 +31,7 @@
 #   Defaults to hiera('bootstack_nodeid')
 #
 class tripleo::profile::base::neutron::opendaylight (
-  $step         = hiera('step'),
+  $step         = Integer(hiera('step')),
   $odl_api_ips  = hiera('opendaylight_api_node_ips'),
   $node_name    = hiera('bootstack_nodeid')
 ) {
diff --git a/manifests/profile/base/neutron/ovn_northd.pp b/manifests/profile/base/neutron/ovn_northd.pp
index 0b46d5cb7..721e84e59 100644
--- a/manifests/profile/base/neutron/ovn_northd.pp
+++ b/manifests/profile/base/neutron/ovn_northd.pp
@@ -27,7 +27,7 @@
 #
 class tripleo::profile::base::neutron::ovn_northd (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     # Note this only runs on the first node in the cluster when
diff --git a/manifests/profile/base/neutron/ovs.pp b/manifests/profile/base/neutron/ovs.pp
index 97eb8e90e..8794d744d 100644
--- a/manifests/profile/base/neutron/ovs.pp
+++ b/manifests/profile/base/neutron/ovs.pp
@@ -29,7 +29,7 @@
 #   client mode.
 
 class tripleo::profile::base::neutron::ovs(
-  $step                 = hiera('step'),
+  $step                 = Integer(hiera('step')),
   $vhostuser_socket_dir = hiera('neutron::agents::ml2::ovs::vhostuser_socket_dir', undef)
 ) {
   include ::tripleo::profile::base::neutron
diff --git a/manifests/profile/base/neutron/plugins/ml2.pp b/manifests/profile/base/neutron/plugins/ml2.pp
index 1702fed5e..f7a2935f8 100644
--- a/manifests/profile/base/neutron/plugins/ml2.pp
+++ b/manifests/profile/base/neutron/plugins/ml2.pp
@@ -34,7 +34,7 @@
 class tripleo::profile::base::neutron::plugins::ml2 (
   $bootstrap_node    = hiera('bootstrap_nodeid', undef),
   $mechanism_drivers = hiera('neutron::plugins::ml2::mechanism_drivers'),
-  $step              = hiera('step'),
+  $step              = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp b/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp
index 161cd758e..44521efde 100644
--- a/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/bagpipe.pp
@@ -27,7 +27,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::plugins::ml2::bagpipe (
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::neutron
 
diff --git a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
index 2618d4f51..bffcb390d 100644
--- a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
@@ -49,7 +49,7 @@ class tripleo::profile::base::neutron::plugins::ml2::opendaylight (
   $odl_password = hiera('opendaylight::password'),
   $odl_url_ip   = hiera('opendaylight_api_vip'),
   $conn_proto   = hiera('opendaylight::nb_connection_protocol'),
-  $step         = hiera('step'),
+  $step         = Integer(hiera('step')),
 ) {
 
   if $step >= 4 {
diff --git a/manifests/profile/base/neutron/plugins/ml2/ovn.pp b/manifests/profile/base/neutron/plugins/ml2/ovn.pp
index b5b7a0a00..fad907cd5 100644
--- a/manifests/profile/base/neutron/plugins/ml2/ovn.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/ovn.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::neutron::plugins::ml2::ovn (
   $ovn_db_host = hiera('ovn_dbs_vip'),
   $ovn_nb_port = hiera('ovn::northbound::port'),
   $ovn_sb_port = hiera('ovn::southbound::port'),
-  $step        = hiera('step')
+  $step        = Integer(hiera('step'))
 ) {
   if $step >= 4 {
     class { '::neutron::plugins::ml2::ovn':
diff --git a/manifests/profile/base/neutron/plugins/ml2/vpp.pp b/manifests/profile/base/neutron/plugins/ml2/vpp.pp
index 217e4cf64..7d5923995 100644
--- a/manifests/profile/base/neutron/plugins/ml2/vpp.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/vpp.pp
@@ -32,7 +32,7 @@
 #   Defaults to 2379
 #
 class tripleo::profile::base::neutron::plugins::ml2::vpp (
-  $step      = hiera('step'),
+  $step      = Integer(hiera('step')),
   $etcd_host = hiera('etcd_vip'),
   $etcd_port = 2379,
 ) {
diff --git a/manifests/profile/base/neutron/plugins/nsx_v3.pp b/manifests/profile/base/neutron/plugins/nsx_v3.pp
index 33fa0cfba..b534a2f61 100644
--- a/manifests/profile/base/neutron/plugins/nsx_v3.pp
+++ b/manifests/profile/base/neutron/plugins/nsx_v3.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::neutron::plugins::nsx_v3 (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/neutron/plugins/nuage.pp b/manifests/profile/base/neutron/plugins/nuage.pp
index 0843ec450..ccfcae1a9 100644
--- a/manifests/profile/base/neutron/plugins/nuage.pp
+++ b/manifests/profile/base/neutron/plugins/nuage.pp
@@ -27,7 +27,7 @@
 #
 class tripleo::profile::base::neutron::plugins::nuage (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/neutron/plugins/opencontrail.pp b/manifests/profile/base/neutron/plugins/opencontrail.pp
index fbf46e796..d13af6121 100644
--- a/manifests/profile/base/neutron/plugins/opencontrail.pp
+++ b/manifests/profile/base/neutron/plugins/opencontrail.pp
@@ -27,7 +27,7 @@
 #
 class tripleo::profile::base::neutron::plugins::opencontrail (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
index 4da8df949..59060a61b 100644
--- a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
+++ b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
@@ -49,7 +49,7 @@ class tripleo::profile::base::neutron::plugins::ovs::opendaylight (
   $odl_api_ips   = hiera('opendaylight_api_node_ips'),
   $odl_url_ip    = hiera('opendaylight_api_vip'),
   $conn_proto    = hiera('opendaylight::nb_connection_protocol'),
-  $step          = hiera('step'),
+  $step          = Integer(hiera('step')),
 ) {
 
   if $step >= 4 {
diff --git a/manifests/profile/base/neutron/plugins/plumgrid.pp b/manifests/profile/base/neutron/plugins/plumgrid.pp
index bc73d29f2..606f00163 100644
--- a/manifests/profile/base/neutron/plugins/plumgrid.pp
+++ b/manifests/profile/base/neutron/plugins/plumgrid.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::neutron::plugins::plumgrid (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/neutron/plumgrid.pp b/manifests/profile/base/neutron/plumgrid.pp
index 03dc101e6..cafeefe20 100644
--- a/manifests/profile/base/neutron/plumgrid.pp
+++ b/manifests/profile/base/neutron/plumgrid.pp
@@ -22,7 +22,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::neutron::plumgrid (
-  $step                      = hiera('step'),
+  $step                      = Integer(hiera('step')),
 ) {
 
   if $step >= 4 {
diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index d67a40c45..0dee53eb6 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -90,7 +90,7 @@ class tripleo::profile::base::neutron::server (
   $l3_ha_override                = '',
   $l3_nodes                      = hiera('neutron_l3_short_node_names', []),
   $neutron_network               = hiera('neutron_api_network', undef),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
   $tls_proxy_bind_ip             = undef,
   $tls_proxy_fqdn                = undef,
   $tls_proxy_port                = 9696,
diff --git a/manifests/profile/base/neutron/sriov.pp b/manifests/profile/base/neutron/sriov.pp
index 095da0fee..3c06beb52 100644
--- a/manifests/profile/base/neutron/sriov.pp
+++ b/manifests/profile/base/neutron/sriov.pp
@@ -25,7 +25,7 @@
 #
 
 class tripleo::profile::base::neutron::sriov(
-  $step               = hiera('step')
+  $step               = Integer(hiera('step'))
 ) {
 
   include ::tripleo::profile::base::neutron
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index d786940f2..65e8ebc9b 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -112,7 +112,7 @@ class tripleo::profile::base::nova (
   $oslomsg_notify_username  = hiera('nova::rabbit_userid', 'guest'),
   $oslomsg_use_ssl          = hiera('nova::rabbit_use_ssl', '0'),
   $nova_compute_enabled     = false,
-  $step                     = hiera('step'),
+  $step                     = Integer(hiera('step')),
   $migration_ssh_key        = {},
   $migration_ssh_localaddrs = [],
   $libvirt_tls              = false
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index bdb300719..0dcc754cd 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -57,7 +57,7 @@ class tripleo::profile::base::nova::api (
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $nova_api_network              = hiera('nova_api_network', undef),
   $nova_api_wsgi_enabled         = hiera('nova_wsgi_enabled', false),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/nova/authtoken.pp b/manifests/profile/base/nova/authtoken.pp
index ee6c3313f..d8285baae 100644
--- a/manifests/profile/base/nova/authtoken.pp
+++ b/manifests/profile/base/nova/authtoken.pp
@@ -35,7 +35,7 @@
 #   Defaults to hiera('memcached_node_ips', ['127.0.0.1'])
 #
 class tripleo::profile::base::nova::authtoken (
-  $step                = hiera('step'),
+  $step                = Integer(hiera('step')),
   $use_ipv6            = hiera('nova::use_ipv6', false),
   $memcache_nodes_ipv6 = hiera('memcached_node_ips_v6', ['::1']),
   $memcache_nodes_ipv4 = hiera('memcached_node_ips', ['127.0.0.1']),
diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp
index 84b8bd592..bd5020496 100644
--- a/manifests/profile/base/nova/compute.pp
+++ b/manifests/profile/base/nova/compute.pp
@@ -28,7 +28,7 @@
 #   Defaults to hiera('cinder_enable_nfs_backend', false)
 #
 class tripleo::profile::base::nova::compute (
-  $step               = hiera('step'),
+  $step               = Integer(hiera('step')),
   $cinder_nfs_backend = hiera('cinder_enable_nfs_backend', false),
 ) {
 
diff --git a/manifests/profile/base/nova/compute/ironic.pp b/manifests/profile/base/nova/compute/ironic.pp
index c0213fbc9..52b3020f3 100644
--- a/manifests/profile/base/nova/compute/ironic.pp
+++ b/manifests/profile/base/nova/compute/ironic.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::nova::compute::ironic (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::nova::compute
diff --git a/manifests/profile/base/nova/compute/libvirt.pp b/manifests/profile/base/nova/compute/libvirt.pp
index cc9beb6ad..ec592cb4a 100644
--- a/manifests/profile/base/nova/compute/libvirt.pp
+++ b/manifests/profile/base/nova/compute/libvirt.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::nova::compute::libvirt (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::nova::compute
diff --git a/manifests/profile/base/nova/conductor.pp b/manifests/profile/base/nova/conductor.pp
index fa9f12bbc..d9d55d246 100644
--- a/manifests/profile/base/nova/conductor.pp
+++ b/manifests/profile/base/nova/conductor.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::nova::conductor (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::nova
   if $step >= 4 {
diff --git a/manifests/profile/base/nova/consoleauth.pp b/manifests/profile/base/nova/consoleauth.pp
index 8ccfb8cdb..4c2807cf1 100644
--- a/manifests/profile/base/nova/consoleauth.pp
+++ b/manifests/profile/base/nova/consoleauth.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::nova::consoleauth (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::nova
diff --git a/manifests/profile/base/nova/ec2api.pp b/manifests/profile/base/nova/ec2api.pp
index f8817d2ad..00a6a1453 100644
--- a/manifests/profile/base/nova/ec2api.pp
+++ b/manifests/profile/base/nova/ec2api.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::nova::ec2api (
-  $step    = hiera('step')
+  $step    = Integer(hiera('step'))
 ) {
   if $step >= 4 {
     include ::ec2api
diff --git a/manifests/profile/base/nova/libvirt.pp b/manifests/profile/base/nova/libvirt.pp
index 889b80da3..b63985892 100644
--- a/manifests/profile/base/nova/libvirt.pp
+++ b/manifests/profile/base/nova/libvirt.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::nova::libvirt (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::nova
diff --git a/manifests/profile/base/nova/placement.pp b/manifests/profile/base/nova/placement.pp
index c78b3c2ef..ac78287b2 100644
--- a/manifests/profile/base/nova/placement.pp
+++ b/manifests/profile/base/nova/placement.pp
@@ -51,7 +51,7 @@ class tripleo::profile::base::nova::placement (
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $nova_placement_network        = hiera('nova_placement_network', undef),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/nova/scheduler.pp b/manifests/profile/base/nova/scheduler.pp
index 3c9b2c2db..a9db318a2 100644
--- a/manifests/profile/base/nova/scheduler.pp
+++ b/manifests/profile/base/nova/scheduler.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::nova::scheduler (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::nova
diff --git a/manifests/profile/base/nova/vncproxy.pp b/manifests/profile/base/nova/vncproxy.pp
index f654fef7e..25ab3fee1 100644
--- a/manifests/profile/base/nova/vncproxy.pp
+++ b/manifests/profile/base/nova/vncproxy.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::nova::vncproxy (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     include ::tripleo::profile::base::nova
diff --git a/manifests/profile/base/novajoin.pp b/manifests/profile/base/novajoin.pp
index f9c1ea951..c28508b16 100644
--- a/manifests/profile/base/novajoin.pp
+++ b/manifests/profile/base/novajoin.pp
@@ -63,7 +63,7 @@ class tripleo::profile::base::novajoin (
   $oslomsg_rpc_port          = '5672',
   $oslomsg_rpc_username      = 'guest',
   $oslomsg_use_ssl           = '0',
-  $step                      = hiera('step'),
+  $step                      = Integer(hiera('step')),
 ) {
   if $step >= 3 {
     $oslomsg_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_use_ssl)))
diff --git a/manifests/profile/base/octavia.pp b/manifests/profile/base/octavia.pp
index e8310d805..00252e361 100644
--- a/manifests/profile/base/octavia.pp
+++ b/manifests/profile/base/octavia.pp
@@ -47,7 +47,7 @@
 #   Defaults to hiera('octavia::rabbit_use_ssl', '0')
 
 class tripleo::profile::base::octavia (
-  $step                 = hiera('step'),
+  $step                 = Integer(hiera('step')),
   $oslomsg_rpc_proto    = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts    = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password = hiera('octavia::rabbit_password'),
diff --git a/manifests/profile/base/octavia/api.pp b/manifests/profile/base/octavia/api.pp
index d4574780e..2604711b6 100644
--- a/manifests/profile/base/octavia/api.pp
+++ b/manifests/profile/base/octavia/api.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::octavia::api (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/octavia/health_manager.pp b/manifests/profile/base/octavia/health_manager.pp
index bac5f6546..8bb486a36 100644
--- a/manifests/profile/base/octavia/health_manager.pp
+++ b/manifests/profile/base/octavia/health_manager.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::octavia::health_manager (
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::octavia
   if $step >= 5 {
diff --git a/manifests/profile/base/octavia/housekeeping.pp b/manifests/profile/base/octavia/housekeeping.pp
index 0dcd5cfe2..d6f85ac69 100644
--- a/manifests/profile/base/octavia/housekeeping.pp
+++ b/manifests/profile/base/octavia/housekeeping.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::octavia::housekeeping (
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::octavia
 
diff --git a/manifests/profile/base/octavia/worker.pp b/manifests/profile/base/octavia/worker.pp
index 7df324d7c..ce494557a 100644
--- a/manifests/profile/base/octavia/worker.pp
+++ b/manifests/profile/base/octavia/worker.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::octavia::worker (
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::octavia
 
diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp
index 811b9113d..264723b30 100644
--- a/manifests/profile/base/pacemaker.pp
+++ b/manifests/profile/base/pacemaker.pp
@@ -64,7 +64,7 @@
 #   Defaults to hiera('pacemaker_cluster_recheck_interval', undef)
 #
 class tripleo::profile::base::pacemaker (
-  $step                      = hiera('step'),
+  $step                      = Integer(hiera('step')),
   $pcs_tries                 = hiera('pcs_tries', 20),
   $remote_short_node_names   = hiera('pacemaker_remote_short_node_names', []),
   $remote_node_ips           = hiera('pacemaker_remote_node_ips', []),
diff --git a/manifests/profile/base/pacemaker_remote.pp b/manifests/profile/base/pacemaker_remote.pp
index dfe0a3e4d..6b9671359 100644
--- a/manifests/profile/base/pacemaker_remote.pp
+++ b/manifests/profile/base/pacemaker_remote.pp
@@ -39,7 +39,7 @@ class tripleo::profile::base::pacemaker_remote (
   $remote_authkey,
   $pcs_tries      = hiera('pcs_tries', 20),
   $enable_fencing = hiera('enable_fencing', false),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   class { '::pacemaker::remote':
     remote_authkey => $remote_authkey,
diff --git a/manifests/profile/base/panko.pp b/manifests/profile/base/panko.pp
index 286e4ac99..8c313397d 100644
--- a/manifests/profile/base/panko.pp
+++ b/manifests/profile/base/panko.pp
@@ -25,7 +25,7 @@
 #
 
 class tripleo::profile::base::panko (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   if $step >= 3 {
     include ::panko
diff --git a/manifests/profile/base/panko/api.pp b/manifests/profile/base/panko/api.pp
index 165969fd8..3b1b8d9fa 100644
--- a/manifests/profile/base/panko/api.pp
+++ b/manifests/profile/base/panko/api.pp
@@ -53,7 +53,7 @@ class tripleo::profile::base::panko::api (
   $certificates_specs            = hiera('apache_certificates_specs', {}),
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $panko_network                 = hiera('panko_api_network', undef),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/qdr.pp b/manifests/profile/base/qdr.pp
index 9827f2ed1..37cf9e527 100644
--- a/manifests/profile/base/qdr.pp
+++ b/manifests/profile/base/qdr.pp
@@ -40,7 +40,7 @@ class tripleo::profile::base::qdr (
   $qdr_username      = undef,
   $qdr_password      = undef,
   $qdr_listener_port = hiera('tripleo::profile::base::qdr::qdr_listener_port', 5672),
-  $step              = hiera('step'),
+  $step              = Integer(hiera('step')),
 ) {
   if $step >= 1 {
     class { '::qdr':
diff --git a/manifests/profile/base/rabbitmq.pp b/manifests/profile/base/rabbitmq.pp
index 8551f1963..8ab604959 100644
--- a/manifests/profile/base/rabbitmq.pp
+++ b/manifests/profile/base/rabbitmq.pp
@@ -88,7 +88,7 @@ class tripleo::profile::base::rabbitmq (
   $rabbitmq_pass                 = hiera('rabbitmq::default_pass'),
   $rabbitmq_user                 = hiera('rabbitmq::default_user'),
   $stack_action                  = hiera('stack_action'),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
 ) {
   if $enable_internal_tls {
     $tls_certfile = $certificate_specs['service_certificate']
diff --git a/manifests/profile/base/sahara.pp b/manifests/profile/base/sahara.pp
index 7f4ecbeb3..d46530433 100644
--- a/manifests/profile/base/sahara.pp
+++ b/manifests/profile/base/sahara.pp
@@ -72,7 +72,7 @@
 
 class tripleo::profile::base::sahara (
   $bootstrap_node          = hiera('bootstrap_nodeid', undef),
-  $step                    = hiera('step'),
+  $step                    = Integer(hiera('step')),
   $oslomsg_rpc_proto       = hiera('messaging_rpc_service_name', 'rabbit'),
   $oslomsg_rpc_hosts       = any2array(hiera('rabbitmq_node_names', undef)),
   $oslomsg_rpc_password    = hiera('sahara::rabbit_password'),
diff --git a/manifests/profile/base/sahara/api.pp b/manifests/profile/base/sahara/api.pp
index 1ead1061e..83f195667 100644
--- a/manifests/profile/base/sahara/api.pp
+++ b/manifests/profile/base/sahara/api.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::sahara::api (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
   include ::tripleo::profile::base::sahara
 
diff --git a/manifests/profile/base/sahara/engine.pp b/manifests/profile/base/sahara/engine.pp
index e2da0e725..1bbbfa2fd 100644
--- a/manifests/profile/base/sahara/engine.pp
+++ b/manifests/profile/base/sahara/engine.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::sahara::engine (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/securetty.pp b/manifests/profile/base/securetty.pp
index 07f29f8b2..5c36fe642 100644
--- a/manifests/profile/base/securetty.pp
+++ b/manifests/profile/base/securetty.pp
@@ -29,7 +29,7 @@
 #  Defaults to hiera('securetty::tty_list')
 #
 class tripleo::profile::base::securetty (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
   $tty_list = hiera('tty_list', []),
 ) {
   validate_array($tty_list)
diff --git a/manifests/profile/base/snmp.pp b/manifests/profile/base/snmp.pp
index d12e34d02..ecef5ae21 100644
--- a/manifests/profile/base/snmp.pp
+++ b/manifests/profile/base/snmp.pp
@@ -34,7 +34,7 @@
 class tripleo::profile::base::snmp (
   $snmpd_password = hiera('snmpd_readonly_user_password'),
   $snmpd_user     = hiera('snmpd_readonly_user_name'),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     snmp::snmpv3_user { $snmpd_user:
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index 4e0e568d2..b047c3683 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -107,7 +107,7 @@ class tripleo::profile::base::swift::proxy (
   $enable_internal_tls           = hiera('enable_internal_tls', false),
   $memcache_port                 = 11211,
   $memcache_servers              = hiera('memcached_node_ips'),
-  $step                          = hiera('step'),
+  $step                          = Integer(hiera('step')),
   $swift_proxy_network           = hiera('swift_proxy_network', undef),
   $tls_proxy_bind_ip             = undef,
   $tls_proxy_fqdn                = undef,
diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index 67156d4ec..3ab3234da 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -77,7 +77,7 @@ class tripleo::profile::base::swift::ringbuilder (
   $replicas,
   $build_ring  = true,
   $devices     = undef,
-  $step        = hiera('step'),
+  $step        = Integer(hiera('step')),
   $swift_zones = '1',
   $raw_disk_prefix = 'r1z1-',
   $raw_disks = [],
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp
index 5018d778e..3d0ba1617 100644
--- a/manifests/profile/base/swift/storage.pp
+++ b/manifests/profile/base/swift/storage.pp
@@ -30,7 +30,7 @@
 class tripleo::profile::base::swift::storage (
   # Deprecated conditional to support ControllerEnableSwiftStorage parameter
   $enable_swift_storage = true,
-  $step                 = hiera('step'),
+  $step                 = Integer(hiera('step')),
 ) {
   if $step >= 4 {
     if $enable_swift_storage {
diff --git a/manifests/profile/base/tacker.pp b/manifests/profile/base/tacker.pp
index fa85ec105..5d3a54f84 100644
--- a/manifests/profile/base/tacker.pp
+++ b/manifests/profile/base/tacker.pp
@@ -58,7 +58,7 @@ class tripleo::profile::base::tacker (
   $oslomsg_rpc_port     = hiera('tacker::rabbit_port', '5672'),
   $oslomsg_rpc_username = hiera('tacker::rabbit_userid', 'guest'),
   $oslomsg_use_ssl      = hiera('tacker::rabbit_use_ssl', '0'),
-  $step                 = hiera('step'),
+  $step                 = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/trove/api.pp b/manifests/profile/base/trove/api.pp
index bc16e6e0b..aac592360 100644
--- a/manifests/profile/base/trove/api.pp
+++ b/manifests/profile/base/trove/api.pp
@@ -29,7 +29,7 @@
 #
 class tripleo::profile::base::trove::api (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
diff --git a/manifests/profile/base/trove/conductor.pp b/manifests/profile/base/trove/conductor.pp
index 0e95a40c9..cc6f03938 100644
--- a/manifests/profile/base/trove/conductor.pp
+++ b/manifests/profile/base/trove/conductor.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::trove::conductor (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
 
   if $step >= 4 {
diff --git a/manifests/profile/base/trove/taskmanager.pp b/manifests/profile/base/trove/taskmanager.pp
index 3972c29be..7fc2a8128 100644
--- a/manifests/profile/base/trove/taskmanager.pp
+++ b/manifests/profile/base/trove/taskmanager.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::trove::taskmanager (
-  $step = hiera('step'),
+  $step = Integer(hiera('step')),
 ) {
 
   if $step >= 4 {
diff --git a/manifests/profile/base/vpp.pp b/manifests/profile/base/vpp.pp
index 05f52f980..90bc54e4f 100644
--- a/manifests/profile/base/vpp.pp
+++ b/manifests/profile/base/vpp.pp
@@ -24,7 +24,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::vpp (
-  $step        = hiera('step'),
+  $step        = Integer(hiera('step')),
 ) {
   if $step >= 1 {
     include ::fdio
diff --git a/manifests/profile/base/zaqar.pp b/manifests/profile/base/zaqar.pp
index 243dcc78f..b9171b07d 100644
--- a/manifests/profile/base/zaqar.pp
+++ b/manifests/profile/base/zaqar.pp
@@ -28,7 +28,7 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::zaqar (
-  $step             = hiera('step'),
+  $step             = Integer(hiera('step')),
 ) {
   if $step >= 4  {
     include ::zaqar
diff --git a/manifests/profile/pacemaker/ceph/rbdmirror.pp b/manifests/profile/pacemaker/ceph/rbdmirror.pp
index 4066225f7..6b566a786 100644
--- a/manifests/profile/pacemaker/ceph/rbdmirror.pp
+++ b/manifests/profile/pacemaker/ceph/rbdmirror.pp
@@ -45,7 +45,7 @@ class tripleo::profile::pacemaker::ceph::rbdmirror (
   $client_name    = 'openstack',
   $pcs_tries      = hiera('pcs_tries', 20),
   $stack_action   = hiera('stack_action'),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   Service <| tag == 'ceph-rbd-mirror' |> {
     hasrestart => true,
diff --git a/manifests/profile/pacemaker/cinder/backup.pp b/manifests/profile/pacemaker/cinder/backup.pp
index ff0d8c9d9..933a7353e 100644
--- a/manifests/profile/pacemaker/cinder/backup.pp
+++ b/manifests/profile/pacemaker/cinder/backup.pp
@@ -33,7 +33,7 @@
 #
 class tripleo::profile::pacemaker::cinder::backup (
   $bootstrap_node = hiera('cinder_backup_short_bootstrap_node_name'),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
   $pcs_tries      = hiera('pcs_tries', 20),
 ) {
 
diff --git a/manifests/profile/pacemaker/cinder/backup_bundle.pp b/manifests/profile/pacemaker/cinder/backup_bundle.pp
index cd069861f..a5e1a9bda 100644
--- a/manifests/profile/pacemaker/cinder/backup_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/backup_bundle.pp
@@ -40,7 +40,7 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
   $bootstrap_node             = hiera('cinder_backup_short_bootstrap_node_name'),
   $cinder_backup_docker_image = hiera('tripleo::profile::pacemaker::cinder::backup_bundle::cinder_backup_docker_image', undef),
   $pcs_tries                  = hiera('pcs_tries', 20),
-  $step                       = hiera('step'),
+  $step                       = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $pacemaker_master = true
diff --git a/manifests/profile/pacemaker/cinder/volume.pp b/manifests/profile/pacemaker/cinder/volume.pp
index 0d6a59837..e9934261a 100644
--- a/manifests/profile/pacemaker/cinder/volume.pp
+++ b/manifests/profile/pacemaker/cinder/volume.pp
@@ -33,7 +33,7 @@
 #
 class tripleo::profile::pacemaker::cinder::volume (
   $bootstrap_node = hiera('cinder_volume_short_bootstrap_node_name'),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
   $pcs_tries      = hiera('pcs_tries', 20),
 ) {
   Service <| tag == 'cinder::volume' |> {
diff --git a/manifests/profile/pacemaker/cinder/volume_bundle.pp b/manifests/profile/pacemaker/cinder/volume_bundle.pp
index f0858c91d..39199a590 100644
--- a/manifests/profile/pacemaker/cinder/volume_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/volume_bundle.pp
@@ -40,7 +40,7 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
   $bootstrap_node             = hiera('cinder_volume_short_bootstrap_node_name'),
   $cinder_volume_docker_image = hiera('tripleo::profile::pacemaker::cinder::volume_bundle::cinder_volume_docker_image', undef),
   $pcs_tries                  = hiera('pcs_tries', 20),
-  $step                       = hiera('step'),
+  $step                       = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $pacemaker_master = true
diff --git a/manifests/profile/pacemaker/clustercheck.pp b/manifests/profile/pacemaker/clustercheck.pp
index fad30da0d..958f4a261 100644
--- a/manifests/profile/pacemaker/clustercheck.pp
+++ b/manifests/profile/pacemaker/clustercheck.pp
@@ -32,7 +32,7 @@
 #
 #
 class tripleo::profile::pacemaker::clustercheck (
-  $step                  = hiera('step'),
+  $step                  = Integer(hiera('step')),
   $clustercheck_password = hiera('mysql::server::root_password'),
   $bind_address          = hiera('mysql_bind_host'),
 ) {
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index d42d55757..3aff62fe9 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 (
   $bootstrap_node     = hiera('mysql_short_bootstrap_node_name'),
   $bind_address       = $::hostname,
   $gmcast_listen_addr = hiera('mysql_bind_host'),
-  $step               = hiera('step'),
+  $step               = Integer(hiera('step')),
   $pcs_tries          = hiera('pcs_tries', 20),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/pacemaker/database/mysql_bundle.pp b/manifests/profile/pacemaker/database/mysql_bundle.pp
index a127a5c72..56e9e28ab 100644
--- a/manifests/profile/pacemaker/database/mysql_bundle.pp
+++ b/manifests/profile/pacemaker/database/mysql_bundle.pp
@@ -56,7 +56,7 @@ class tripleo::profile::pacemaker::database::mysql_bundle (
   $bind_address       = $::hostname,
   $gmcast_listen_addr = hiera('mysql_bind_host'),
   $pcs_tries          = hiera('pcs_tries', 20),
-  $step               = hiera('step'),
+  $step               = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $pacemaker_master = true
diff --git a/manifests/profile/pacemaker/database/redis.pp b/manifests/profile/pacemaker/database/redis.pp
index 4f5a861d2..bc91be77e 100644
--- a/manifests/profile/pacemaker/database/redis.pp
+++ b/manifests/profile/pacemaker/database/redis.pp
@@ -46,7 +46,7 @@
 class tripleo::profile::pacemaker::database::redis (
   $bootstrap_node       = hiera('redis_short_bootstrap_node_name'),
   $enable_load_balancer = hiera('enable_load_balancer', true),
-  $step                 = hiera('step'),
+  $step                 = Integer(hiera('step')),
   $redis_file_limit     = undef,
   $pcs_tries            = hiera('pcs_tries', 20),
 ) {
diff --git a/manifests/profile/pacemaker/database/redis_bundle.pp b/manifests/profile/pacemaker/database/redis_bundle.pp
index 8e30c2fff..dd090d7b8 100644
--- a/manifests/profile/pacemaker/database/redis_bundle.pp
+++ b/manifests/profile/pacemaker/database/redis_bundle.pp
@@ -45,7 +45,7 @@ class tripleo::profile::pacemaker::database::redis_bundle (
   $redis_docker_image        = hiera('tripleo::profile::pacemaker::database::redis_bundle::redis_docker_image', undef),
   $redis_docker_control_port = hiera('tripleo::profile::pacemaker::database::redis_bundle::control_port', '3124'),
   $pcs_tries                 = hiera('pcs_tries', 20),
-  $step                      = hiera('step'),
+  $step                      = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $pacemaker_master = true
diff --git a/manifests/profile/pacemaker/haproxy.pp b/manifests/profile/pacemaker/haproxy.pp
index f006f780d..73310717c 100644
--- a/manifests/profile/pacemaker/haproxy.pp
+++ b/manifests/profile/pacemaker/haproxy.pp
@@ -38,7 +38,7 @@
 class tripleo::profile::pacemaker::haproxy (
   $bootstrap_node       = hiera('haproxy_short_bootstrap_node_name'),
   $enable_load_balancer = hiera('enable_load_balancer', true),
-  $step                 = hiera('step'),
+  $step                 = Integer(hiera('step')),
   $pcs_tries            = hiera('pcs_tries', 20),
 ) {
   include ::tripleo::profile::base::haproxy
diff --git a/manifests/profile/pacemaker/haproxy_bundle.pp b/manifests/profile/pacemaker/haproxy_bundle.pp
index 292c9ddc7..9c1bdf36d 100644
--- a/manifests/profile/pacemaker/haproxy_bundle.pp
+++ b/manifests/profile/pacemaker/haproxy_bundle.pp
@@ -43,7 +43,7 @@ class tripleo::profile::pacemaker::haproxy_bundle (
   $haproxy_docker_image = hiera('tripleo::profile::pacemaker::haproxy::haproxy_docker_image', undef),
   $bootstrap_node       = hiera('haproxy_short_bootstrap_node_name'),
   $enable_load_balancer = hiera('enable_load_balancer', true),
-  $step                 = hiera('step'),
+  $step                 = Integer(hiera('step')),
   $pcs_tries            = hiera('pcs_tries', 20),
 ) {
   include ::tripleo::profile::base::haproxy
diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp
index 7bcf8d651..c22a033a7 100644
--- a/manifests/profile/pacemaker/manila.pp
+++ b/manifests/profile/pacemaker/manila.pp
@@ -55,7 +55,7 @@ class tripleo::profile::pacemaker::manila (
   $backend_cephfs_enabled  = hiera('manila_backend_cephfs_enabled', false),
   $ceph_mds_enabled        = hiera('ceph_mds_enabled', false),
   $bootstrap_node          = hiera('manila_share_short_bootstrap_node_name'),
-  $step                    = hiera('step'),
+  $step                    = Integer(hiera('step')),
   $pcs_tries               = hiera('pcs_tries', 20),
 ) {
   if $::hostname == downcase($bootstrap_node) {
diff --git a/manifests/profile/pacemaker/neutron/lbaas.pp b/manifests/profile/pacemaker/neutron/lbaas.pp
index 96712d4ef..9e86dfe8b 100644
--- a/manifests/profile/pacemaker/neutron/lbaas.pp
+++ b/manifests/profile/pacemaker/neutron/lbaas.pp
@@ -28,7 +28,7 @@
 #   Defaults to hiera('bootstrap_nodeid')
 #
 class tripleo::profile::pacemaker::neutron::lbaas (
-  $step             = hiera('step'),
+  $step             = Integer(hiera('step')),
   $pacemaker_master = hiera('bootstrap_nodeid'),
 ) {
 
diff --git a/manifests/profile/pacemaker/ovn_northd.pp b/manifests/profile/pacemaker/ovn_northd.pp
index af946af5b..fcf14ff1f 100644
--- a/manifests/profile/pacemaker/ovn_northd.pp
+++ b/manifests/profile/pacemaker/ovn_northd.pp
@@ -46,7 +46,7 @@
 
 class tripleo::profile::pacemaker::ovn_northd (
   $pacemaker_master = hiera('ovn_dbs_short_bootstrap_node_name'),
-  $step             = hiera('step'),
+  $step             = Integer(hiera('step')),
   $pcs_tries        = hiera('pcs_tries', 20),
   $ovn_dbs_vip      = hiera('ovn_dbs_vip'),
   $nb_db_port       = 6641,
diff --git a/manifests/profile/pacemaker/rabbitmq.pp b/manifests/profile/pacemaker/rabbitmq.pp
index bf6a38d59..3d87598ca 100644
--- a/manifests/profile/pacemaker/rabbitmq.pp
+++ b/manifests/profile/pacemaker/rabbitmq.pp
@@ -51,7 +51,7 @@ class tripleo::profile::pacemaker::rabbitmq (
   $user_ha_queues = hiera('rabbitmq::nr_ha_queues', 0),
   $rabbit_nodes   = hiera('rabbitmq_node_names'),
   $pcs_tries      = hiera('pcs_tries', 20),
-  $step           = hiera('step'),
+  $step           = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $pacemaker_master = true
diff --git a/manifests/profile/pacemaker/rabbitmq_bundle.pp b/manifests/profile/pacemaker/rabbitmq_bundle.pp
index f6c5044b7..0a6295c01 100644
--- a/manifests/profile/pacemaker/rabbitmq_bundle.pp
+++ b/manifests/profile/pacemaker/rabbitmq_bundle.pp
@@ -61,7 +61,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
   $user_ha_queues               = hiera('rabbitmq::nr_ha_queues', 0),
   $rabbit_nodes                 = hiera('rabbitmq_node_names'),
   $pcs_tries                    = hiera('pcs_tries', 20),
-  $step                         = hiera('step'),
+  $step                         = Integer(hiera('step')),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $pacemaker_master = true