change :: to : after $

voxpupuli · Aug 31, 2018 · fe7c242 · fe7c242
1 parent 10f747a
commit fe7c242
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -4,7 +4,7 @@
 #
 class proxysql::config {
 
-  $config_settings = $::proxysql::config_settings
+  $config_settings = $proxysql::config_settings
   if $proxysql::manage_config_file  {
     file { 'proxysql-config-file':
       ensure                  => file,

diff --git a/manifests/install.pp b/manifests/install.pp
@@ -4,25 +4,25 @@
 #
 class proxysql::install {
 
-  if !$::proxysql::manage_repo {
-    package { $::proxysql::package_name:
-      ensure          => $::proxysql::package_ensure,
-      source          => $::proxysql::package_source,
-      provider        => $::proxysql::package_provider,
-      install_options => $::proxysql::package_install_options,
+  if !$proxysql::manage_repo {
+    package { $proxysql::package_name:
+      ensure          => $proxysql::package_ensure,
+      source          => $proxysql::package_source,
+      provider        => $proxysql::package_provider,
+      install_options => $proxysql::package_install_options,
     }
   } else {
-    package { $::proxysql::package_name:
-      ensure          => $::proxysql::package_ensure,
-      install_options => $::proxysql::package_install_options,
+    package { $proxysql::package_name:
+      ensure          => $proxysql::package_ensure,
+      install_options => $proxysql::package_install_options,
     }
   }
 
   file { 'proxysql-datadir':
     ensure => directory,
-    path   => $::proxysql::datadir,
-    owner  => $::proxysql::sys_owner,
-    group  => $::proxysql::sys_group,
+    path   => $proxysql::datadir,
+    owner  => $proxysql::sys_owner,
+    group  => $proxysql::sys_group,
     mode   => '0600',
   }
 

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -4,18 +4,18 @@
 # Manage the repos where the ProxySQL package might be
 #
 class proxysql::repo inherits proxysql {
-  if $::proxysql::manage_repo == true {
+  if $proxysql::manage_repo == true {
     case $::operatingsystem {
       'Debian', 'Ubuntu': {
-        create_resources('::apt::source', $::proxysql::repo)
+        create_resources('::apt::source', $proxysql::repo)
       }
       'CentOS', 'Fedora', 'Scientific', 'RedHat', 'Amazon', 'OracleLinux': {
-        yumrepo { $::proxysql::rpm_repo_name:
-          descr    => $::proxysql::rpm_repo_descr,
-          baseurl  => $::proxysql::rpm_repo,
+        yumrepo { $proxysql::rpm_repo_name:
+          descr    => $proxysql::rpm_repo_descr,
+          baseurl  => $proxysql::rpm_repo,
           enabled  => true,
           gpgcheck => true,
-          gpgkey   => $::proxysql::rpm_repo_key,
+          gpgkey   => $proxysql::rpm_repo_key,
         }
       }
       default: {

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -5,15 +5,15 @@
 #
 class proxysql::service {
 
-  if $::proxysql::manage_config_file {
+  if $proxysql::manage_config_file {
     $service_require = File['proxysql-config-file']
   } else {
     $service_require = undef
   }
 
-  if $::proxysql::restart {
-    service { $::proxysql::service_name:
-      ensure     => $::proxysql::service_ensure,
+  if $proxysql::restart {
+    service { $proxysql::service_name:
+      ensure     => $proxysql::service_ensure,
       enable     => true,
       hasstatus  => true,
       hasrestart => false,
@@ -24,8 +24,8 @@
       require    => $service_require,
     }
   } else {
-    service { $::proxysql::service_name:
-      ensure     => $::proxysql::service_ensure,
+    service { $proxysql::service_name:
+      ensure     => $proxysql::service_ensure,
       enable     => true,
       hasstatus  => true,
       hasrestart => true,
@@ -34,11 +34,11 @@
   }
 
   exec { 'wait_for_admin_socket_to_open':
-    command   => "test -S ${::proxysql::admin_listen_socket}",
-    unless    => "test -S ${::proxysql::admin_listen_socket}",
+    command   => "test -S ${proxysql::admin_listen_socket}",
+    unless    => "test -S ${proxysql::admin_listen_socket}",
     tries     => '3',
     try_sleep => '10',
-    require   => Service[$::proxysql::service_name],
+    require   => Service[$proxysql::service_name],
     path      => '/bin:/usr/bin',
   }