Merge pull request #375 from bastelfreak/puppet-lint

puppet-lint: fix arrow_on_right_operand_line
voxpupuli · Apr 3, 2017 · b44b021 · b44b021
2 parents e24f536 + 796d234
commit b44b021
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/manifests/database/mysql.pp b/manifests/database/mysql.pp
@@ -91,14 +91,14 @@
         path     => "/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:${database_path}",
         unless   => 'test -f /etc/zabbix/.schema.done',
         provider => 'shell',
-      } ->
-      exec { 'zabbix_server_images.sql':
+      }
+      -> exec { 'zabbix_server_images.sql':
         command  => $zabbix_server_images_sql,
         path     => "/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:${database_path}",
         unless   => 'test -f /etc/zabbix/.images.done',
         provider => 'shell',
-      } ->
-      exec { 'zabbix_server_data.sql':
+      }
+      -> exec { 'zabbix_server_data.sql':
         command  => $zabbix_server_data_sql,
         path     => "/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:${database_path}",
         unless   => 'test -f /etc/zabbix/.data.done',

diff --git a/manifests/database/postgresql.pp b/manifests/database/postgresql.pp
@@ -117,17 +117,17 @@
           require  => [
             Exec['update_pgpass'],
           ],
-        } ->
-        exec { 'zabbix_server_images.sql':
+        }
+        -> exec { 'zabbix_server_images.sql':
           command  => $zabbix_server_images_sql,
           path     => "/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:${database_path}",
           unless   => 'test -f /etc/zabbix/.images.done',
           provider => 'shell',
           require  => [
             Exec['update_pgpass'],
           ],
-        } ->
-        exec { 'zabbix_server_data.sql':
+        }
+        -> exec { 'zabbix_server_data.sql':
           command  => $zabbix_server_data_sql,
           path     => "/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:${database_path}",
           unless   => 'test -f /etc/zabbix/.data.done',

diff --git a/manifests/resources/web.pp b/manifests/resources/web.pp
@@ -28,20 +28,20 @@
       Service['zabbix-server'],
       Package['zabbixapi'],
     ],
-  } ->
-  Zabbix_template <<| |>> {
+  }
+  -> Zabbix_template <<| |>> {
     zabbix_url     => $zabbix_url,
     zabbix_user    => $zabbix_user,
     zabbix_pass    => $zabbix_pass,
     apache_use_ssl => $apache_use_ssl,
-  } ->
-  Zabbix_host <<| |>> {
+  }
+  -> Zabbix_host <<| |>> {
     zabbix_url     => $zabbix_url,
     zabbix_user    => $zabbix_user,
     zabbix_pass    => $zabbix_pass,
     apache_use_ssl => $apache_use_ssl,
-  } ->
-  Zabbix_userparameters <<| |>> {
+  }
+  -> Zabbix_userparameters <<| |>> {
     zabbix_url     => $zabbix_url,
     zabbix_user    => $zabbix_user,
     zabbix_pass    => $zabbix_pass,

diff --git a/manifests/startup.pp b/manifests/startup.pp
@@ -44,8 +44,8 @@
       ensure  => file,
       mode    => '0664',
       content => template("zabbix/${name}-systemd.init.erb"),
-    } ~>
-    Exec['systemctl-daemon-reload']
+    }
+    ~> Exec['systemctl-daemon-reload']
     file { "/etc/init.d/${name}":
       ensure  => absent,
     }

diff --git a/manifests/web.pp b/manifests/web.pp
@@ -278,13 +278,13 @@
       owner  => 'zabbix',
       group  => 'zabbix',
       mode   => '0755',
-    } ->
-    package { 'zabbixapi':
+    }
+    -> package { 'zabbixapi':
       ensure   => $zabbixapi_version,
       provider => $puppetgem,
       require  => Class['ruby::dev'],
-    } ->
-    class { '::zabbix::resources::web':
+    }
+    -> class { '::zabbix::resources::web':
       zabbix_url     => $zabbix_url,
       zabbix_user    => $zabbix_api_user,
       zabbix_pass    => $zabbix_api_pass,