Merge "Fix lint issues to upgrade to puppet-lint 2.3"

5 files changed, 24 insertions, 23 deletions

diff --git a/manifests/profile/base/cinder/volume/nfs.pp b/manifests/profile/base/cinder/volume/nfs.pp
index 16a49e4..1eef888 100644
--- a/manifests/profile/base/cinder/volume/nfs.pp
+++ b/manifests/profile/base/cinder/volume/nfs.pp
@@ -62,21 +62,22 @@ class tripleo::profile::base::cinder::volume::nfs (
   include ::tripleo::profile::base::cinder::volume
 
   if $step >= 4 {
-    if str2bool($::selinux) {
-      selboolean { 'virt_use_nfs':
-        value      => on,
-        persistent => true,
-      } -> Package['nfs-utils']
-    }
-
-    package {'nfs-utils': } ->
-    cinder::backend::nfs { $backend_name :
+    package {'nfs-utils': }
+    -> cinder::backend::nfs { $backend_name :
       nfs_servers                 => $cinder_nfs_servers,
       nfs_mount_options           => $cinder_nfs_mount_options,
       nfs_shares_config           => '/etc/cinder/shares-nfs.conf',
       nas_secure_file_operations  => $cinder_nas_secure_file_operations,
       nas_secure_file_permissions => $cinder_nas_secure_file_permissions,
     }
+
+    if str2bool($::selinux) {
+      selboolean { 'virt_use_nfs':
+        value      => on,
+        persistent => true,
+        require    => Package['nfs-utils'],
+      }
+    }
   }
 
 }
diff --git a/manifests/profile/base/docker.pp b/manifests/profile/base/docker.pp
index 2c9824a..e042947 100644
--- a/manifests/profile/base/docker.pp
+++ b/manifests/profile/base/docker.pp
@@ -185,8 +185,8 @@ class tripleo::profile::base::docker (
     group { 'docker_nova_group':
       name => 'docker_nova',
       gid  => $docker_nova_uid
-    } ->
-    user { 'docker_nova_user':
+    }
+    -> user { 'docker_nova_user':
       name    => 'docker_nova',
       uid     => $docker_nova_uid,
       gid     => $docker_nova_uid,
@@ -207,8 +207,8 @@ polkit.addRule(function(action, subject) {
 '
     package {'polkit':
       ensure => installed,
-    } ->
-    file {'/etc/polkit-1/rules.d/50-nova.rules':
+    }
+    -> file {'/etc/polkit-1/rules.d/50-nova.rules':
       content => $docker_nova_polkit_rule,
       mode    => '0644'
     }
diff --git a/manifests/profile/base/logging/fluentd.pp b/manifests/profile/base/logging/fluentd.pp
index 51869d6..b23610a 100644
--- a/manifests/profile/base/logging/fluentd.pp
+++ b/manifests/profile/base/logging/fluentd.pp
@@ -76,8 +76,8 @@ class tripleo::profile::base::logging::fluentd (
     include ::fluentd
 
     if $fluentd_groups {
-      Package<| tag == 'openstack' |> ->
-      user { $::fluentd::config_owner:
+      Package<| tag == 'openstack' |>
+      -> user { $::fluentd::config_owner:
         ensure     => present,
         groups     => $fluentd_groups,
         membership => 'minimum',
diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp
index bc15e62..d468110 100644
--- a/manifests/profile/base/pacemaker.pp
+++ b/manifests/profile/base/pacemaker.pp
@@ -104,8 +104,8 @@ class tripleo::profile::base::pacemaker (
     }
     class { '::pacemaker':
       hacluster_pwd => hiera('hacluster_pwd'),
-    } ->
-    class { '::pacemaker::corosync':
+    }
+    -> class { '::pacemaker::corosync':
       cluster_members      => $pacemaker_cluster_members,
       setup_cluster        => $pacemaker_master,
       cluster_setup_extras => $cluster_setup_extras,
diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index 3ab3234..27cf4fe 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -94,8 +94,8 @@ class tripleo::profile::base::swift::ringbuilder (
       path    => ['/usr/bin'],
       command => "curl --insecure --silent '${swift_ring_get_tempurl}' -o /tmp/swift-rings.tar.gz",
       returns => [0, 3]
-    } ~>
-    exec{'extract_swift_ring_tarball':
+    }
+    ~> exec{'extract_swift_ring_tarball':
       path    => ['/bin'],
       command => 'tar xzf /tmp/swift-rings.tar.gz -C /',
       returns => [0, 2]
@@ -122,15 +122,15 @@ class tripleo::profile::base::swift::ringbuilder (
         part_power     => $part_power,
         replicas       => min(count($device_array), $replicas),
         min_part_hours => $min_part_hours,
-      } ->
+      }
 
       # add all other devices
-      tripleo::profile::base::swift::add_devices {$device_array:
+      -> tripleo::profile::base::swift::add_devices {$device_array:
         swift_zones => $swift_zones,
-      } ->
+      }
 
       # rebalance
-      swift::ringbuilder::rebalance{ ['object', 'account', 'container']:
+      -> swift::ringbuilder::rebalance{ ['object', 'account', 'container']:
         seed => '999',
       }