Convert all class usage to relative names

Change-Id: I9c2d172c157e3874f95fc77f90017ff9cfeae94e

diff --git a/README.md b/README.md
index 58da0824d98d9f59f43c552e9d0a29e8661900fd..1814295e8b370e0a3d1361e2ac88878a6a863590 100644 (file)
--- a/README.md
+++ b/README.md
@@ -52,19 +52,19 @@ Setup
 To utilize the ceilometer module's functionality you will need to declare multiple resources. This is not an exhaustive list of all the components needed. We recommend that you consult and understand the [core openstack](https://docs.openstack.org) documentation to assist you in understanding the available deployment options.
 
 ```puppet
-class { '::ceilometer':
+class { 'ceilometer':
   telemetry_secret      => 'secrete',
   default_transport_url => 'rabbit://ceilometer:an_even_bigger_secret@127.0.0.1:5672',
 }
-class { '::ceilometer::keystone::auth':
+class { 'ceilometer::keystone::auth':
   password => 'a_big_secret',
 }
-class { '::ceilometer::collector': }
-class { '::ceilometer::expirer': }
-class { '::ceilometer::agent::polling': }
-class { '::ceilometer::agent::notification': }
-class { '::ceilometer::db': }
-class { '::ceilometer::keystone::authtoken':
+class { 'ceilometer::collector': }
+class { 'ceilometer::expirer': }
+class { 'ceilometer::agent::polling': }
+class { 'ceilometer::agent::notification': }
+class { 'ceilometer::db': }
+class { 'ceilometer::keystone::authtoken':
   password => 'a_big_secret',
   auth_url => 'http://127.0.0.1:5000/',
 }

diff --git a/examples/ceilometer_with_gnocchi.pp b/examples/ceilometer_with_gnocchi.pp
index 36f8694fc41339f546a8782da0b77bc71dfbd0cf..e1c353158442656f6a7d85b27d98e502e2129d00 100644 (file)
--- a/examples/ceilometer_with_gnocchi.pp
+++ b/examples/ceilometer_with_gnocchi.pp
@@ -1,27 +1,27 @@
-class { '::ceilometer':
+class { 'ceilometer':
   telemetry_secret      => 'secrete',
   default_transport_url => 'rabbit://ceilometer:an_even_bigger_secret@127.0.0.1:5672',
 }
-class { '::ceilometer::db::mysql':
+class { 'ceilometer::db::mysql':
   password => 'a_big_secret',
 }
-class { '::ceilometer::db':
+class { 'ceilometer::db':
   database_connection => 'mysql://ceilometer:a_big_secret@127.0.0.1/ceilometer?charset=utf8',
 }
-class { '::ceilometer::keystone::auth':
+class { 'ceilometer::keystone::auth':
   password => 'a_big_secret',
 }
-class { '::ceilometer::expirer': }
-class { '::ceilometer::agent::polling': }
-class { '::ceilometer::agent::notification': }
-class { '::ceilometer::keystone::authtoken':
+class { 'ceilometer::expirer': }
+class { 'ceilometer::agent::polling': }
+class { 'ceilometer::agent::notification': }
+class { 'ceilometer::keystone::authtoken':
   password => 'a_big_secret',
 }
 
-class { '::ceilometer::collector':
+class { 'ceilometer::collector':
   meter_dispatchers => ['gnocchi'],
 }
-class { '::ceilometer::dispatcher::gnocchi':
+class { 'ceilometer::dispatcher::gnocchi':
   filter_service_activity   => false,
   filter_project            => 'gnocchi_swift',
   url                       => 'https://gnocchi:8041',

diff --git a/examples/site.pp b/examples/site.pp
index 7cd643879d44d00e223704a2aadf01374ef35796..746e5cdd630bd46aa3650ff108a91123a9c0a236 100644 (file)
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -4,38 +4,38 @@ node default {
   }
 
   # First, install a mysql server
-  class { '::mysql::server': }
+  class { 'mysql::server': }
   # And create the database
-  class { '::ceilometer::db::mysql':
+  class { 'ceilometer::db::mysql':
     password => 'ceilometer',
   }
 
   # Add the base ceilometer class & parameters
   # This class is required by ceilometer agents & api classes
   # The telemetry_secret parameter is mandatory
-  class { '::ceilometer':
+  class { 'ceilometer':
     telemetry_secret => 'darksecret'
   }
 
   # Configure the ceilometer database
   # Only needed if ceilometer::agent::polling or ceilometer::api are declared
-  class { '::ceilometer::db':
+  class { 'ceilometer::db':
   }
 
   # Configure ceilometer database with mongodb
 
-  # class { '::ceilometer::db':
+  # class { 'ceilometer::db':
   #   database_connection => 'mongodb://localhost:27017/ceilometer',
   #   require             => Class['mongodb'],
   # }
 
   # Configure keystonemiddleware for ceilometer
-  class { '::ceilometer::keystone::authtoken':
+  class { 'ceilometer::keystone::authtoken':
     password => 'tralalayouyou'
   }
 
   # Set common auth parameters used by all agents (compute/central)
-  class { '::ceilometer::agent::auth':
+  class { 'ceilometer::agent::auth':
     auth_url      => 'http://localhost:5000/v3',
     auth_password => 'tralalerotralala'
   }
@@ -58,17 +58,17 @@ node default {
   #   ipmi_namespace    => true
   # }
   # As default use central and compute polling namespaces
-  class { '::ceilometer::agent::polling':
+  class { 'ceilometer::agent::polling':
     central_namespace => true,
     compute_namespace => true,
     ipmi_namespace    => false,
   }
 
   # Purge old meters
-  class { '::ceilometer::expirer': }
+  class { 'ceilometer::expirer': }
 
   # Install notification agent
-  class { '::ceilometer::agent::notification':
+  class { 'ceilometer::agent::notification':
   }
 
 }

diff --git a/manifests/agent/auth.pp b/manifests/agent/auth.pp
index 628a1447d67c952379b40357e6a8e928a0e55931..a00f4433a1a6d6c382c4c05f8e981a78a425bd4e 100644 (file)
--- a/manifests/agent/auth.pp
+++ b/manifests/agent/auth.pp
@@ -63,7 +63,7 @@ class ceilometer::agent::auth (
   $auth_type                = 'password',
 ) {
 
-  include ::ceilometer::deps
+  include ceilometer::deps
 
   if ! $auth_cacert {
     ceilometer_config { 'service_credentials/cafile': ensure => absent }

diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
index a90f0af48c601025a47480da96041ee96f039523..9514c4246e44fdb88ddff83e459b17929e62449e 100644 (file)
--- a/manifests/agent/notification.pp
+++ b/manifests/agent/notification.pp
@@ -87,8 +87,8 @@ class ceilometer::agent::notification (
   $pipeline_publishers       = ['gnocchi://'],
 ) {
 
-  include ::ceilometer::deps
-  include ::ceilometer::params
+  include ceilometer::deps
+  include ceilometer::params
 
   ensure_resource('package', [$::ceilometer::params::agent_notification_package_name],
     {

diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index 1344abfa544b71874e93c6ab8a1dac7454ff680a..9f1f24085753208ba29f474bbce56d5c187b42c7 100644 (file)
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -67,8 +67,8 @@ class ceilometer::agent::polling (
   $polling_meters            = $::ceilometer::params::polling_meters,
 ) inherits ceilometer {
 
-  include ::ceilometer::deps
-  include ::ceilometer::params
+  include ceilometer::deps
+  include ceilometer::params
 
   if $central_namespace {
     $central_namespace_name = 'central'

diff --git a/manifests/config.pp b/manifests/config.pp
index ae1051367968dc6844e4efa040917969c456167d..f4587bee636fc88992cc9d800b39ef71ada12159 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -26,11 +26,11 @@
 #   or Puppet catalog compilation will fail with duplicate resources.
 #
 class ceilometer::config (
-  $ceilometer_config           = {},
-  $ceilometer_api_paste_ini    = {},
+  $ceilometer_config        = {},
+  $ceilometer_api_paste_ini = {},
 ) {
 
-  include ::ceilometer::deps
+  include ceilometer::deps
 
   validate_legacy(Hash, 'validate_hash', $ceilometer_config)
   validate_legacy(Hash, 'validate_hash', $ceilometer_api_paste_ini)

diff --git a/manifests/db.pp b/manifests/db.pp
index 98202a3d654556a46f37c580471ed6f1d2e19b29..09ca61d74716f090be4d36b58e8c39664611d643 100644 (file)
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -69,7 +69,7 @@ class ceilometer::db (
   $database_idle_timeout            = undef,
 ) {
 
-  include ::ceilometer::deps
+  include ceilometer::deps
 
   if $database_idle_timeout {
     warning('The database_idle_timeout parameter is deprecated. Please use \
@@ -90,7 +90,7 @@ database_connection_recycle_time instead.')
   }
 
   if $sync_db {
-    include ::ceilometer::db::sync
+    include ceilometer::db::sync
   }
 
 }

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index b03ff8acd847ef64b678c684d4831b244842f20a..8963f0bff3d3cc0232193010281ee4c01f7f546b 100644 (file)
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -42,11 +42,11 @@ class ceilometer::db::mysql(
   $collate       = 'utf8_general_ci',
 ) {
 
-  include ::ceilometer::deps
+  include ceilometer::deps
 
   validate_legacy(String, 'validate_string', $password)
 
-  ::openstacklib::db::mysql { 'ceilometer':
+  openstacklib::db::mysql { 'ceilometer':
     user          => $user,
     password_hash => mysql::password($password),
     dbname        => $dbname,

diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp
index fdca6d75a4cd9f4128fd7de1aa185eddf82bee3c..818d871f758a7e94ef9856585a4cded779948935 100644 (file)
--- a/manifests/db/postgresql.pp
+++ b/manifests/db/postgresql.pp
@@ -32,9 +32,9 @@ class ceilometer::db::postgresql(
   $privileges = 'ALL',
 ) {
 
-  include ::ceilometer::deps
+  include ceilometer::deps
 
-  ::openstacklib::db::postgresql { 'ceilometer':
+  openstacklib::db::postgresql { 'ceilometer':
     password_hash => postgresql_password($user, $password),
     dbname        => $dbname,
     user          => $user,

diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp
index 6b79e20e4e01314f3e093099d4bdad8dbca7a981..ef7166d08701428b2779afb3fc7fa0cec038d866 100644 (file)
--- a/manifests/db/sync.pp
+++ b/manifests/db/sync.pp
@@ -13,8 +13,8 @@ class ceilometer::db::sync(
   $extra_params = undef,
 ) {
 
-  include ::ceilometer::deps
-  include ::ceilometer::params
+  include ceilometer::deps
+  include ceilometer::params
 
   exec { 'ceilometer-upgrade':
     command     => "${::ceilometer::params::dbsync_command} ${extra_params}",

diff --git a/manifests/expirer.pp b/manifests/expirer.pp
index b69db8ab88340379b0116a78b13a425d1d79081e..acb0055a76e347b9c325fa113bb782bc86efa0e4 100644 (file)
--- a/manifests/expirer.pp
+++ b/manifests/expirer.pp
@@ -51,7 +51,7 @@ class ceilometer::expirer (
   $weekday     = '*',
 ) {
 
-  include ::ceilometer::params
+  include ceilometer::params
 
   Anchor['ceilometer::install::end'] ~> Class['ceilometer::expirer']
 

diff --git a/manifests/init.pp b/manifests/init.pp
index 2ef2e6f3a50f95035d12889f268fe7cf16b0de78..4e2d191984e7bbf21aa319997ac97a5262cfa240 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -269,8 +269,8 @@ class ceilometer(
   $host                               = $::os_service_default,
 ) {
 
-  include ::ceilometer::deps
-  include ::ceilometer::params
+  include ceilometer::deps
+  include ceilometer::params
 
   group { 'ceilometer':
     ensure  => present,

diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index d6cd687a531bdaa9ba2c51cac45e414a5ebcf721..1a2f28644ebbe8ecfe51d828d3e2ccfd7a246dc3 100644 (file)
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -87,11 +87,11 @@ class ceilometer::keystone::auth (
   $internal_url         = 'http://127.0.0.1:8777',
 ) {
 
-  include ::ceilometer::deps
+  include ceilometer::deps
 
   validate_legacy(String, 'validate_string', $password)
 
-  ::keystone::resource::service_identity { 'ceilometer':
+  keystone::resource::service_identity { 'ceilometer':
     configure_user      => $configure_user,
     configure_user_role => $configure_user_role,
     configure_endpoint  => $configure_endpoint,

diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 105d46b2ff93b88a55c095797da0b0648b03cb2d..06d4603774d21d1cf0010ee68ec72b070f5ef679 100644 (file)
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -203,7 +203,7 @@ class ceilometer::keystone::authtoken(
   $service_token_roles_required   = $::os_service_default,
 ) {
 
-  include ::ceilometer::deps
+  include ceilometer::deps
 
   if is_service_default($password) {
     fail('Please set password for ceilometer service user')

diff --git a/manifests/logging.pp b/manifests/logging.pp
index 0db1dfa5a6890d9f2d48fa8267b17027b20fd907..6c93acfb86feba14d60c2fc69efdef3a4384af40 100644 (file)
--- a/manifests/logging.pp
+++ b/manifests/logging.pp
@@ -119,7 +119,7 @@ class ceilometer::logging(
   $log_date_format               = $::os_service_default,
 ) {
 
-  include ::ceilometer::deps
+  include ceilometer::deps
 
   oslo::log { 'ceilometer_config':
     debug                         => $debug,

diff --git a/manifests/params.pp b/manifests/params.pp
index 9cce649789989319626a7a5f569029579e3e830c..1b13df5037a1a772d49a24a06118a66e7ee74027 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,7 +4,7 @@
 # should be considered to be constant
 #
 class ceilometer::params {
-  include ::openstacklib::defaults
+  include openstacklib::defaults
 
   $dbsync_command  = 'ceilometer-upgrade'
   $expirer_command = 'ceilometer-expirer'

diff --git a/manifests/policy.pp b/manifests/policy.pp
index 9ee1ba02ded067f9722545dc3cc668df05c0cc30..82fc4c527d8f72feff6f3f6f90a44d5222c0233e 100644 (file)
--- a/manifests/policy.pp
+++ b/manifests/policy.pp
@@ -28,8 +28,8 @@ class ceilometer::policy (
   $policy_path = '/etc/ceilometer/policy.json',
 ) {
 
-  include ::ceilometer::deps
-  include ::ceilometer::params
+  include ceilometer::deps
+  include ceilometer::params
 
   validate_legacy(Hash, 'validate_hash', $policies)
 

diff --git a/spec/acceptance/ceilometer_wsgi_apache_spec.rb b/spec/acceptance/ceilometer_wsgi_apache_spec.rb
index f158590d8b9d1c3a10896980a3d319de2b8fe618..b76c084017d4fe7960f3966b9f1e28634c12b18d 100644 (file)
--- a/spec/acceptance/ceilometer_wsgi_apache_spec.rb
+++ b/spec/acceptance/ceilometer_wsgi_apache_spec.rb
@@ -6,12 +6,12 @@ describe 'ceilometer with mysql' do
 
     it 'should work with no errors' do
       pp= <<-EOS
-      include ::openstack_integration
-      include ::openstack_integration::repos
-      include ::openstack_integration::rabbitmq
-      include ::openstack_integration::mysql
-      include ::openstack_integration::keystone
-      class { '::openstack_integration::ceilometer':
+      include openstack_integration
+      include openstack_integration::repos
+      include openstack_integration::rabbitmq
+      include openstack_integration::mysql
+      include openstack_integration::keystone
+      class { 'openstack_integration::ceilometer':
         integration_enable => false,
       }
       EOS