From 8f77b5f11c59d77e5091cbf509d92b3b54336370 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <logan@bacoosta.com>
Date: Fri, 9 Aug 2013 16:41:40 +0000
Subject: [PATCH] Fix some puppet lint warnings.

Puppet-lint likes the ensure's to come first.

Change-Id: I127ee497d01c7a466338a334a61b47d862d79097
---
 manifests/api.pp             | 4 ++--
 manifests/compute/libvirt.pp | 4 ++--
 manifests/generic_service.pp | 4 ++--
 manifests/init.pp            | 2 +-
 manifests/vncproxy.pp        | 2 +-
 manifests/volume/iscsi.pp    | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/manifests/api.pp b/manifests/api.pp
index 417a1c76e..697d81044 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -116,14 +116,14 @@ class nova::api(
     }
     if !defined(Package['pyssf']) {
       package { 'pyssf':
-        provider => pip,
         ensure   => latest,
+        provider => pip,
         require  => Package['python-pip']
       }
     }
     package { 'openstackocci':
-      provider => 'pip',
       ensure   => latest,
+      provider => 'pip',
       require  => Package['python-pip'],
     }
   }
diff --git a/manifests/compute/libvirt.pp b/manifests/compute/libvirt.pp
index 3673eaf48..fa73f74fc 100644
--- a/manifests/compute/libvirt.pp
+++ b/manifests/compute/libvirt.pp
@@ -35,13 +35,13 @@ class nova::compute::libvirt (
   }
 
   package { 'libvirt':
-    name   => $::nova::params::libvirt_package_name,
     ensure => present,
+    name   => $::nova::params::libvirt_package_name,
   }
 
   service { 'libvirt' :
-    name     => $::nova::params::libvirt_service_name,
     ensure   => running,
+    name     => $::nova::params::libvirt_service_name,
     provider => $::nova::params::special_service_provider,
     require  => Package['libvirt'],
   }
diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp
index f3b610331..0c6ee8f82 100644
--- a/manifests/generic_service.pp
+++ b/manifests/generic_service.pp
@@ -38,16 +38,16 @@ define nova::generic_service(
   # installed before nova_config
   if ($package_name) {
     package { $nova_title:
-      name   => $package_name,
       ensure => $ensure_package,
+      name   => $package_name,
       notify => Service[$nova_title],
     }
   }
 
   if ($service_name) {
     service { $nova_title:
-      name      => $service_name,
       ensure    => $service_ensure,
+      name      => $service_name,
       enable    => $enabled,
       hasstatus => true,
       require   => [Package['nova-common'], Package[$nova_title]],
diff --git a/manifests/init.pp b/manifests/init.pp
index 1b4379144..a9e693234 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -111,8 +111,8 @@ class nova(
   }
 
   package { 'nova-common':
-    name    => $::nova::params::common_package_name,
     ensure  => $ensure_package,
+    name    => $::nova::params::common_package_name,
     require => [Package['python-nova'], Anchor['nova-start']]
   }
 
diff --git a/manifests/vncproxy.pp b/manifests/vncproxy.pp
index 84ac439c1..f87fb88fe 100644
--- a/manifests/vncproxy.pp
+++ b/manifests/vncproxy.pp
@@ -21,8 +21,8 @@ class nova::vncproxy(
 
   if ! defined(Package['python-numpy']) {
     package { 'python-numpy':
-      name   => $::nova::params::numpy_package_name,
       ensure => present,
+      name   => $::nova::params::numpy_package_name,
     }
   }
   nova::generic_service { 'vncproxy':
diff --git a/manifests/volume/iscsi.pp b/manifests/volume/iscsi.pp
index 04a1958b8..e680c0bfe 100644
--- a/manifests/volume/iscsi.pp
+++ b/manifests/volume/iscsi.pp
@@ -35,13 +35,13 @@ class nova::volume::iscsi (
   case $iscsi_helper {
     'tgtadm': {
       package { 'tgt':
-        name   => $::nova::params::tgt_package_name,
         ensure => present,
+        name   => $::nova::params::tgt_package_name,
       }
       service { 'tgtd':
+        ensure   => running,
         name     => $::nova::params::tgt_service_name,
         provider => $::nova::params::special_service_provider,
-        ensure   => running,
         enable   => true,
         require  => [Nova::Generic_service['volume'], Package['tgt']],
       }