From 2e08a204126a96abd3589fb001b7f925b89fcc2b Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Mon, 13 Jul 2020 21:18:50 +0200
Subject: [PATCH] Change to relative includes

Change-Id: Iff7244802a04967f1a4f06d2241118445510ac7b
---
 example/all-in-one-keystone.pp | 24 ++++++++++++------------
 example/all-in-one-noauth.pp   | 20 ++++++++++----------
 manifests/client.pp            |  2 +-
 manifests/db.pp                |  4 ++--
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/example/all-in-one-keystone.pp b/example/all-in-one-keystone.pp
index 23ea4370..91d25689 100644
--- a/example/all-in-one-keystone.pp
+++ b/example/all-in-one-keystone.pp
@@ -6,9 +6,9 @@
 #
 node /designate/ {
 
-  include '::apt'
-  include '::rabbitmq'
-  include '::mysql::server'
+  include apt
+  include rabbitmq
+  include mysql::server
 
   # Keystone parameters
   $keystone_db_host     = '127.0.0.1'
@@ -50,11 +50,11 @@ node /designate/ {
 
 
   # == Designate == #
-  class {'::designate::db::mysql':
+  class {'designate::db::mysql':
     password => $designate_db_password,
   }
 
-  class {'::designate':
+  class {'designate':
     default_transport_url => os_transport_url({
         'transport'    => 'rabbit',
         'host'         => '127.0.0.1',
@@ -64,25 +64,25 @@ node /designate/ {
     }),
   }
 
-  class {'::designate::db':
+  class {'designate::db':
     database_connection => "mysql://designate:${designate_db_password}@${db_host}/designate"
   }
 
-  include '::designate::client'
-  class {'::designate::api':
+  include designate::client
+  class {'designate::api':
     auth_strategy     => $auth_strategy,
     keystone_password => $keystone_password,
   }
 
-  include '::designate::central'
+  include designate::central
 
-  include '::designate::dns'
-  class {'::designate::backend::bind9':
+  include designate::dns
+  class {'designate::backend::bind9':
     rndc_config_file => '',
     rndc_key_file    => '',
   }
 
-  class {'::designate::keystone::auth':
+  class {'designate::keystone::auth':
     password => $keystone_password,
   }
 }
diff --git a/example/all-in-one-noauth.pp b/example/all-in-one-noauth.pp
index 57f73352..11830f9f 100644
--- a/example/all-in-one-noauth.pp
+++ b/example/all-in-one-noauth.pp
@@ -1,8 +1,8 @@
 node /designate/ {
 
-  include '::apt'
-  include '::rabbitmq'
-  include '::mysql::server'
+  include apt
+  include rabbitmq
+  include mysql::server
 
   # This example would install designate api and designate central service
   $auth_strategy         = 'noauth'
@@ -10,15 +10,15 @@ node /designate/ {
   $db_host               = '127.0.0.1'
 
 
-  include '::designate::dns'
-  include '::designate::backend::bind9'
+  include designate::dns
+  include designate::backend::bind9
 
-  class {'::designate::db::mysql':
+  class {'designate::db::mysql':
     password => $designate_db_password,
   }
 
 
-  class {'::designate':
+  class {'designate':
     default_transport_url => os_transport_url({
         'transport'    => 'rabbit',
         'host'         => '127.0.0.1',
@@ -28,13 +28,13 @@ node /designate/ {
     }),
   }
 
-  class {'::designate::db':
+  class {'designate::db':
     database_connection   => "mysql://designate:${designate_db_password}@${db_host}/designate"
   }
 
-  class {'::designate::api':
+  class {'designate::api':
     auth_strategy => $auth_strategy,
   }
 
-  include '::designate::central'
+  include designate::central
 }
diff --git a/manifests/client.pp b/manifests/client.pp
index 0f2034f4..a8cfd93f 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -25,6 +25,6 @@ class designate::client (
     tag    => 'openstack',
   }
 
-  include '::openstacklib::openstackclient'
+  include openstacklib::openstackclient
 
 }
diff --git a/manifests/db.pp b/manifests/db.pp
index 67b9df85..37e0fd1b 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -59,8 +59,8 @@ class designate::db (
 
   case $database_connection {
     /^mysql(\+pymysql)?:\/\//: {
-      require '::mysql::bindings'
-      require '::mysql::bindings::python'
+      require mysql::bindings
+      require mysql::bindings::python
       if $database_connection =~ /^mysql\+pymysql/ {
         $backend_package = $::designate::params::pymysql_package_name
       } else {