diff --git a/packstack/puppet/modules/packstack/manifests/amqp/enable_rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/amqp/enable_rabbitmq.pp
index 69924f6a9..bc858d2fd 100644
--- a/packstack/puppet/modules/packstack/manifests/amqp/enable_rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/amqp/enable_rabbitmq.pp
@@ -21,7 +21,7 @@ define packstack::amqp::enable_rabbitmq {
       notify  => Service['rabbitmq-server'],
     }
 
-    class { '::rabbitmq':
+    class { 'rabbitmq':
       port                     => undef,
       ssl_port                 => 0 + hiera('CONFIG_AMQP_CLIENTS_PORT'),
       ssl_only                 => true,
@@ -42,7 +42,7 @@ define packstack::amqp::enable_rabbitmq {
       tcp_backlog              => 128,
     }
   } else {
-    class { '::rabbitmq':
+    class { 'rabbitmq':
       port             => 0 + hiera('CONFIG_AMQP_CLIENTS_PORT'),
       ssl              => false,
       default_user     => hiera('CONFIG_AMQP_AUTH_USER'),
diff --git a/packstack/puppet/modules/packstack/manifests/aodh.pp b/packstack/puppet/modules/packstack/manifests/aodh.pp
index de8d03d31..94d80b3f0 100644
--- a/packstack/puppet/modules/packstack/manifests/aodh.pp
+++ b/packstack/puppet/modules/packstack/manifests/aodh.pp
@@ -12,31 +12,31 @@ class packstack::aodh ()
       $coordination_url = ''
     }
 
-    class { '::aodh::keystone::authtoken':
+    class { 'aodh::keystone::authtoken':
       password => hiera('CONFIG_AODH_KS_PW'),
       auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
     }
 
-    class { '::aodh::api':
+    class { 'aodh::api':
       enabled      => true,
       service_name => 'httpd',
       sync_db      => true,
     }
 
-    class { '::aodh::wsgi::apache':
+    class { 'aodh::wsgi::apache':
       workers => hiera('CONFIG_SERVICE_WORKERS'),
       ssl     => false
     }
 
-    class { '::aodh::service_credentials':
+    class { 'aodh::service_credentials':
       password    => hiera('CONFIG_AODH_KS_PW'),
       auth_url    => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
       region_name => hiera('CONFIG_KEYSTONE_REGION'),
     }
-    class { '::aodh::evaluator':
+    class { 'aodh::evaluator':
       coordination_url => $coordination_url,
     }
-    class { '::aodh::notifier': }
-    class { '::aodh::listener': }
-    class { '::aodh::client': }
+    class { 'aodh::notifier': }
+    class { 'aodh::listener': }
+    class { 'aodh::client': }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/aodh/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/aodh/rabbitmq.pp
index be3883ac5..b9e96d750 100644
--- a/packstack/puppet/modules/packstack/manifests/aodh/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/aodh/rabbitmq.pp
@@ -23,11 +23,11 @@ class packstack::aodh::rabbitmq ()
       File[$files_to_set_owner] ~> Service<| tag == 'aodh-service' |>
     }
 
-    class { '::aodh::logging':
+    class { 'aodh::logging':
       debug => hiera('CONFIG_DEBUG_MODE'),
     }
 
-    class { '::aodh':
+    class { 'aodh':
       rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
       kombu_ssl_ca_certs    => $kombu_ssl_ca_certs,
diff --git a/packstack/puppet/modules/packstack/manifests/apache.pp b/packstack/puppet/modules/packstack/manifests/apache.pp
index 47d610d06..2ad0c667b 100644
--- a/packstack/puppet/modules/packstack/manifests/apache.pp
+++ b/packstack/puppet/modules/packstack/manifests/apache.pp
@@ -2,7 +2,7 @@ class packstack::apache ()
 {
     # Use python3 for mod_wsg in fedora
     if ($::operatingsystem == 'Fedora') or ($::osfamily == 'RedHat' and Integer.new($::operatingsystemmajrelease) > 7)  {
-      class { '::apache':
+      class { 'apache':
         mod_packages  => merge($::apache::params::mod_packages, {
           'wsgi' => 'python3-mod_wsgi',
         }),
@@ -11,7 +11,7 @@ class packstack::apache ()
         })
       }
     }else{
-      class {'::apache':
+      class { 'apache':
       }
     }
 
diff --git a/packstack/puppet/modules/packstack/manifests/ceilometer.pp b/packstack/puppet/modules/packstack/manifests/ceilometer.pp
index dbdea29e0..c48938b27 100644
--- a/packstack/puppet/modules/packstack/manifests/ceilometer.pp
+++ b/packstack/puppet/modules/packstack/manifests/ceilometer.pp
@@ -26,7 +26,7 @@ class packstack::ceilometer ()
       $coordination_url = ''
     }
 
-    include ::ceilometer
+    include ceilometer
 
     exec {'ceilometer-db-upgrade':
       command   => 'ceilometer-upgrade',
@@ -38,18 +38,18 @@ class packstack::ceilometer ()
     Keystone::Resource::Service_identity<||> -> Exec['ceilometer-db-upgrade']
       ~> Service['ceilometer-agent-notification']
 
-    class { '::ceilometer::agent::notification':
+    class { 'ceilometer::agent::notification':
       manage_event_pipeline     => true,
       event_pipeline_publishers => ['gnocchi://', 'panko://'],
     }
 
-    class { '::ceilometer::agent::service_credentials':
+    class { 'ceilometer::agent::service_credentials':
       auth_url    => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
       password    => hiera('CONFIG_CEILOMETER_KS_PW'),
       region_name => hiera('CONFIG_KEYSTONE_REGION'),
     }
 
-    class { '::ceilometer::agent::polling':
+    class { 'ceilometer::agent::polling':
       manage_polling   => true,
       coordination_url => $coordination_url,
     }
diff --git a/packstack/puppet/modules/packstack/manifests/ceilometer/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/ceilometer/rabbitmq.pp
index 9cd155318..79e0d0475 100644
--- a/packstack/puppet/modules/packstack/manifests/ceilometer/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/ceilometer/rabbitmq.pp
@@ -19,11 +19,11 @@ class packstack::ceilometer::rabbitmq ()
       File[$files_to_set_owner] ~> Service<| tag == 'ceilometer-service' |>
     }
 
-    class { '::ceilometer::logging':
+    class { 'ceilometer::logging':
       debug => hiera('CONFIG_DEBUG_MODE'),
     }
 
-    class { '::ceilometer':
+    class { 'ceilometer':
       telemetry_secret      => hiera('CONFIG_CEILOMETER_SECRET'),
       rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
diff --git a/packstack/puppet/modules/packstack/manifests/cinder.pp b/packstack/puppet/modules/packstack/manifests/cinder.pp
index 397bdea74..1ba1ceca2 100644
--- a/packstack/puppet/modules/packstack/manifests/cinder.pp
+++ b/packstack/puppet/modules/packstack/manifests/cinder.pp
@@ -24,23 +24,23 @@ class packstack::cinder ()
       # TO-DO(mmagr): Add IPv6 support when hostnames are used
     }
 
-    class { '::cinder::keystone::authtoken':
+    class { 'cinder::keystone::authtoken':
       www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
       auth_url             => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
       password             => hiera('CONFIG_CINDER_KS_PW'),
     }
 
-    class { '::cinder::api':
+    class { 'cinder::api':
       bind_host           => $bind_host,
       service_workers     => hiera('CONFIG_SERVICE_WORKERS'),
       default_volume_type => $default_volume_type,
     }
 
-    class { '::cinder::scheduler': }
+    class { 'cinder::scheduler': }
 
-    class { '::cinder::volume': }
+    class { 'cinder::volume': }
 
-    class { '::cinder::client': }
+    class { 'cinder::client': }
 
     $cinder_keystone_admin_username = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')
     $cinder_keystone_admin_password = hiera('CONFIG_KEYSTONE_ADMIN_PW')
@@ -55,13 +55,13 @@ class packstack::cinder ()
       os_auth_url    => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
     }
 
-    class { '::cinder::backends':
+    class { 'cinder::backends':
       enabled_backends => hiera_array('CONFIG_CINDER_BACKEND'),
     }
 
     $db_purge = hiera('CONFIG_CINDER_DB_PURGE_ENABLE')
     if $db_purge {
-      class { '::cinder::cron::db_purge':
+      class { 'cinder::cron::db_purge':
         hour        => '*/24',
         destination => '/dev/null',
         age         => 1
diff --git a/packstack/puppet/modules/packstack/manifests/cinder/backend/lvm.pp b/packstack/puppet/modules/packstack/manifests/cinder/backend/lvm.pp
index bd0e0eafb..f0bcb9da8 100644
--- a/packstack/puppet/modules/packstack/manifests/cinder/backend/lvm.pp
+++ b/packstack/puppet/modules/packstack/manifests/cinder/backend/lvm.pp
@@ -7,7 +7,7 @@ class packstack::cinder::backend::lvm ()
         # Find an available loop device
         $loop_dev = chomp(generate('/usr/sbin/losetup', '-f'))
 
-        class { '::cinder::setup_test_volume':
+        class { 'cinder::setup_test_volume':
           size            => hiera('CONFIG_CINDER_VOLUMES_SIZE'),
           loopback_device => $loop_dev,
           volume_path     => '/var/lib/cinder',
diff --git a/packstack/puppet/modules/packstack/manifests/cinder/backup.pp b/packstack/puppet/modules/packstack/manifests/cinder/backup.pp
index 4d4478aaa..190932c12 100644
--- a/packstack/puppet/modules/packstack/manifests/cinder/backup.pp
+++ b/packstack/puppet/modules/packstack/manifests/cinder/backup.pp
@@ -1,10 +1,10 @@
 class packstack::cinder::backup ()
 {
-    class { '::cinder::backup': }
+    class { 'cinder::backup': }
 
     $cinder_backup_conf_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
 
-    class { '::cinder::backup::swift':
+    class { 'cinder::backup::swift':
       backup_swift_url => "http://${cinder_backup_conf_ctrl_host}:8080/v1/AUTH_",
     }
 
diff --git a/packstack/puppet/modules/packstack/manifests/cinder/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/cinder/rabbitmq.pp
index 3ef79abb0..0e91fdb5d 100644
--- a/packstack/puppet/modules/packstack/manifests/cinder/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/cinder/rabbitmq.pp
@@ -22,11 +22,11 @@ class packstack::cinder::rabbitmq ()
       }
     }
 
-    class { '::cinder::logging':
+    class { 'cinder::logging':
       debug => hiera('CONFIG_DEBUG_MODE'),
     }
 
-    class { '::cinder':
+    class { 'cinder':
       rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
       database_connection   => "mysql+pymysql://cinder:${cinder_rab_cfg_cinder_db_pw}@${cinder_rab_cfg_mariadb_host}/cinder",
diff --git a/packstack/puppet/modules/packstack/manifests/glance.pp b/packstack/puppet/modules/packstack/manifests/glance.pp
index 5b9c6a6ea..ec883802c 100644
--- a/packstack/puppet/modules/packstack/manifests/glance.pp
+++ b/packstack/puppet/modules/packstack/manifests/glance.pp
@@ -18,17 +18,17 @@ class packstack::glance ()
       default => 'file',
     }
 
-    class { '::glance::api::authtoken':
+    class { 'glance::api::authtoken':
       www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
       auth_url             => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
       password             => hiera('CONFIG_GLANCE_KS_PW'),
     }
 
-    class { '::glance::api::logging':
+    class { 'glance::api::logging':
       debug => hiera('CONFIG_DEBUG_MODE'),
     }
 
-    class { '::glance::api':
+    class { 'glance::api':
       bind_host           => $bind_host,
       pipeline            => 'keystone',
       database_connection => "mysql+pymysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
diff --git a/packstack/puppet/modules/packstack/manifests/glance/backend/file.pp b/packstack/puppet/modules/packstack/manifests/glance/backend/file.pp
index 224dac6ec..58b88bc74 100644
--- a/packstack/puppet/modules/packstack/manifests/glance/backend/file.pp
+++ b/packstack/puppet/modules/packstack/manifests/glance/backend/file.pp
@@ -1,7 +1,7 @@
 class packstack::glance::backend::file ()
 {
     # TO-DO: Make this configurable
-    class { '::glance::backend::file':
+    class { 'glance::backend::file':
       filesystem_store_datadir => '/var/lib/glance/images/',
     }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/glance/backend/swift.pp b/packstack/puppet/modules/packstack/manifests/glance/backend/swift.pp
index 9095427d0..02af7fb16 100644
--- a/packstack/puppet/modules/packstack/manifests/glance/backend/swift.pp
+++ b/packstack/puppet/modules/packstack/manifests/glance/backend/swift.pp
@@ -7,7 +7,7 @@ class packstack::glance::backend::swift ()
       default => '3',
     }
 
-    class { '::glance::backend::swift':
+    class { 'glance::backend::swift':
       swift_store_user                    => 'services:glance',
       swift_store_key                     => hiera('CONFIG_GLANCE_KS_PW'),
       swift_store_auth_address            => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
diff --git a/packstack/puppet/modules/packstack/manifests/glance/ceilometer.pp b/packstack/puppet/modules/packstack/manifests/glance/ceilometer.pp
index ddda31325..43d5259b3 100644
--- a/packstack/puppet/modules/packstack/manifests/glance/ceilometer.pp
+++ b/packstack/puppet/modules/packstack/manifests/glance/ceilometer.pp
@@ -18,7 +18,7 @@ class packstack::glance::ceilometer ()
         notify  => Service['glance-api'],
       }
     }
-    class { '::glance::notify::rabbitmq':
+    class { 'glance::notify::rabbitmq':
       rabbit_notification_exchange => 'glance',
       rabbit_notification_topic    => 'notifications',
       rabbit_use_ssl               => hiera('CONFIG_AMQP_SSL_ENABLED'),
diff --git a/packstack/puppet/modules/packstack/manifests/gnocchi.pp b/packstack/puppet/modules/packstack/manifests/gnocchi.pp
index 1c60f7882..d5e4633df 100644
--- a/packstack/puppet/modules/packstack/manifests/gnocchi.pp
+++ b/packstack/puppet/modules/packstack/manifests/gnocchi.pp
@@ -5,40 +5,40 @@ class packstack::gnocchi ()
     $gnocchi_cfg_db_pw = hiera('CONFIG_GNOCCHI_DB_PW')
     $gnocchi_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
 
-    class { '::gnocchi::wsgi::apache':
+    class { 'gnocchi::wsgi::apache':
       workers => hiera('CONFIG_SERVICE_WORKERS'),
       ssl     => false
     }
 
-    class { '::gnocchi':
+    class { 'gnocchi':
     }
 
-    class { '::gnocchi::keystone::authtoken':
+    class { 'gnocchi::keystone::authtoken':
       www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
       auth_url             => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
       auth_version         => hiera('CONFIG_KEYSTONE_API_VERSION'),
       password             => hiera('CONFIG_GNOCCHI_KS_PW')
     }
 
-    class { '::gnocchi::db':
+    class { 'gnocchi::db':
       database_connection => "mysql+pymysql://gnocchi:${gnocchi_cfg_db_pw}@${gnocchi_cfg_mariadb_host}/gnocchi?charset=utf8",
     }
 
-    class { '::gnocchi::api':
+    class { 'gnocchi::api':
       service_name => 'httpd',
       sync_db      => true,
     }
 
-    class { '::gnocchi::storage': }
-    class { '::gnocchi::storage::file': }
+    class { 'gnocchi::storage': }
+    class { 'gnocchi::storage::file': }
 
-    class {'::gnocchi::metricd': }
+    class { 'gnocchi::metricd': }
 
-    class {'::gnocchi::statsd':
+    class { 'gnocchi::statsd':
       resource_id         => '5e3fcbe2-7aab-475d-b42c-a440aa42e5ad',
       archive_policy_name => 'high',
       flush_delay         => '10',
     }
 
-    include ::gnocchi::client
+    include gnocchi::client
 }
diff --git a/packstack/puppet/modules/packstack/manifests/heat.pp b/packstack/puppet/modules/packstack/manifests/heat.pp
index 2b64ae46e..fff899261 100644
--- a/packstack/puppet/modules/packstack/manifests/heat.pp
+++ b/packstack/puppet/modules/packstack/manifests/heat.pp
@@ -2,21 +2,21 @@ class packstack::heat ()
 {
     create_resources(packstack::firewall, hiera('FIREWALL_HEAT_RULES', {}))
 
-    class { '::heat::api':
+    class { 'heat::api':
       workers => hiera('CONFIG_SERVICE_WORKERS'),
     }
 
     $keystone_admin = hiera('CONFIG_KEYSTONE_ADMIN_USERNAME')
     $heat_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
 
-    class { '::heat::engine':
+    class { 'heat::engine':
       heat_metadata_server_url      => "http://${heat_cfg_ctrl_host}:8000",
       heat_waitcondition_server_url => "http://${heat_cfg_ctrl_host}:8000/v1/waitcondition",
       auth_encryption_key           => hiera('CONFIG_HEAT_AUTH_ENC_KEY'),
       num_engine_workers            => hiera('CONFIG_SERVICE_WORKERS'),
     }
 
-    class { '::heat::keystone::domain':
+    class { 'heat::keystone::domain':
       domain_name     => hiera('CONFIG_HEAT_DOMAIN'),
       domain_admin    => hiera('CONFIG_HEAT_DOMAIN_ADMIN'),
       domain_password => hiera('CONFIG_HEAT_DOMAIN_PASSWORD'),
diff --git a/packstack/puppet/modules/packstack/manifests/heat/cfn.pp b/packstack/puppet/modules/packstack/manifests/heat/cfn.pp
index c4ca58460..9c059b66d 100644
--- a/packstack/puppet/modules/packstack/manifests/heat/cfn.pp
+++ b/packstack/puppet/modules/packstack/manifests/heat/cfn.pp
@@ -2,13 +2,13 @@ class packstack::heat::cfn ()
 {
     create_resources(packstack::firewall, hiera('FIREWALL_HEAT_CFN_RULES', {}))
 
-    class { '::heat::api_cfn':
+    class { 'heat::api_cfn':
       workers => hiera('CONFIG_SERVICE_WORKERS'),
     }
 
     $heat_cfn_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
 
-    class { '::heat::keystone::auth_cfn':
+    class { 'heat::keystone::auth_cfn':
       admin_url    => "http://${heat_cfn_cfg_ctrl_host}:8000/v1",
       public_url   => "http://${heat_cfn_cfg_ctrl_host}:8000/v1",
       internal_url => "http://${heat_cfn_cfg_ctrl_host}:8000/v1",
diff --git a/packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp
index adf25d209..dd2435124 100644
--- a/packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp
@@ -28,17 +28,17 @@ class packstack::heat::rabbitmq ()
       $heat_notification_driver = $::os_service_default
     }
 
-    class { '::heat::keystone::authtoken':
+    class { 'heat::keystone::authtoken':
       password             => hiera('CONFIG_HEAT_KS_PW'),
       www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
       auth_url             => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
     }
 
-    class { '::heat::logging':
+    class { 'heat::logging':
       debug => hiera('CONFIG_DEBUG_MODE'),
     }
 
-    class { '::heat':
+    class { 'heat':
       keystone_ec2_uri      => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
       rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
diff --git a/packstack/puppet/modules/packstack/manifests/horizon.pp b/packstack/puppet/modules/packstack/manifests/horizon.pp
index a772215c3..eaa2f78b5 100644
--- a/packstack/puppet/modules/packstack/manifests/horizon.pp
+++ b/packstack/puppet/modules/packstack/manifests/horizon.pp
@@ -16,7 +16,7 @@ class packstack::horizon ()
       'n' => false,
     }
 
-    class {'::horizon':
+    class { 'horizon':
       secret_key            => hiera('CONFIG_HORIZON_SECRET_KEY'),
       keystone_url          => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
       keystone_default_role => '_member_',
@@ -60,7 +60,7 @@ class packstack::horizon ()
       ensure_packages(['openstack-heat-ui'], {'ensure' => 'present'})
     }
 
-    include '::packstack::memcached'
+    include packstack::memcached
 
     $firewall_port = hiera('CONFIG_HORIZON_PORT')
 
diff --git a/packstack/puppet/modules/packstack/manifests/ironic.pp b/packstack/puppet/modules/packstack/manifests/ironic.pp
index 4809ed59c..13de258cc 100644
--- a/packstack/puppet/modules/packstack/manifests/ironic.pp
+++ b/packstack/puppet/modules/packstack/manifests/ironic.pp
@@ -6,14 +6,14 @@ class packstack::ironic ()
       'glance/glance_host': value => hiera('CONFIG_STORAGE_HOST_URL');
     }
 
-    class { '::ironic::api::authtoken':
+    class { 'ironic::api::authtoken':
       www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
       password             => hiera('CONFIG_IRONIC_KS_PW'),
     }
 
-    class { '::ironic::api': }
+    class { 'ironic::api': }
 
-    class { '::ironic::client': }
+    class { 'ironic::client': }
 
-    class { '::ironic::conductor': }
+    class { 'ironic::conductor': }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/ironic/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/ironic/rabbitmq.pp
index 7b5c9f51c..9a075cb61 100644
--- a/packstack/puppet/modules/packstack/manifests/ironic/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/ironic/rabbitmq.pp
@@ -22,11 +22,11 @@ class packstack::ironic::rabbitmq ()
       File[$files_to_set_owner] ~> Service<| tag == 'ironic-service' |>
     }
 
-    class { '::ironic::logging':
+    class { 'ironic::logging':
       debug => true,
     }
 
-    class { '::ironic':
+    class { 'ironic':
       rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
       database_connection   => "mysql+pymysql://ironic:${ironic_rabbitmq_cfg_ironic_db_pw}@${ironic_rabbitmq_cfg_mariadb_host}/ironic",
diff --git a/packstack/puppet/modules/packstack/manifests/keystone.pp b/packstack/puppet/modules/packstack/manifests/keystone.pp
index b5b573e62..1f4074463 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone.pp
@@ -9,10 +9,10 @@ class packstack::keystone ()
     $keystone_url = regsubst(regsubst(hiera('CONFIG_KEYSTONE_PUBLIC_URL'),'/v2.0',''),'/v3','')
     $keystone_admin_url = hiera('CONFIG_KEYSTONE_ADMIN_URL')
 
-    class { '::keystone::client': }
+    class { 'keystone::client': }
 
     if hiera('CONFIG_KEYSTONE_FERNET_TOKEN_ROTATE_ENABLE',false) {
-      class { '::keystone::cron::fernet_rotate':
+      class { 'keystone::cron::fernet_rotate':
         require     => Service['crond'],
       }
       service { 'crond':
@@ -21,11 +21,11 @@ class packstack::keystone ()
       }
     }
 
-    class { '::keystone::logging':
+    class { 'keystone::logging':
       debug => hiera('CONFIG_DEBUG_MODE'),
     }
 
-    class { '::keystone':
+    class { 'keystone':
       database_connection => "mysql+pymysql://keystone_admin:${keystone_cfg_ks_db_pw}@${keystone_cfg_mariadb_host}/keystone",
       token_provider      => $keystone_token_provider_str,
       enable_fernet_setup => true,
@@ -34,7 +34,7 @@ class packstack::keystone ()
       default_domain      => 'Default',
     }
 
-    class { '::keystone::wsgi::apache':
+    class { 'keystone::wsgi::apache':
       workers => hiera('CONFIG_SERVICE_WORKERS'),
       ssl     => $keystone_use_ssl
     }
@@ -46,7 +46,7 @@ class packstack::keystone ()
       ensure => present,
     }
 
-    class { '::keystone::bootstrap':
+    class { 'keystone::bootstrap':
       password     => hiera('CONFIG_KEYSTONE_ADMIN_PW'),
       username     => $username,
       email        => hiera('CONFIG_KEYSTONE_ADMIN_EMAIL'),
@@ -69,7 +69,7 @@ class packstack::keystone ()
         $user_enabled_emulation = false
       }
 
-      class { '::keystone::ldap':
+      class { 'keystone::ldap':
         url                                => hiera_undef('CONFIG_KEYSTONE_LDAP_URL', undef),
         user                               => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_DN', undef),
         password                           => hiera_undef('CONFIG_KEYSTONE_LDAP_USER_PASSWORD', undef),
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/aodh.pp b/packstack/puppet/modules/packstack/manifests/keystone/aodh.pp
index ee6a1bd70..b747ba591 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/aodh.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/aodh.pp
@@ -2,7 +2,7 @@ class packstack::keystone::aodh ()
 {
     $keystone_host_url = hiera('CONFIG_KEYSTONE_HOST_URL')
 
-    class { '::aodh::keystone::auth':
+    class { 'aodh::keystone::auth':
       region       => hiera('CONFIG_KEYSTONE_REGION'),
       password     => hiera('CONFIG_AODH_KS_PW'),
       public_url   => "http://${keystone_host_url}:8042",
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/ceilometer.pp b/packstack/puppet/modules/packstack/manifests/keystone/ceilometer.pp
index 47c0754d4..fe3cf53e1 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/ceilometer.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/ceilometer.pp
@@ -5,7 +5,7 @@ class packstack::keystone::ceilometer ()
     $ceilometer_api_host = hiera('CONFIG_KEYSTONE_HOST_URL')
     $ceilometer_url = "${ceilometer_protocol}://${ceilometer_api_host}:${ceilometer_port}"
 
-    class { '::ceilometer::keystone::auth':
+    class { 'ceilometer::keystone::auth':
       region       => hiera('CONFIG_KEYSTONE_REGION'),
       password     => hiera('CONFIG_CEILOMETER_KS_PW'),
       public_url   => $ceilometer_url,
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/cinder.pp b/packstack/puppet/modules/packstack/manifests/keystone/cinder.pp
index 1c022e849..453623141 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/cinder.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/cinder.pp
@@ -5,7 +5,7 @@ class packstack::keystone::cinder ()
     $cinder_port = '8776'
     $cinder_url = "${cinder_protocol}://${cinder_host}:${cinder_port}"
 
-    class { '::cinder::keystone::auth':
+    class { 'cinder::keystone::auth':
       region          => hiera('CONFIG_KEYSTONE_REGION'),
       password        => hiera('CONFIG_CINDER_KS_PW'),
       public_url_v2   => "${cinder_url}/v2/%(tenant_id)s",
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/glance.pp b/packstack/puppet/modules/packstack/manifests/keystone/glance.pp
index 227c5282f..27198544f 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/glance.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/glance.pp
@@ -5,7 +5,7 @@ class packstack::keystone::glance ()
     $glance_api_host = hiera('CONFIG_STORAGE_HOST_URL')
     $glance_url = "${glance_protocol}://${glance_api_host}:${glance_port}"
 
-    class { '::glance::keystone::auth':
+    class { 'glance::keystone::auth':
       region       => hiera('CONFIG_KEYSTONE_REGION'),
       password     => hiera('CONFIG_GLANCE_KS_PW'),
       public_url   => $glance_url,
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/gnocchi.pp b/packstack/puppet/modules/packstack/manifests/keystone/gnocchi.pp
index ea59ce198..9fe88fe9d 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/gnocchi.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/gnocchi.pp
@@ -2,7 +2,7 @@ class packstack::keystone::gnocchi ()
 {
     $gnocchi_keystone_host_url = hiera('CONFIG_KEYSTONE_HOST_URL')
 
-    class { '::gnocchi::keystone::auth':
+    class { 'gnocchi::keystone::auth':
       region       => hiera('CONFIG_KEYSTONE_REGION'),
       password     => hiera('CONFIG_GNOCCHI_KS_PW'),
       public_url   => "http://${gnocchi_keystone_host_url}:8041",
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/heat.pp b/packstack/puppet/modules/packstack/manifests/keystone/heat.pp
index ba833d9b9..85cfae5bb 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/heat.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/heat.pp
@@ -6,7 +6,7 @@ class packstack::keystone::heat ()
     $heat_url = "${heat_protocol}://${heat_api_host}:${heat_port}/v1/%(tenant_id)s"
 
     # heat::keystone::auth
-    class { '::heat::keystone::auth':
+    class { 'heat::keystone::auth':
       region                    => hiera('CONFIG_KEYSTONE_REGION'),
       password                  => hiera('CONFIG_HEAT_KS_PW'),
       public_url                => $heat_url,
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/ironic.pp b/packstack/puppet/modules/packstack/manifests/keystone/ironic.pp
index 2308b11f7..d99b1ec89 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/ironic.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/ironic.pp
@@ -5,7 +5,7 @@ class packstack::keystone::ironic ()
     $ironic_port = '6385'
     $ironic_url = "${ironic_protocol}://${ironic_host}:${ironic_port}"
 
-    class { '::ironic::keystone::auth':
+    class { 'ironic::keystone::auth':
         region       => hiera('CONFIG_KEYSTONE_REGION'),
         password     => hiera('CONFIG_IRONIC_KS_PW'),
         public_url   => $ironic_url,
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/magnum.pp b/packstack/puppet/modules/packstack/manifests/keystone/magnum.pp
index 247e24df9..ea9627688 100755
--- a/packstack/puppet/modules/packstack/manifests/keystone/magnum.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/magnum.pp
@@ -5,7 +5,7 @@ class packstack::keystone::magnum ()
     $magnum_port = '9511'
     $magnum_url = "${magnum_protocol}://${magnum_host}:${magnum_port}/v1"
 
-    class { '::magnum::keystone::auth':
+    class { 'magnum::keystone::auth':
       region       => hiera('CONFIG_KEYSTONE_REGION'),
       password     => hiera('CONFIG_MAGNUM_KS_PW'),
       public_url   => $magnum_url,
@@ -13,7 +13,7 @@ class packstack::keystone::magnum ()
       internal_url => $magnum_url
     }
 
-    class { '::magnum::keystone::domain':
+    class { 'magnum::keystone::domain':
       domain_password => hiera('CONFIG_MAGNUM_KS_PW'),
     }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/manila.pp b/packstack/puppet/modules/packstack/manifests/keystone/manila.pp
index 1798c3dab..46361549b 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/manila.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/manila.pp
@@ -6,7 +6,7 @@ class packstack::keystone::manila ()
     $manila_url = "${manila_protocol}://${manila_host}:${manila_port}/v1/%(tenant_id)s"
     $manila_url_v2 = "${manila_protocol}://${manila_host}:${manila_port}/v2/%(tenant_id)s"
 
-    class { '::manila::keystone::auth':
+    class { 'manila::keystone::auth':
       password        => hiera('CONFIG_MANILA_KS_PW'),
       public_url      => $manila_url,
       admin_url       => $manila_url,
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/neutron.pp b/packstack/puppet/modules/packstack/manifests/keystone/neutron.pp
index 2c6b6eb2e..d2dc98afb 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/neutron.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/neutron.pp
@@ -5,7 +5,7 @@ class packstack::keystone::neutron ()
     $neutron_port = '9696'
     $neutron_url = "${neutron_protocol}://${neutron_host}:${neutron_port}"
 
-    class { '::neutron::keystone::auth':
+    class { 'neutron::keystone::auth':
       region       => hiera('CONFIG_KEYSTONE_REGION'),
       password     => hiera('CONFIG_NEUTRON_KS_PW'),
       public_url   => $neutron_url,
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/nova.pp b/packstack/puppet/modules/packstack/manifests/keystone/nova.pp
index a2c9abdd5..362df6113 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/nova.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/nova.pp
@@ -6,7 +6,7 @@ class packstack::keystone::nova ()
     $nova_url = "${nova_protocol}://${nova_host}:${nova_port}/v2.1/%(tenant_id)s"
 
 
-    class { '::nova::keystone::auth':
+    class { 'nova::keystone::auth':
       region       => hiera('CONFIG_KEYSTONE_REGION'),
       password     => hiera('CONFIG_NOVA_KS_PW'),
       public_url   => $nova_url,
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/panko.pp b/packstack/puppet/modules/packstack/manifests/keystone/panko.pp
index 576ca827c..db058dd47 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/panko.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/panko.pp
@@ -2,7 +2,7 @@ class packstack::keystone::panko ()
 {
     $keystone_host_url = hiera('CONFIG_KEYSTONE_HOST_URL')
 
-    class { '::panko::keystone::auth':
+    class { 'panko::keystone::auth':
       region       => hiera('CONFIG_KEYSTONE_REGION'),
       password     => hiera('CONFIG_PANKO_KS_PW'),
       public_url   => "http://${keystone_host_url}:8977",
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/placement.pp b/packstack/puppet/modules/packstack/manifests/keystone/placement.pp
index d38415929..9e8b24e39 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/placement.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/placement.pp
@@ -5,7 +5,7 @@ class packstack::keystone::placement ()
     $placement_port = '8778'
     $placement_url = "${placement_protocol}://${placement_host}:${placement_port}/placement"
 
-    class { '::placement::keystone::authtoken':
+    class { 'placement::keystone::authtoken':
       password             => hiera('CONFIG_NOVA_KS_PW'),
       user_domain_name     => 'Default',
       project_domain_name  => 'Default',
@@ -13,7 +13,7 @@ class packstack::keystone::placement ()
       www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
     }
 
-    class { '::placement::keystone::auth':
+    class { 'placement::keystone::auth':
       public_url   => $placement_url,
       internal_url => $placement_url,
       admin_url    => $placement_url,
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/sahara.pp b/packstack/puppet/modules/packstack/manifests/keystone/sahara.pp
index b13590594..e137f8c96 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/sahara.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/sahara.pp
@@ -5,7 +5,7 @@ class packstack::keystone::sahara ()
     $sahara_port = '8386'
     $sahara_url = "${sahara_protocol}://${sahara_host}:${sahara_port}"
 
-    class { '::sahara::keystone::auth':
+    class { 'sahara::keystone::auth':
       password     => hiera('CONFIG_SAHARA_KS_PW'),
       public_url   => $sahara_url,
       admin_url    => $sahara_url,
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/swift.pp b/packstack/puppet/modules/packstack/manifests/keystone/swift.pp
index 10dc6f689..2c73a2614 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/swift.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/swift.pp
@@ -5,7 +5,7 @@ class packstack::keystone::swift ()
     $swift_port = '8080'
     $swift_url = "${swift_protocol}://${swift_host}:${swift_port}/v1/AUTH_%(tenant_id)s"
 
-    class { '::swift::keystone::auth':
+    class { 'swift::keystone::auth':
       region                => hiera('CONFIG_KEYSTONE_REGION'),
       password              => hiera('CONFIG_SWIFT_KS_PW'),
       operator_roles        => ['admin', 'SwiftOperator', 'ResellerAdmin'],
diff --git a/packstack/puppet/modules/packstack/manifests/keystone/trove.pp b/packstack/puppet/modules/packstack/manifests/keystone/trove.pp
index a9788f958..f535fa54e 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone/trove.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone/trove.pp
@@ -5,7 +5,7 @@ class packstack::keystone::trove ()
     $trove_port = '8779'
     $trove_url = "${trove_protocol}://${trove_host}:${trove_port}/v1.0/%(tenant_id)s"
 
-    class { '::trove::keystone::auth':
+    class { 'trove::keystone::auth':
       region       => hiera('CONFIG_KEYSTONE_REGION'),
       password     => hiera('CONFIG_TROVE_KS_PW'),
       public_url   => $trove_url,
diff --git a/packstack/puppet/modules/packstack/manifests/magnum.pp b/packstack/puppet/modules/packstack/manifests/magnum.pp
index cee646374..aea096c24 100644
--- a/packstack/puppet/modules/packstack/manifests/magnum.pp
+++ b/packstack/puppet/modules/packstack/manifests/magnum.pp
@@ -4,7 +4,7 @@ class packstack::magnum ()
 
     $magnum_cfg_magnum_db_pw = hiera('CONFIG_MAGNUM_DB_PW')
     $magnum_cfg_magnum_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
-    class { '::magnum::db':
+    class { 'magnum::db':
       database_connection => "mysql+pymysql://magnum:${magnum_cfg_magnum_db_pw}@${magnum_cfg_magnum_mariadb_host}/magnum",
     }
 
@@ -12,7 +12,7 @@ class packstack::magnum ()
     $magnum_host = hiera('CONFIG_KEYSTONE_HOST_URL')
     $magnum_port = '9511'
     $magnum_url = "${magnum_protocol}://${magnum_host}:${magnum_port}/v1"
-    class { '::magnum::keystone::authtoken':
+    class { 'magnum::keystone::authtoken':
       www_authenticate_uri => "${magnum_protocol}://${magnum_host}:5000/v3",
       auth_url             => "${magnum_protocol}://${magnum_host}:5000",
       auth_version         => 'v3',
@@ -23,7 +23,7 @@ class packstack::magnum ()
       project_name         => 'services'
     }
 
-    class { '::magnum::keystone::keystone_auth':
+    class { 'magnum::keystone::keystone_auth':
       username            => 'magnum',
       password            => hiera('CONFIG_MAGNUM_KS_PW'),
       auth_url            => "${magnum_protocol}://${magnum_host}:5000",
@@ -32,22 +32,22 @@ class packstack::magnum ()
       project_domain_name => 'Default',
     }
 
-    class { '::magnum::api':
+    class { 'magnum::api':
       enabled => true,
       host    => '0.0.0.0'
     }
 
-    class { '::magnum::conductor':
+    class { 'magnum::conductor':
     }
 
-    class { '::magnum::client':
+    class { 'magnum::client':
     }
 
-    class { '::magnum::clients':
+    class { 'magnum::clients':
       region_name => hiera('CONFIG_KEYSTONE_REGION')
     }
 
-    class { '::magnum::certificates':
+    class { 'magnum::certificates':
       cert_manager_type => 'local'
     }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/magnum/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/magnum/rabbitmq.pp
index 43af51416..3cb183efa 100755
--- a/packstack/puppet/modules/packstack/manifests/magnum/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/magnum/rabbitmq.pp
@@ -19,7 +19,7 @@ class packstack::magnum::rabbitmq ()
       File[$files_to_set_owner] ~> Service<| tag == 'magnum-service' |>
     }
 
-    class { '::magnum':
+    class { 'magnum':
       rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
       kombu_ssl_ca_certs    => $kombu_ssl_ca_certs,
diff --git a/packstack/puppet/modules/packstack/manifests/manila.pp b/packstack/puppet/modules/packstack/manifests/manila.pp
index 7be68c15f..ff5200f3f 100644
--- a/packstack/puppet/modules/packstack/manifests/manila.pp
+++ b/packstack/puppet/modules/packstack/manifests/manila.pp
@@ -12,22 +12,22 @@ class packstack::manila ()
       # TO-DO(mmagr): Add IPv6 support when hostnames are used
     }
 
-    class { '::manila::keystone::authtoken':
+    class { 'manila::keystone::authtoken':
       password             => hiera('CONFIG_MANILA_KS_PW'),
       www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
     }
 
-    class { '::manila::api':
+    class { 'manila::api':
       bind_host          => $bind_host,
     }
 
-    class { '::manila::scheduler':
+    class { 'manila::scheduler':
     }
 
-    class { '::manila::share':
+    class { 'manila::share':
     }
 
-    class { '::manila::backends':
+    class { 'manila::backends':
       enabled_share_backends => hiera('CONFIG_MANILA_BACKEND'),
     }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp b/packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp
index cf0e26f94..dcf0fad71 100644
--- a/packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp
+++ b/packstack/puppet/modules/packstack/manifests/manila/backend/generic.pp
@@ -30,13 +30,13 @@ class packstack::manila::backend::generic ()
       service_instance_flavor_id => 66,
     }
 
-    class { '::manila::compute::nova':
+    class { 'manila::compute::nova':
       auth_type => 'password',
       auth_url  => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
       password  => hiera('CONFIG_NOVA_KS_PW'),
     }
 
-    class { '::manila::volume::cinder':
+    class { 'manila::volume::cinder':
       auth_type => 'password',
       auth_url  => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
       password  => hiera('CONFIG_CINDER_KS_PW'),
diff --git a/packstack/puppet/modules/packstack/manifests/manila/network.pp b/packstack/puppet/modules/packstack/manifests/manila/network.pp
index aef418fd6..15a790008 100644
--- a/packstack/puppet/modules/packstack/manifests/manila/network.pp
+++ b/packstack/puppet/modules/packstack/manifests/manila/network.pp
@@ -3,7 +3,7 @@ define packstack::manila::network ($backend_name = $name) {
   $manila_network_type = hiera('CONFIG_MANILA_NETWORK_TYPE')
 
   if ($manila_network_type == 'neutron'){
-    class { '::manila::network::neutron':
+    class { 'manila::network::neutron':
       auth_type => 'password',
       auth_url  => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
       password  => hiera('CONFIG_NEUTRON_KS_PW'),
diff --git a/packstack/puppet/modules/packstack/manifests/manila/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/manila/rabbitmq.pp
index 5a555e793..d673d586c 100644
--- a/packstack/puppet/modules/packstack/manifests/manila/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/manila/rabbitmq.pp
@@ -23,11 +23,11 @@ class packstack::manila::rabbitmq ()
     $db_pw = hiera('CONFIG_MANILA_DB_PW')
     $mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
 
-    class { '::manila::logging':
+    class { 'manila::logging':
       debug => hiera('CONFIG_DEBUG_MODE'),
     }
 
-    class { '::manila':
+    class { 'manila':
       rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
       sql_connection        => "mysql+pymysql://manila:${db_pw}@${mariadb_host}/manila",
diff --git a/packstack/puppet/modules/packstack/manifests/mariadb.pp b/packstack/puppet/modules/packstack/manifests/mariadb.pp
index 52c6ef3ab..3b107c5c1 100644
--- a/packstack/puppet/modules/packstack/manifests/mariadb.pp
+++ b/packstack/puppet/modules/packstack/manifests/mariadb.pp
@@ -23,7 +23,7 @@ class packstack::mariadb ()
 
     $mysql_root_password = hiera('CONFIG_MARIADB_PW')
 
-    class { '::mysql::server':
+    class { 'mysql::server':
       package_name     => $mariadb_package_name,
       restart          => true,
       root_password    => $mysql_root_password,
@@ -64,6 +64,6 @@ class packstack::mariadb ()
       }
     }
   } else {
-        class { '::remote::db': }
+        class { 'remote::db': }
   }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/mariadb/services.pp b/packstack/puppet/modules/packstack/manifests/mariadb/services.pp
index 615430877..faced4945 100755
--- a/packstack/puppet/modules/packstack/manifests/mariadb/services.pp
+++ b/packstack/puppet/modules/packstack/manifests/mariadb/services.pp
@@ -1,6 +1,6 @@
 class packstack::mariadb::services ()
 {
-    class { '::keystone::db::mysql':
+    class { 'keystone::db::mysql':
       user          => 'keystone_admin',
       password      => hiera('CONFIG_KEYSTONE_DB_PW'),
       allowed_hosts => '%',
@@ -8,7 +8,7 @@ class packstack::mariadb::services ()
     }
 
     if hiera('CONFIG_CINDER_INSTALL') == 'y' {
-      class { '::cinder::db::mysql':
+      class { 'cinder::db::mysql':
         password      => hiera('CONFIG_CINDER_DB_PW'),
         host          => '%',
         allowed_hosts => '%',
@@ -17,7 +17,7 @@ class packstack::mariadb::services ()
     }
 
     if hiera('CONFIG_GLANCE_INSTALL') == 'y' {
-        class { '::glance::db::mysql':
+        class { 'glance::db::mysql':
           password      => hiera('CONFIG_GLANCE_DB_PW'),
           host          => '%',
           allowed_hosts => '%',
@@ -26,7 +26,7 @@ class packstack::mariadb::services ()
     }
 
     if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
-        class { '::gnocchi::db::mysql':
+        class { 'gnocchi::db::mysql':
           password      => hiera('CONFIG_GNOCCHI_DB_PW'),
           host          => '%',
           allowed_hosts => '%',
@@ -35,7 +35,7 @@ class packstack::mariadb::services ()
 
     if hiera('CONFIG_AODH_INSTALL') == 'y' and
       hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
-        class { '::aodh::db::mysql':
+        class { 'aodh::db::mysql':
           password      => hiera('CONFIG_AODH_DB_PW'),
           host          => '%',
           allowed_hosts => '%',
@@ -43,7 +43,7 @@ class packstack::mariadb::services ()
     }
 
     if hiera('CONFIG_HEAT_INSTALL') == 'y' {
-      class { '::heat::db::mysql':
+      class { 'heat::db::mysql':
         password      => hiera('CONFIG_HEAT_DB_PW'),
         host          => '%',
         allowed_hosts => '%',
@@ -52,7 +52,7 @@ class packstack::mariadb::services ()
     }
 
     if hiera('CONFIG_MAGNUM_INSTALL') == 'y' {
-      class { '::magnum::db::mysql':
+      class { 'magnum::db::mysql':
         password      => hiera('CONFIG_MAGNUM_DB_PW'),
         host          => '%',
         allowed_hosts => '%',
@@ -61,7 +61,7 @@ class packstack::mariadb::services ()
     }
 
     if hiera('CONFIG_IRONIC_INSTALL') == 'y' {
-      class { '::ironic::db::mysql':
+      class { 'ironic::db::mysql':
         password      => hiera('CONFIG_IRONIC_DB_PW'),
         host          => '%',
         allowed_hosts => '%',
@@ -70,7 +70,7 @@ class packstack::mariadb::services ()
     }
 
     if hiera('CONFIG_MANILA_INSTALL') == 'y' {
-        class { '::manila::db::mysql':
+        class { 'manila::db::mysql':
           password      => hiera('CONFIG_MANILA_DB_PW'),
           allowed_hosts => '%',
           charset       => 'utf8',
@@ -78,7 +78,7 @@ class packstack::mariadb::services ()
     }
 
     if hiera('CONFIG_NEUTRON_INSTALL') == 'y' {
-        class { '::neutron::db::mysql':
+        class { 'neutron::db::mysql':
           password      => hiera('CONFIG_NEUTRON_DB_PW'),
           host          => '%',
           allowed_hosts => '%',
@@ -88,19 +88,19 @@ class packstack::mariadb::services ()
     }
 
     if hiera('CONFIG_NOVA_INSTALL') == 'y' {
-        class { '::nova::db::mysql':
+        class { 'nova::db::mysql':
           password      => hiera('CONFIG_NOVA_DB_PW'),
           host          => '%',
           allowed_hosts => '%',
           charset       => 'utf8',
         }
-        class { '::nova::db::mysql_api':
+        class { 'nova::db::mysql_api':
           password      => hiera('CONFIG_NOVA_DB_PW'),
           host          => '%',
           allowed_hosts => '%',
           charset       => 'utf8',
         }
-        class { '::placement::db::mysql':
+        class { 'placement::db::mysql':
           password      => hiera('CONFIG_NOVA_DB_PW'),
           host          => '%',
           allowed_hosts => '%',
@@ -110,7 +110,7 @@ class packstack::mariadb::services ()
 
     if hiera('CONFIG_PANKO_INSTALL') == 'y' and
       hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
-        class { '::panko::db::mysql':
+        class { 'panko::db::mysql':
           password      => hiera('CONFIG_PANKO_DB_PW'),
           host          => '%',
           allowed_hosts => '%',
@@ -118,7 +118,7 @@ class packstack::mariadb::services ()
     }
 
     if hiera('CONFIG_SAHARA_INSTALL') == 'y' {
-        class { '::sahara::db::mysql':
+        class { 'sahara::db::mysql':
           password      => hiera('CONFIG_SAHARA_DB_PW'),
           host          => '%',
           allowed_hosts => '%',
@@ -127,7 +127,7 @@ class packstack::mariadb::services ()
     }
 
     if hiera('CONFIG_TROVE_INSTALL') == 'y' {
-        class { '::trove::db::mysql':
+        class { 'trove::db::mysql':
             password      => hiera('CONFIG_TROVE_DB_PW'),
             host          => '%',
             allowed_hosts => '%',
diff --git a/packstack/puppet/modules/packstack/manifests/memcached.pp b/packstack/puppet/modules/packstack/manifests/memcached.pp
index 27fd745dd..d98a366bc 100644
--- a/packstack/puppet/modules/packstack/manifests/memcached.pp
+++ b/packstack/puppet/modules/packstack/manifests/memcached.pp
@@ -6,7 +6,7 @@ class packstack::memcached ()
       # TO-DO(mmagr): Add IPv6 support when hostnames are used
     }
 
-    class { '::memcached':
+    class { 'memcached':
       listen_ip  => $memcached_bind_host,
       max_memory => '10%',
     }
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/api.pp b/packstack/puppet/modules/packstack/manifests/neutron/api.pp
index c9643015c..f3819ecc8 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/api.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/api.pp
@@ -10,7 +10,7 @@ class packstack::neutron::api ()
     $neutron_user_password   = hiera('CONFIG_NEUTRON_KS_PW')
     $neutron_vpnaas_enabled  = str2bool(hiera('CONFIG_NEUTRON_VPNAAS'))
 
-    class { '::neutron::keystone::authtoken':
+    class { 'neutron::keystone::authtoken':
       username             => 'neutron',
       password             => $neutron_user_password,
       www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
@@ -22,7 +22,7 @@ class packstack::neutron::api ()
       database_connection   => $neutron_sql_connection,
     }
 
-    class { '::neutron::server':
+    class { 'neutron::server':
       sync_db               => true,
       enabled               => true,
       api_workers           => hiera('CONFIG_SERVICE_WORKERS'),
@@ -37,7 +37,7 @@ class packstack::neutron::api ()
     }
 
     if $neutron_vpnaas_enabled {
-      class { '::neutron::services::vpnaas': }
+      class { 'neutron::services::vpnaas': }
     }
 
     Class['::neutron::server'] -> File['/etc/neutron/api-paste.ini']
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/dhcp.pp b/packstack/puppet/modules/packstack/manifests/neutron/dhcp.pp
index 22e38059a..a3dc38a02 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/dhcp.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/dhcp.pp
@@ -3,7 +3,7 @@ class packstack::neutron::dhcp ()
     create_resources(packstack::firewall, hiera('FIREWALL_NEUTRON_DHCPIN_RULES', {}))
     create_resources(packstack::firewall, hiera('FIREWALL_NEUTRON_DHCPOUT_RULES', {}))
 
-    class { '::neutron::agents::dhcp':
+    class { 'neutron::agents::dhcp':
       interface_driver => hiera('CONFIG_NEUTRON_DHCP_INTERFACE_DRIVER'),
       debug            => hiera('CONFIG_DEBUG_MODE'),
     }
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/l3.pp b/packstack/puppet/modules/packstack/manifests/neutron/l3.pp
index bf62b46c0..0e476c99d 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/l3.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/l3.pp
@@ -5,7 +5,7 @@ class packstack::neutron::l3 ()
         default => true
     }
 
-    class { '::neutron::agents::l3':
+    class { 'neutron::agents::l3':
       interface_driver => hiera('CONFIG_NEUTRON_L3_INTERFACE_DRIVER'),
       manage_service   => $start_l3_agent,
       enabled          => $start_l3_agent,
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/lb_agent.pp b/packstack/puppet/modules/packstack/manifests/neutron/lb_agent.pp
index 51c33438f..74097d2e7 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/lb_agent.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/lb_agent.pp
@@ -16,14 +16,14 @@ class packstack::neutron::lb_agent ()
     }
 
     if ( 'vxlan' in hiera_array('CONFIG_NEUTRON_ML2_TYPE_DRIVERS') ){
-      class { '::neutron::agents::ml2::linuxbridge':
+      class { 'neutron::agents::ml2::linuxbridge':
         physical_interface_mappings => force_interface($neutron_lb_interface_mappings, $use_subnets),
         tunnel_types                => ['vxlan'],
         local_ip                    => $bind_host,
       }
     }
     else {
-      class { '::neutron::agents::ml2::linuxbridge':
+      class { 'neutron::agents::ml2::linuxbridge':
         physical_interface_mappings => force_interface($neutron_lb_interface_mappings, $use_subnets),
       }
     }
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/metadata.pp b/packstack/puppet/modules/packstack/manifests/neutron/metadata.pp
index 8dcc3d532..a2b07e982 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/metadata.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/metadata.pp
@@ -1,6 +1,6 @@
 class packstack::neutron::metadata ()
 {
-    class { '::neutron::agents::metadata':
+    class { 'neutron::agents::metadata':
       shared_secret    => hiera('CONFIG_NEUTRON_METADATA_PW'),
       metadata_host    => force_ip(hiera('CONFIG_KEYSTONE_HOST_URL')),
       debug            => hiera('CONFIG_DEBUG_MODE'),
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/metering.pp b/packstack/puppet/modules/packstack/manifests/neutron/metering.pp
index 359ae7c14..80307e223 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/metering.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/metering.pp
@@ -1,6 +1,6 @@
 class packstack::neutron::metering ()
 {
-    class { '::neutron::agents::metering':
+    class { 'neutron::agents::metering':
       interface_driver => hiera('CONFIG_NEUTRON_METERING_IFCE_DRIVER'),
       debug            => hiera('CONFIG_DEBUG_MODE'),
     }
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/ml2.pp b/packstack/puppet/modules/packstack/manifests/neutron/ml2.pp
index 94fa0cae8..24d9fddef 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/ml2.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/ml2.pp
@@ -6,7 +6,7 @@ class packstack::neutron::ml2 ()
       $vxlan_group_value = hiera('CONFIG_NEUTRON_ML2_VXLAN_GROUP')
     }
 
-    class { '::neutron::plugins::ml2':
+    class { 'neutron::plugins::ml2':
       type_drivers          => hiera_array('CONFIG_NEUTRON_ML2_TYPE_DRIVERS'),
       tenant_network_types  => hiera_array('CONFIG_NEUTRON_ML2_TENANT_NETWORK_TYPES'),
       mechanism_drivers     => hiera_array('CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS'),
@@ -21,7 +21,7 @@ class packstack::neutron::ml2 ()
     }
 
     if hiera('CONFIG_NEUTRON_L2_AGENT') == 'ovn' {
-      class {'::neutron::plugins::ml2::ovn':
+      class { 'neutron::plugins::ml2::ovn':
         ovn_nb_connection    => "tcp:${hiera('CONFIG_CONTROLLER_HOST')}:6641",
         ovn_sb_connection    => "tcp:${hiera('CONFIG_CONTROLLER_HOST')}:6642",
         ovn_metadata_enabled => true,
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/notifications.pp b/packstack/puppet/modules/packstack/manifests/neutron/notifications.pp
index b8dfcd521..d8f98cd19 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/notifications.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/notifications.pp
@@ -3,7 +3,7 @@ class packstack::neutron::notifications ()
     $neutron_notif_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
 
     # Configure nova notifications system
-    class { '::neutron::server::notifications':
+    class { 'neutron::server::notifications':
       username     => 'nova',
       password     => hiera('CONFIG_NOVA_KS_PW'),
       project_name => 'services',
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp b/packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp
index d6ac5cf2d..f52dce394 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/ovn_agent.pp
@@ -45,7 +45,7 @@ class packstack::neutron::ovn_agent ()
 
     $ovn_southd = "tcp:${hiera('CONFIG_CONTROLLER_HOST')}:6642"
 
-    class { '::ovn::controller':
+    class { 'ovn::controller':
       ovn_remote                => $ovn_southd,
       ovn_bridge_mappings       => $bridge_mappings,
       bridge_interface_mappings => $bridge_uplinks,
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/ovn_metadata.pp b/packstack/puppet/modules/packstack/manifests/neutron/ovn_metadata.pp
index 0c5f118cf..4f21b925b 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/ovn_metadata.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/ovn_metadata.pp
@@ -2,7 +2,7 @@ class packstack::neutron::ovn_metadata ()
 {
     $ovn_southd = "tcp:${hiera('CONFIG_CONTROLLER_HOST')}:6642"
 
-    class { '::neutron::agents::ovn_metadata':
+    class { 'neutron::agents::ovn_metadata':
       ovn_sb_connection => $ovn_southd,
       shared_secret     => hiera('CONFIG_NEUTRON_METADATA_PW'),
       metadata_host     => force_ip(hiera('CONFIG_KEYSTONE_HOST_URL')),
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/ovn_northd.pp b/packstack/puppet/modules/packstack/manifests/neutron/ovn_northd.pp
index c4911cfe7..067ce6869 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/ovn_northd.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/ovn_northd.pp
@@ -1,4 +1,4 @@
 class packstack::neutron::ovn_northd ()
 {
-    include ::ovn::northd
+    include ovn::northd
 }
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/ovs_agent.pp b/packstack/puppet/modules/packstack/manifests/neutron/ovs_agent.pp
index fc9274e14..967773fd3 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/ovs_agent.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/ovs_agent.pp
@@ -43,7 +43,7 @@ class packstack::neutron::ovs_agent ()
       $bridge_mappings = []
     }
 
-    class { '::neutron::agents::ml2::ovs':
+    class { 'neutron::agents::ml2::ovs':
       bridge_uplinks  => $bridge_uplinks,
       bridge_mappings => $bridge_mappings,
       tunnel_types    => hiera_array('CONFIG_NEUTRON_OVS_TUNNEL_TYPES'),
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/neutron/rabbitmq.pp
index 3df252198..898df34b0 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/rabbitmq.pp
@@ -25,11 +25,11 @@ class packstack::neutron::rabbitmq ()
       File[$files_to_set_owner] ~> Service<| tag == 'neutron-service' |>
     }
 
-    class { '::neutron::logging':
+    class { 'neutron::logging':
       debug => hiera('CONFIG_DEBUG_MODE'),
     }
 
-    class { '::neutron':
+    class { 'neutron':
       bind_host             => $bind_host,
       rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
diff --git a/packstack/puppet/modules/packstack/manifests/neutron/vpnaas.pp b/packstack/puppet/modules/packstack/manifests/neutron/vpnaas.pp
index f42c7e9ae..e60bd9ed1 100644
--- a/packstack/puppet/modules/packstack/manifests/neutron/vpnaas.pp
+++ b/packstack/puppet/modules/packstack/manifests/neutron/vpnaas.pp
@@ -1,6 +1,6 @@
 class packstack::neutron::vpnaas ()
 {
-    class { '::neutron::agents::vpnaas':
+    class { 'neutron::agents::vpnaas':
       vpn_device_driver => 'neutron_vpnaas.services.vpn.device_drivers.libreswan_ipsec.LibreSwanDriver',
     }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/nova.pp b/packstack/puppet/modules/packstack/manifests/nova.pp
index bb5539359..f6302af4a 100644
--- a/packstack/puppet/modules/packstack/manifests/nova.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova.pp
@@ -56,11 +56,11 @@ class packstack::nova ()
       $key = undef
     }
 
-    class { '::nova::logging':
+    class { 'nova::logging':
       debug => hiera('CONFIG_DEBUG_MODE'),
     }
 
-    class { '::nova':
+    class { 'nova':
       default_transport_url   => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
       rabbit_use_ssl          => hiera('CONFIG_AMQP_SSL_ENABLED'),
       nova_public_key         => $public_key,
diff --git a/packstack/puppet/modules/packstack/manifests/nova/api.pp b/packstack/puppet/modules/packstack/manifests/nova/api.pp
index e935c5333..421ecc831 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/api.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/api.pp
@@ -11,7 +11,7 @@ class packstack::nova::api ()
     $www_authenticate_uri = hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS')
     $admin_password = hiera('CONFIG_NOVA_KS_PW')
 
-    class {'::nova::keystone::authtoken':
+    class { 'nova::keystone::authtoken':
       password             => $admin_password,
       www_authenticate_uri => $www_authenticate_uri,
       auth_url             => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
@@ -23,11 +23,11 @@ class packstack::nova::api ()
       $pci_alias = hiera('CONFIG_NOVA_PCI_ALIAS')
     }
 
-    class { '::nova::pci':
+    class { 'nova::pci':
       aliases                              => $pci_alias,
     }
 
-    class { '::nova::api':
+    class { 'nova::api':
       api_bind_address           => $bind_host,
       enabled                    => true,
       sync_db                    => false,
@@ -38,31 +38,31 @@ class packstack::nova::api ()
       service_name               => 'httpd',
     }
 
-    class { '::nova::metadata':
+    class { 'nova::metadata':
       neutron_metadata_proxy_shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW_UNQUOTED', undef),
     }
 
-    class { '::nova::wsgi::apache_api':
+    class { 'nova::wsgi::apache_api':
       bind_host => $bind_host,
       ssl       => false,
       workers   => hiera('CONFIG_SERVICE_WORKERS'),
     }
 
-    class { '::nova::wsgi::apache_metadata':
+    class { 'nova::wsgi::apache_metadata':
       bind_host => $bind_host,
       ssl       => false,
       workers   => hiera('CONFIG_SERVICE_WORKERS'),
     }
 
-    class { '::nova::db::sync':
+    class { 'nova::db::sync':
       db_sync_timeout => 600,
     }
 
-    class { '::nova::db::sync_api':
+    class { 'nova::db::sync_api':
       db_sync_timeout => 600,
     }
 
-    class { '::nova::placement':
+    class { 'nova::placement':
       auth_url    => $www_authenticate_uri,
       password    => $admin_password,
       region_name => hiera('CONFIG_KEYSTONE_REGION'),
@@ -70,13 +70,13 @@ class packstack::nova::api ()
 
     $db_purge = hiera('CONFIG_NOVA_DB_PURGE_ENABLE')
     if $db_purge {
-      class { '::nova::cron::archive_deleted_rows':
+      class { 'nova::cron::archive_deleted_rows':
         hour        => '*/12',
         destination => '/dev/null',
       }
     }
 
-    include ::nova::cell_v2::simple_setup
+    include nova::cell_v2::simple_setup
 
     $manage_flavors = str2bool(hiera('CONFIG_NOVA_MANAGE_FLAVORS'))
     if $manage_flavors {
diff --git a/packstack/puppet/modules/packstack/manifests/nova/ceilometer.pp b/packstack/puppet/modules/packstack/manifests/nova/ceilometer.pp
index 6168ed94b..e3b54e1f7 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/ceilometer.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/ceilometer.pp
@@ -1,6 +1,6 @@
 class packstack::nova::ceilometer ()
 {
-    class { '::ceilometer::agent::auth':
+    class { 'ceilometer::agent::auth':
       auth_url      => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
       auth_password => hiera('CONFIG_CEILOMETER_KS_PW'),
       auth_region   => hiera('CONFIG_KEYSTONE_REGION'),
@@ -8,7 +8,7 @@ class packstack::nova::ceilometer ()
 
     ensure_packages(['openstack-ceilometer-ipmi'], {'ensure' => 'present'})
 
-    class { '::ceilometer::agent::polling': }
+    class { 'ceilometer::agent::polling': }
 
     Package['openstack-ceilometer-ipmi'] -> Service['ceilometer-polling']
 }
diff --git a/packstack/puppet/modules/packstack/manifests/nova/ceilometer/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/nova/ceilometer/rabbitmq.pp
index 3e76c9b0a..16dd5478c 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/ceilometer/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/ceilometer/rabbitmq.pp
@@ -19,11 +19,11 @@ class packstack::nova::ceilometer::rabbitmq ()
       File[$ceilometer_files_to_set_owner] ~> Service<| tag == 'ceilometer-service' |>
     }
 
-    class { '::ceilometer::logging':
+    class { 'ceilometer::logging':
         debug => hiera('CONFIG_DEBUG_MODE'),
     }
 
-    class { '::ceilometer':
+    class { 'ceilometer':
         telemetry_secret      => hiera('CONFIG_CEILOMETER_SECRET'),
         rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
         default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute.pp b/packstack/puppet/modules/packstack/manifests/nova/compute.pp
index 71a6119bc..a4ad7303c 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/compute.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/compute.pp
@@ -73,11 +73,11 @@ class packstack::nova::compute ()
       $instance_usage_audit_period = 'month'
     }
 
-    class { '::nova::compute::pci':
+    class { 'nova::compute::pci':
       passthrough => hiera('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST')
     }
 
-    class { '::nova::compute':
+    class { 'nova::compute':
       enabled                       => true,
       vncproxy_host                 => hiera('CONFIG_KEYSTONE_HOST_URL'),
       vncproxy_protocol             => hiera('CONFIG_VNCPROXY_PROTOCOL'),
@@ -88,7 +88,7 @@ class packstack::nova::compute ()
       force_config_drive            => false,
     }
 
-    class { '::nova::placement':
+    class { 'nova::placement':
       auth_url    => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
       password    => hiera('CONFIG_NOVA_KS_PW'),
       region_name => hiera('CONFIG_KEYSTONE_REGION'),
diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute/ironic.pp b/packstack/puppet/modules/packstack/manifests/nova/compute/ironic.pp
index b5e8a7cea..f3a756969 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/compute/ironic.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/compute/ironic.pp
@@ -3,7 +3,7 @@ class packstack::nova::compute::ironic ()
   $ironic_config_controller_host = hiera('CONFIG_KEYSTONE_HOST_URL')
   $ironic_config_keystone_admin = hiera('CONFIG_KEYSTONE_ADMIN_URL')
 
-  class { '::nova::ironic::common':
+  class { 'nova::ironic::common':
       username     => 'ironic',
       password     => hiera('CONFIG_IRONIC_KS_PW'),
       auth_url     => $ironic_config_keystone_admin,
@@ -11,5 +11,5 @@ class packstack::nova::compute::ironic ()
       api_endpoint => "http://${ironic_config_controller_host}:6385/v1",
   }
 
-  include ::nova::compute::ironic
+   include nova::compute::ironic
 }
diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp b/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp
index 73784b157..688390199 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/compute/libvirt.pp
@@ -36,14 +36,14 @@ class packstack::nova::compute::libvirt ()
       $client_extraparams = {}
     }
 
-    class { '::nova::migration::libvirt':
+    class { 'nova::migration::libvirt':
       transport          => $migrate_transport,
       client_user        => 'nova_migration',
       client_extraparams => $client_extraparams,
       require            => Class['::nova::compute::libvirt']
     }
 
-    class { '::nova::compute::libvirt':
+    class { 'nova::compute::libvirt':
       libvirt_virt_type => $libvirt_virt_type,
       vncserver_listen  => $libvirt_vnc_bind_host,
       migration_support => true,
diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute/vmware.pp b/packstack/puppet/modules/packstack/manifests/nova/compute/vmware.pp
index 62a58716f..dd0cd91ce 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/compute/vmware.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/compute/vmware.pp
@@ -4,7 +4,7 @@ class packstack::nova::compute::vmware ()
     $my_ip = choose_my_ip(hiera('HOST_LIST'))
     $nova_vcenter_cluster_name = $cluster_list[$my_ip]
 
-    class { '::nova::compute::vmware':
+    class { 'nova::compute::vmware':
       host_ip       => hiera('CONFIG_VCENTER_HOST'),
       host_username => hiera('CONFIG_VCENTER_USER'),
       host_password => hiera('CONFIG_VCENTER_PASSWORD'),
diff --git a/packstack/puppet/modules/packstack/manifests/nova/conductor.pp b/packstack/puppet/modules/packstack/manifests/nova/conductor.pp
index 41edc44d0..41a3b97e2 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/conductor.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/conductor.pp
@@ -1,6 +1,6 @@
 class packstack::nova::conductor ()
 {
-    class { '::nova::conductor':
+    class { 'nova::conductor':
       enabled => true,
       workers => hiera('CONFIG_SERVICE_WORKERS'),
     }
diff --git a/packstack/puppet/modules/packstack/manifests/nova/neutron.pp b/packstack/puppet/modules/packstack/manifests/nova/neutron.pp
index 3013f6dfc..b5b572fe7 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/neutron.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/neutron.pp
@@ -3,7 +3,7 @@ class packstack::nova::neutron ()
     $nova_neutron_cfg_ctrl_host = hiera('CONFIG_KEYSTONE_HOST_URL')
     $neutron_auth_url = hiera('CONFIG_KEYSTONE_ADMIN_URL')
 
-    class { '::nova::network::neutron':
+    class { 'nova::network::neutron':
       default_floating_pool => 'public',
       password              => hiera('CONFIG_NEUTRON_KS_PW'),
       auth_type             => 'v3password',
diff --git a/packstack/puppet/modules/packstack/manifests/nova/sched.pp b/packstack/puppet/modules/packstack/manifests/nova/sched.pp
index c1d8312b4..df327787c 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/sched.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/sched.pp
@@ -1,8 +1,8 @@
 class packstack::nova::sched ()
 {
-    include '::nova::scheduler::filter'
+    include nova::scheduler::filter
 
-    class { '::nova::scheduler':
+    class { 'nova::scheduler':
       enabled => true,
     }
 
diff --git a/packstack/puppet/modules/packstack/manifests/nova/sched/ironic.pp b/packstack/puppet/modules/packstack/manifests/nova/sched/ironic.pp
index 04958ce75..5a1633e4d 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/sched/ironic.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/sched/ironic.pp
@@ -1,6 +1,6 @@
 class packstack::nova::sched::ironic ()
 {
-  class { '::nova::scheduler':
+  class { 'nova::scheduler':
     enabled => true,
   }
 }
\ No newline at end of file
diff --git a/packstack/puppet/modules/packstack/manifests/nova/vncproxy.pp b/packstack/puppet/modules/packstack/manifests/nova/vncproxy.pp
index 841e28604..fb6a6d93e 100644
--- a/packstack/puppet/modules/packstack/manifests/nova/vncproxy.pp
+++ b/packstack/puppet/modules/packstack/manifests/nova/vncproxy.pp
@@ -6,7 +6,7 @@ class packstack::nova::vncproxy ()
       # TO-DO(mmagr): Add IPv6 support when hostnames are used
     }
 
-    class { '::nova::vncproxy':
+    class { 'nova::vncproxy':
       enabled => true,
       host    => $vnc_bind_host,
     }
diff --git a/packstack/puppet/modules/packstack/manifests/panko.pp b/packstack/puppet/modules/packstack/manifests/panko.pp
index 3487b97aa..d3e978e98 100644
--- a/packstack/puppet/modules/packstack/manifests/panko.pp
+++ b/packstack/puppet/modules/packstack/manifests/panko.pp
@@ -5,15 +5,15 @@ class packstack::panko ()
     $panko_cfg_db_pw = hiera('CONFIG_PANKO_DB_PW')
     $panko_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
 
-    class { '::panko::wsgi::apache':
+    class { 'panko::wsgi::apache':
       workers => hiera('CONFIG_SERVICE_WORKERS'),
       threads => hiera('CONFIG_SERVICE_WORKERS'),
       ssl     => false
     }
 
-    include ::panko
+    include panko
 
-    class { '::panko::db':
+    class { 'panko::db':
       database_connection => "mysql+pymysql://panko:${panko_cfg_db_pw}@${panko_cfg_mariadb_host}/panko?charset=utf8",
     }
 
@@ -22,18 +22,18 @@ class packstack::panko ()
       default => '0.0.0.0',
     }
 
-    class { '::panko::keystone::authtoken':
+    class { 'panko::keystone::authtoken':
       www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
       auth_url             => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
       auth_version         => hiera('CONFIG_KEYSTONE_API_VERSION'),
       password             => hiera('CONFIG_PANKO_KS_PW')
     }
 
-    class { '::panko::api':
+    class { 'panko::api':
       host         => $bind_host,
       service_name => 'httpd'
     }
 
-    include ::panko::db::sync
+    include panko::db::sync
 
 }
diff --git a/packstack/puppet/modules/packstack/manifests/placement.pp b/packstack/puppet/modules/packstack/manifests/placement.pp
index 28e696e6e..ea389285d 100644
--- a/packstack/puppet/modules/packstack/manifests/placement.pp
+++ b/packstack/puppet/modules/packstack/manifests/placement.pp
@@ -8,20 +8,20 @@ class packstack::placement ()
       # TO-DO(mmagr): Add IPv6 support when hostnames are used
     }
 
-    include ::packstack::keystone::placement
-    include ::placement
+    include packstack::keystone::placement
+    include placement
 
-    class { '::placement::logging':
+    class { 'placement::logging':
       debug => hiera('CONFIG_DEBUG_MODE'),
     }
 
-    class { '::placement::db':
+    class { 'placement::db':
       database_connection => "mysql+pymysql://placement:${placement_db_pw}@${placement_mariadb_host}/placement",
     }
 
-    include ::placement::db::sync
+    include placement::db::sync
 
-    class { '::placement::wsgi::apache':
+    class { 'placement::wsgi::apache':
       bind_host => $bind_host,
       api_port  => '8778',
       ssl       => false,
diff --git a/packstack/puppet/modules/packstack/manifests/provision/bridge.pp b/packstack/puppet/modules/packstack/manifests/provision/bridge.pp
index 908e74c4a..84aca85aa 100644
--- a/packstack/puppet/modules/packstack/manifests/provision/bridge.pp
+++ b/packstack/puppet/modules/packstack/manifests/provision/bridge.pp
@@ -14,7 +14,7 @@ class packstack::provision::bridge ()
       $floating_range_br = hiera('CONFIG_PROVISION_TEMPEST_FLOATRANGE')
     }
 
-    class { '::neutron::keystone::authtoken':
+    class { 'neutron::keystone::authtoken':
       username             => 'neutron',
       password             => $neutron_user_password,
       www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
diff --git a/packstack/puppet/modules/packstack/manifests/provision/tempest.pp b/packstack/puppet/modules/packstack/manifests/provision/tempest.pp
index 9652c2440..168f2bbbb 100644
--- a/packstack/puppet/modules/packstack/manifests/provision/tempest.pp
+++ b/packstack/puppet/modules/packstack/manifests/provision/tempest.pp
@@ -103,7 +103,7 @@ class packstack::provision::tempest ()
       $neutron_api_extensions = undef
     }
 
-    class { '::tempest':
+    class { 'tempest':
       admin_domain_name         => $admin_domain_name,
       admin_password            => $admin_password,
       admin_tenant_name         => $admin_tenant_name,
diff --git a/packstack/puppet/modules/packstack/manifests/redis.pp b/packstack/puppet/modules/packstack/manifests/redis.pp
index 4f66afefa..a1640b0f8 100644
--- a/packstack/puppet/modules/packstack/manifests/redis.pp
+++ b/packstack/puppet/modules/packstack/manifests/redis.pp
@@ -5,7 +5,7 @@ class packstack::redis ()
     $redis_port = Integer(hiera('CONFIG_REDIS_PORT'))
     $redis_host = hiera('CONFIG_REDIS_HOST')
 
-    class { '::redis':
+    class { 'redis':
       bind           => $redis_host,
       port           => $redis_port,
       appendonly     => true,
diff --git a/packstack/puppet/modules/packstack/manifests/sahara.pp b/packstack/puppet/modules/packstack/manifests/sahara.pp
index b9df008e7..9d42be2fd 100644
--- a/packstack/puppet/modules/packstack/manifests/sahara.pp
+++ b/packstack/puppet/modules/packstack/manifests/sahara.pp
@@ -2,9 +2,9 @@ class packstack::sahara ()
 {
     create_resources(packstack::firewall, hiera('FIREWALL_SAHARA_CFN_RULES', {}))
 
-    class { '::sahara::service::api':
+    class { 'sahara::service::api':
       api_workers => hiera('CONFIG_SERVICE_WORKERS')
     }
 
-    class { '::sahara::service::engine': }
+    class { 'sahara::service::engine': }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/sahara/ceilometer.pp b/packstack/puppet/modules/packstack/manifests/sahara/ceilometer.pp
index 301a08eae..238b8ec44 100644
--- a/packstack/puppet/modules/packstack/manifests/sahara/ceilometer.pp
+++ b/packstack/puppet/modules/packstack/manifests/sahara/ceilometer.pp
@@ -1,6 +1,6 @@
 class packstack::sahara::ceilometer ()
 {
-    class { '::sahara::notify':
+    class { 'sahara::notify':
       notification_driver  => 'messagingv2',
     }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp
index 5329f069f..a698295a8 100644
--- a/packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp
@@ -22,7 +22,7 @@ class packstack::sahara::rabbitmq ()
       File[$files_to_set_owner] ~> Service<| tag == 'sahara-service' |>
     }
 
-    class { '::sahara::keystone::authtoken':
+    class { 'sahara::keystone::authtoken':
       username             => 'sahara',
       password             => hiera('CONFIG_SAHARA_KS_PW'),
       project_name         => 'services',
@@ -30,11 +30,11 @@ class packstack::sahara::rabbitmq ()
       auth_url             => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
     }
 
-    class { '::sahara::logging':
+    class { 'sahara::logging':
       debug => hiera('CONFIG_DEBUG_MODE'),
     }
 
-    class { '::sahara':
+    class { 'sahara':
       database_connection   =>
         "mysql+pymysql://sahara:${sahara_cfg_sahara_db_pw}@${sahara_cfg_sahara_mariadb_host}/sahara",
       host                  => hiera('CONFIG_SAHARA_HOST'),
diff --git a/packstack/puppet/modules/packstack/manifests/swift.pp b/packstack/puppet/modules/packstack/manifests/swift.pp
index 81b763e7e..9be136789 100644
--- a/packstack/puppet/modules/packstack/manifests/swift.pp
+++ b/packstack/puppet/modules/packstack/manifests/swift.pp
@@ -2,7 +2,7 @@ class packstack::swift ()
 {
     # Class['swift'] -> Service <| |>
 
-    class { '::swift':
+    class { 'swift':
       # not sure how I want to deal with this shared secret
       swift_hash_path_suffix => hiera('CONFIG_SWIFT_HASH'),
       package_ensure         => latest,
diff --git a/packstack/puppet/modules/packstack/manifests/swift/ceilometer.pp b/packstack/puppet/modules/packstack/manifests/swift/ceilometer.pp
index 328d15a18..0b096e637 100644
--- a/packstack/puppet/modules/packstack/manifests/swift/ceilometer.pp
+++ b/packstack/puppet/modules/packstack/manifests/swift/ceilometer.pp
@@ -5,7 +5,7 @@ class packstack::swift::ceilometer ()
     $rabbit_userid = hiera('CONFIG_AMQP_AUTH_USER')
     $rabbit_password = hiera('CONFIG_AMQP_AUTH_PASSWORD')
 
-    class { '::swift::proxy::ceilometer':
+    class { 'swift::proxy::ceilometer':
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
       topic                 => 'notifications',
       control_exchange      => 'swift',
diff --git a/packstack/puppet/modules/packstack/manifests/swift/proxy.pp b/packstack/puppet/modules/packstack/manifests/swift/proxy.pp
index 14ffa94a2..7c4be1e61 100644
--- a/packstack/puppet/modules/packstack/manifests/swift/proxy.pp
+++ b/packstack/puppet/modules/packstack/manifests/swift/proxy.pp
@@ -9,7 +9,7 @@ class packstack::swift::proxy ()
       # TO-DO(mmagr): Add IPv6 support when hostnames are used
     }
 
-    include '::packstack::memcached'
+    include packstack::memcached
 
     if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' and
       hiera('CONFIG_ENABLE_CEILOMETER_MIDDLEWARE') == 'y' {
@@ -51,7 +51,7 @@ class packstack::swift::proxy ()
       ]
     }
 
-    class { '::swift::proxy':
+    class { 'swift::proxy':
       # swift seems to require ipv6 address without brackets
       proxy_local_net_ip => hiera('CONFIG_STORAGE_HOST'),
       pipeline           => $swift_pipeline,
@@ -73,14 +73,14 @@ class packstack::swift::proxy ()
       '::swift::proxy::container_quotas',
     ]: }
 
-    class { '::swift::proxy::bulk':
+    class { 'swift::proxy::bulk':
       max_containers_per_extraction => 10000,
       max_failed_extractions        => 1000,
       max_deletes_per_request       => 10000,
       yield_frequency               => 60,
     }
 
-    class { '::swift::proxy::ratelimit':
+    class { 'swift::proxy::ratelimit':
       clock_accuracy         => 1000,
       max_sleep_time_seconds => 60,
       log_sleep_time_seconds => 0,
@@ -88,11 +88,11 @@ class packstack::swift::proxy ()
       account_ratelimit      => 0,
     }
 
-    class { '::swift::proxy::keystone':
+    class { 'swift::proxy::keystone':
       operator_roles => ['admin', 'SwiftOperator', '_member_'],
     }
 
-    class { '::swift::proxy::authtoken':
+    class { 'swift::proxy::authtoken':
       username             => 'swift',
       project_name         => 'services',
       password             => hiera('CONFIG_SWIFT_KS_PW'),
@@ -101,5 +101,5 @@ class packstack::swift::proxy ()
       auth_url             => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
     }
 
-    class { '::swift::objectexpirer': }
+    class { 'swift::objectexpirer': }
 }
diff --git a/packstack/puppet/modules/packstack/manifests/swift/ringbuilder.pp b/packstack/puppet/modules/packstack/manifests/swift/ringbuilder.pp
index 83eb649de..584b17024 100644
--- a/packstack/puppet/modules/packstack/manifests/swift/ringbuilder.pp
+++ b/packstack/puppet/modules/packstack/manifests/swift/ringbuilder.pp
@@ -1,6 +1,6 @@
 class packstack::swift::ringbuilder ()
 {
-    class { '::swift::ringbuilder':
+    class { 'swift::ringbuilder':
       part_power     => '18',
       replicas       => hiera('CONFIG_SWIFT_STORAGE_REPLICAS'),
       min_part_hours => 1,
@@ -8,7 +8,7 @@ class packstack::swift::ringbuilder ()
     }
 
     # sets up an rsync db that can be used to sync the ring DB
-    class { '::swift::ringserver':
+    class { 'swift::ringserver':
       local_net_ip => hiera('CONFIG_STORAGE_HOST_URL'),
     }
 
diff --git a/packstack/puppet/modules/packstack/manifests/swift/storage.pp b/packstack/puppet/modules/packstack/manifests/swift/storage.pp
index 5df5146e7..cc765c245 100644
--- a/packstack/puppet/modules/packstack/manifests/swift/storage.pp
+++ b/packstack/puppet/modules/packstack/manifests/swift/storage.pp
@@ -3,7 +3,7 @@ class packstack::swift::storage ()
     create_resources(packstack::firewall, hiera('FIREWALL_SWIFT_STORAGE_RULES', {}))
 
     # install all swift storage servers together
-    class { '::swift::storage::all':
+    class { 'swift::storage::all':
       # looks like ipv6 address without brackets is required here
       storage_local_net_ip => hiera('CONFIG_STORAGE_HOST'),
       allow_versions       => true,
diff --git a/packstack/puppet/modules/packstack/manifests/trove.pp b/packstack/puppet/modules/packstack/manifests/trove.pp
index c352d7372..a4f4d4b9a 100644
--- a/packstack/puppet/modules/packstack/manifests/trove.pp
+++ b/packstack/puppet/modules/packstack/manifests/trove.pp
@@ -8,16 +8,16 @@ class packstack::trove ()
       # TO-DO(mmagr): Add IPv6 support when hostnames are used
     }
 
-    class { '::trove::keystone::authtoken':
+    class { 'trove::keystone::authtoken':
       password => hiera('CONFIG_TROVE_KS_PW'),
       auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
     }
 
-    class { '::trove::logging':
+    class { 'trove::logging':
       debug => hiera('CONFIG_DEBUG_MODE'),
     }
 
-    class { '::trove::api':
+    class { 'trove::api':
       bind_host => $bind_host,
       enabled   => true,
       cert_file => false,
@@ -26,13 +26,13 @@ class packstack::trove ()
       workers   => hiera('CONFIG_SERVICE_WORKERS'),
     }
 
-    class { '::trove::conductor':
+    class { 'trove::conductor':
       auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
       debug    => hiera('CONFIG_DEBUG_MODE'),
       workers  => hiera('CONFIG_SERVICE_WORKERS'),
     }
 
-    class { '::trove::taskmanager':
+    class { 'trove::taskmanager':
       auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
       debug    => hiera('CONFIG_DEBUG_MODE'),
     }
diff --git a/packstack/puppet/modules/packstack/manifests/trove/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/trove/rabbitmq.pp
index 2eab797e4..b3f232ee1 100644
--- a/packstack/puppet/modules/packstack/manifests/trove/rabbitmq.pp
+++ b/packstack/puppet/modules/packstack/manifests/trove/rabbitmq.pp
@@ -24,7 +24,7 @@ class packstack::trove::rabbitmq ()
     }
 
 
-    class { '::trove':
+    class { 'trove':
       rabbit_use_ssl               => hiera('CONFIG_AMQP_SSL_ENABLED'),
       default_transport_url        => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
       database_connection          => "mysql+pymysql://trove:${trove_rabmq_cfg_trove_db_pw}@${trove_rabmq_cfg_mariadb_host}/trove",
diff --git a/packstack/puppet/templates/compute.pp b/packstack/puppet/templates/compute.pp
index 8e41c3119..3fa2ea6a8 100644
--- a/packstack/puppet/templates/compute.pp
+++ b/packstack/puppet/templates/compute.pp
@@ -3,57 +3,57 @@ stage { "init": before  => Stage["main"] }
 Exec { timeout => hiera('DEFAULT_EXEC_TIMEOUT') }
 Package { allow_virtual => true }
 
-class {'::packstack::prereqs':
+class { 'packstack::prereqs':
   stage => init,
 }
 
-include ::firewall
+include firewall
 
 create_resources(sshkey, hiera('SSH_KEYS', {}))
 
 if hiera('CONFIG_NTP_SERVERS', '') != '' {
-  include '::packstack::chrony'
+  include 'packstack::chrony'
 }
 
 if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
-  include '::packstack::nova::ceilometer::rabbitmq'
-  include '::packstack::nova::ceilometer'
+  include 'packstack::nova::ceilometer::rabbitmq'
+  include 'packstack::nova::ceilometer'
 }
 
-include '::packstack::nova'
-include '::packstack::nova::common'
-include '::packstack::nova::compute'
+include 'packstack::nova'
+include 'packstack::nova::common'
+include 'packstack::nova::compute'
 
 if hiera('CONFIG_VMWARE_BACKEND') == 'y' {
-  include '::packstack::nova::compute::vmware'
+  include 'packstack::nova::compute::vmware'
 } elsif hiera('CONFIG_IRONIC_INSTALL') == 'y' {
-  include '::packstack::nova::compute::ironic'
+  include 'packstack::nova::compute::ironic'
 } else {
-  include '::packstack::nova::compute::libvirt'
+  include 'packstack::nova::compute::libvirt'
 }
 
 if hiera('CONFIG_CINDER_INSTALL') == 'y' and
    hiera('CONFIG_VMWARE_BACKEND') != 'y' {
    if 'nfs' in hiera_array('CONFIG_CINDER_BACKEND') {
-    include '::packstack::nova::nfs'
+    include 'packstack::nova::nfs'
    }
 }
 
 if hiera('CONFIG_NEUTRON_INSTALL') == 'y' {
-  include '::packstack::nova::neutron'
-  include '::packstack::neutron::rabbitmq'
+  include 'packstack::nova::neutron'
+  include 'packstack::neutron::rabbitmq'
   case hiera('CONFIG_NEUTRON_L2_AGENT') {
-    'openvswitch': { include '::packstack::neutron::ovs_agent' }
-    'linuxbridge': { include '::packstack::neutron::lb_agent' }
-    'ovn':         { include '::packstack::neutron::ovn_agent'
-                     include '::packstack::neutron::ovn_metadata'
+    'openvswitch': { include 'packstack::neutron::ovs_agent' }
+    'linuxbridge': { include 'packstack::neutron::lb_agent' }
+    'ovn':         { include 'packstack::neutron::ovn_agent'
+                     include 'packstack::neutron::ovn_metadata'
                    }
-    default:       { include '::packstack::neutron::ovs_agent' }
+    default:       { include 'packstack::neutron::ovs_agent' }
   }
-  include '::packstack::neutron::bridge'
+  include 'packstack::neutron::bridge'
 
   if 'sriovnicswitch' in hiera_array('CONFIG_NEUTRON_ML2_MECHANISM_DRIVERS') and
      hiera ('CONFIG_NEUTRON_L2_AGENT') == 'openvswitch' {
-    include '::packstack::neutron::sriov'
+    include 'packstack::neutron::sriov'
   }
 }
diff --git a/packstack/puppet/templates/controller.pp b/packstack/puppet/templates/controller.pp
index 1395fce66..12ece73f6 100644
--- a/packstack/puppet/templates/controller.pp
+++ b/packstack/puppet/templates/controller.pp
@@ -3,18 +3,18 @@ stage { "init": before  => Stage["main"] }
 Exec { timeout => hiera('DEFAULT_EXEC_TIMEOUT') }
 Package { allow_virtual => true }
 
-class {'::packstack::prereqs':
+class { 'packstack::prereqs':
   stage => init,
 }
 
-include ::firewall
+include firewall
 
 if hiera('CONFIG_NTP_SERVERS', '') != '' {
-  include '::packstack::chrony'
+  include 'packstack::chrony'
 }
 
-include '::packstack::amqp'
-include '::packstack::mariadb'
+include 'packstack::amqp'
+include 'packstack::mariadb'
 
 if hiera('CONFIG_MARIADB_INSTALL') == 'y' {
   include 'packstack::mariadb::services'
@@ -22,183 +22,183 @@ if hiera('CONFIG_MARIADB_INSTALL') == 'y' {
   include 'packstack::mariadb::services_remote'
 }
 
-include '::packstack::apache'
-include '::packstack::keystone'
+include 'packstack::apache'
+include 'packstack::keystone'
 
 if hiera('CONFIG_GLANCE_INSTALL') == 'y' {
-  include '::packstack::keystone::glance'
-  include '::packstack::glance'
+  include 'packstack::keystone::glance'
+  include 'packstack::glance'
   if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
-    include '::packstack::glance::ceilometer'
+    include 'packstack::glance::ceilometer'
   }
   if hiera('CONFIG_GLANCE_BACKEND') == 'swift' {
-    include '::packstack::glance::backend::swift'
+    include 'packstack::glance::backend::swift'
   } else {
-    include '::packstack::glance::backend::file'
+    include 'packstack::glance::backend::file'
   }
 }
 
 if hiera('CONFIG_CINDER_INSTALL') == 'y' {
-  include '::packstack::keystone::cinder'
-  include '::packstack::cinder::rabbitmq'
-  include '::packstack::cinder'
+  include 'packstack::keystone::cinder'
+  include 'packstack::cinder::rabbitmq'
+  include 'packstack::cinder'
   if hiera('CONFIG_SWIFT_INSTALL') == 'y' {
-    include '::packstack::cinder::backup'
+    include 'packstack::cinder::backup'
   }
 
   $cinder_backends = hiera_array('CONFIG_CINDER_BACKEND')
 
   case $cinder_backends[0] {
-    'lvm':       { include '::packstack::cinder::backend::lvm' }
-    'nfs':       { include '::packstack::cinder::backend::nfs' }
-    'vmdk':      { include '::packstack::cinder::backend::vmdk' }
-    'netapp':    { include '::packstack::cinder::backend::netapp' }
-    'solidfire': { include '::packstack::cinder::backend::solidfire' }
-    default:     { include '::packstack::cinder::backend::lvm' }
+    'lvm':       { include 'packstack::cinder::backend::lvm' }
+    'nfs':       { include 'packstack::cinder::backend::nfs' }
+    'vmdk':      { include 'packstack::cinder::backend::vmdk' }
+    'netapp':    { include 'packstack::cinder::backend::netapp' }
+    'solidfire': { include 'packstack::cinder::backend::solidfire' }
+    default:     { include 'packstack::cinder::backend::lvm' }
   }
 }
 
 if hiera('CONFIG_IRONIC_INSTALL') == 'y' {
-  include '::packstack::keystone::ironic'
-  include '::packstack::ironic'
-  include '::packstack::ironic::rabbitmq'
+  include 'packstack::keystone::ironic'
+  include 'packstack::ironic'
+  include 'packstack::ironic::rabbitmq'
 }
 
 if hiera('CONFIG_NOVA_INSTALL') == 'y' {
-  include '::packstack::keystone::nova'
-  include '::packstack::nova'
-  include '::packstack::nova::common'
-  include '::packstack::nova::api'
-  include '::packstack::nova::conductor'
+  include 'packstack::keystone::nova'
+  include 'packstack::nova'
+  include 'packstack::nova::common'
+  include 'packstack::nova::api'
+  include 'packstack::nova::conductor'
   if hiera('CONFIG_IRONIC_INSTALL') == 'y' {
-    include '::packstack::nova::sched::ironic'
+    include 'packstack::nova::sched::ironic'
   } else {
-    include '::packstack::nova::sched'
+    include 'packstack::nova::sched'
   }
-  include '::packstack::nova::vncproxy'
+  include 'packstack::nova::vncproxy'
   if hiera('CONFIG_NEUTRON_INSTALL') == 'y' {
-    include '::packstack::nova::neutron'
+    include 'packstack::nova::neutron'
   }
-  include '::packstack::placement'
+  include 'packstack::placement'
 }
 
 if hiera('CONFIG_NEUTRON_INSTALL') == 'y' {
-  include '::packstack::keystone::neutron'
-  include '::packstack::neutron::rabbitmq'
-  include '::packstack::neutron::api'
+  include 'packstack::keystone::neutron'
+  include 'packstack::neutron::rabbitmq'
+  include 'packstack::neutron::api'
   if hiera('CONFIG_NOVA_INSTALL') == 'y' {
-    include '::packstack::neutron::notifications'
+    include 'packstack::neutron::notifications'
   }
-  include '::packstack::neutron::ml2'
+  include 'packstack::neutron::ml2'
   if hiera('CONFIG_NEUTRON_L2_AGENT') == 'ovn' {
-    include '::packstack::neutron::ovn_northd'
+    include 'packstack::neutron::ovn_northd'
   }
 }
 
 if hiera('CONFIG_MANILA_INSTALL') == 'y' {
-  include '::packstack::keystone::manila'
-  include '::packstack::manila'
-  include '::packstack::manila::rabbitmq'
+  include 'packstack::keystone::manila'
+  include 'packstack::manila'
+  include 'packstack::manila::rabbitmq'
   if 'generic' in hiera_array('CONFIG_MANILA_BACKEND') {
-    include '::packstack::manila::backend::generic'
+    include 'packstack::manila::backend::generic'
   }
   if 'netapp' in hiera_array('CONFIG_MANILA_BACKEND') {
-    include '::packstack::manila::backend::netapp'
+    include 'packstack::manila::backend::netapp'
   }
   if 'glusternative' in hiera_array('CONFIG_MANILA_BACKEND') {
-    include '::packstack::manila::backend::glusternative'
+    include 'packstack::manila::backend::glusternative'
   }
   if 'glusternfs' in hiera_array('CONFIG_MANILA_BACKEND') {
-    include '::packstack::manila::backend::glusternfs'
+    include 'packstack::manila::backend::glusternfs'
   }
 }
 
-include '::packstack::openstackclient'
+include 'packstack::openstackclient'
 
 if hiera('CONFIG_HORIZON_INSTALL') == 'y' {
-  include '::packstack::horizon'
+  include 'packstack::horizon'
 }
 
 if hiera('CONFIG_SWIFT_INSTALL') == 'y' {
-  include '::packstack::keystone::swift'
-  include '::packstack::swift'
-  include '::packstack::swift::ringbuilder'
-  include '::packstack::swift::proxy'
-  include '::packstack::swift::storage'
+  include 'packstack::keystone::swift'
+  include 'packstack::swift'
+  include 'packstack::swift::ringbuilder'
+  include 'packstack::swift::proxy'
+  include 'packstack::swift::storage'
   if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' and
      hiera('CONFIG_ENABLE_CEILOMETER_MIDDLEWARE') == 'y' {
-    include '::packstack::swift::ceilometer'
+    include 'packstack::swift::ceilometer'
   }
 }
 
 if hiera('CONFIG_HEAT_INSTALL') == 'y' {
-  include '::packstack::keystone::heat'
-  include '::packstack::heat::rabbitmq'
-  include '::packstack::heat'
+  include 'packstack::keystone::heat'
+  include 'packstack::heat::rabbitmq'
+  include 'packstack::heat'
   if hiera('CONFIG_HEAT_CFN_INSTALL') == 'y' {
-    include '::packstack::heat::cfn'
+    include 'packstack::heat::cfn'
   }
 }
 
 if hiera('CONFIG_MAGNUM_INSTALL') == 'y' {
-  include '::packstack::keystone::magnum'
-  include '::packstack::magnum'
-  include '::packstack::magnum::rabbitmq'
+  include 'packstack::keystone::magnum'
+  include 'packstack::magnum'
+  include 'packstack::magnum::rabbitmq'
 }
 
 if hiera('CONFIG_PROVISION_DEMO') == 'y' or hiera('CONFIG_PROVISION_TEMPEST') == 'y' {
-  include '::packstack::provision'
+  include 'packstack::provision'
   if hiera('CONFIG_GLANCE_INSTALL') == 'y' {
-    include '::packstack::provision::glance'
+    include 'packstack::provision::glance'
   }
 }
 
 if hiera('CONFIG_PROVISION_TEMPEST') == 'y' {
-  include '::packstack::provision::tempest'
+  include 'packstack::provision::tempest'
 }
 
 
 if hiera('CONFIG_PROVISION_TEMPEST') == 'y' {
-  include '::packstack::provision::tempest'
+  include 'packstack::provision::tempest'
 }
 
 
 if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' and hiera('CONFIG_PANKO_INSTALL') == 'y' {
-  include '::packstack::keystone::panko'
-  include '::packstack::panko'
+  include 'packstack::keystone::panko'
+  include 'packstack::panko'
 }
 
 if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
   # setup gnocchi
-  include '::packstack::keystone::gnocchi'
-  include '::packstack::gnocchi'
+  include 'packstack::keystone::gnocchi'
+  include 'packstack::gnocchi'
   # setup ceilometer
-  include '::packstack::keystone::ceilometer'
-  include '::packstack::ceilometer::rabbitmq'
-  include '::packstack::ceilometer'
+  include 'packstack::keystone::ceilometer'
+  include 'packstack::ceilometer::rabbitmq'
+  include 'packstack::ceilometer'
   if hiera('CONFIG_NOVA_INSTALL') == 'n' {
-    include '::packstack::ceilometer::nova_disabled'
+    include 'packstack::ceilometer::nova_disabled'
   }
-  include '::packstack::redis'
+  include 'packstack::redis'
 }
 
 if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' and hiera('CONFIG_AODH_INSTALL') == 'y' {
-  include '::packstack::keystone::aodh'
-  include '::packstack::aodh::rabbitmq'
-  include '::packstack::aodh'
+  include 'packstack::keystone::aodh'
+  include 'packstack::aodh::rabbitmq'
+  include 'packstack::aodh'
 }
 
 if hiera('CONFIG_TROVE_INSTALL') == 'y' {
-  include '::packstack::keystone::trove'
-  include '::packstack::trove::rabbitmq'
-  include '::packstack::trove'
+  include 'packstack::keystone::trove'
+  include 'packstack::trove::rabbitmq'
+  include 'packstack::trove'
 }
 
 if hiera('CONFIG_SAHARA_INSTALL') == 'y' {
-  include '::packstack::keystone::sahara'
-  include '::packstack::sahara::rabbitmq'
-  include '::packstack::sahara'
+  include 'packstack::keystone::sahara'
+  include 'packstack::sahara::rabbitmq'
+  include 'packstack::sahara'
   if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
-    include '::packstack::sahara::ceilometer'
+    include 'packstack::sahara::ceilometer'
   }
 }
diff --git a/packstack/puppet/templates/controller_post.pp b/packstack/puppet/templates/controller_post.pp
index 84b97fad7..d4946a6a9 100644
--- a/packstack/puppet/templates/controller_post.pp
+++ b/packstack/puppet/templates/controller_post.pp
@@ -3,11 +3,11 @@ stage { "init": before  => Stage["main"] }
 Exec { timeout => hiera('DEFAULT_EXEC_TIMEOUT') }
 Package { allow_virtual => true }
 
-class {'::packstack::prereqs':
+class { 'packstack::prereqs':
   stage => init,
 }
 
-include ::nova::cell_v2::discover_hosts
+include nova::cell_v2::discover_hosts
 
 notify {'Discovering compute nodes': } ~> Class['nova::cell_v2::discover_hosts']
 
diff --git a/packstack/puppet/templates/network.pp b/packstack/puppet/templates/network.pp
index 1d06c11e0..c66ff6f78 100644
--- a/packstack/puppet/templates/network.pp
+++ b/packstack/puppet/templates/network.pp
@@ -3,44 +3,44 @@ stage { "init": before  => Stage["main"] }
 Exec { timeout => hiera('DEFAULT_EXEC_TIMEOUT') }
 Package { allow_virtual => true }
 
-class {'::packstack::prereqs':
+class { 'packstack::prereqs':
   stage => init,
 }
 
-include ::firewall
+include firewall
 
 if hiera('CONFIG_NTP_SERVERS', '') != '' {
-  include '::packstack::chrony'
+  include 'packstack::chrony'
 }
 
 if hiera('CONFIG_NEUTRON_INSTALL') == 'y' {
-  include '::packstack::neutron::rabbitmq'
+  include 'packstack::neutron::rabbitmq'
 
   if hiera('CONFIG_NEUTRON_VPNAAS') == 'y' {
-    include '::packstack::neutron::vpnaas'
+    include 'packstack::neutron::vpnaas'
   }
   if hiera('CONFIG_NEUTRON_L2_AGENT') != 'ovn' {
-    include '::packstack::neutron::l3'
+    include 'packstack::neutron::l3'
   }
   if hiera('CONFIG_NEUTRON_OVS_BRIDGE_CREATE') == 'y' {
-    include '::packstack::neutron::ovs_bridge'
+    include 'packstack::neutron::ovs_bridge'
   }
 
   case hiera('CONFIG_NEUTRON_L2_AGENT') {
-    'openvswitch': { include '::packstack::neutron::ovs_agent' }
-    'linuxbridge': { include '::packstack::neutron::lb_agent' }
-    'ovn':         { include '::packstack::neutron::ovn_agent' }
-    default:       { include '::packstack::neutron::ovs_agent' }
+    'openvswitch': { include 'packstack::neutron::ovs_agent' }
+    'linuxbridge': { include 'packstack::neutron::lb_agent' }
+    'ovn':         { include 'packstack::neutron::ovn_agent' }
+    default:       { include 'packstack::neutron::ovs_agent' }
   }
-  include '::packstack::neutron::bridge'
+  include 'packstack::neutron::bridge'
   if hiera('CONFIG_NEUTRON_L2_AGENT') != 'ovn' {
-    include '::packstack::neutron::dhcp'
-    include '::packstack::neutron::metadata'
+    include 'packstack::neutron::dhcp'
+    include 'packstack::neutron::metadata'
   }
   if hiera('CONFIG_NEUTRON_METERING_AGENT_INSTALL') == 'y' {
-    include '::packstack::neutron::metering'
+    include 'packstack::neutron::metering'
   }
   if hiera('CONFIG_PROVISION_DEMO') == 'y' or hiera('CONFIG_PROVISION_TEMPEST') == 'y' {
-    include '::packstack::provision::bridge'
+    include 'packstack::provision::bridge'
   }
 }