Fix some puppet lint warnings.

Puppet-lint likes when the ensure's come first

Change-Id: Ib7828fd84a071c84961b0b9597cb7bee944ed533

manifests/agents/dhcp.pp

@@ -59,8 +59,8 @@ class neutron::agents::dhcp (
     /\.Dnsmasq/: {
       Package['dnsmasq'] -> Package<| title == 'neutron-dhcp-agent' |>
       package { 'dnsmasq':
-        name   => $::neutron::params::dnsmasq_packages,
         ensure => present,
+        name   => $::neutron::params::dnsmasq_packages,
       }
     }
     default: {
@@ -86,8 +86,8 @@ class neutron::agents::dhcp (
     Package['neutron-dhcp-agent'] -> Neutron_config<||>
     Package['neutron-dhcp-agent'] -> Neutron_dhcp_agent_config<||>
     package { 'neutron-dhcp-agent':
-      name    => $::neutron::params::dhcp_agent_package,
       ensure  => $package_ensure,
+      name    => $::neutron::params::dhcp_agent_package,
     }
   } else {
     # Some platforms (RedHat) do not provide a neutron DHCP agent package.
@@ -102,9 +102,9 @@ class neutron::agents::dhcp (
   }
 
   service { 'neutron-dhcp-service':
+    ensure  => $ensure,
     name    => $::neutron::params::dhcp_agent_service,
     enable  => $enabled,
-    ensure  => $ensure,
     require => Class['neutron'],
   }
 }

manifests/agents/l3.pp

@@ -103,8 +103,8 @@ class neutron::agents::l3 (
   if $::neutron::params::l3_agent_package {
     Package['neutron-l3'] -> Neutron_l3_agent_config<||>
     package { 'neutron-l3':
-      name    => $::neutron::params::l3_agent_package,
       ensure  => $package_ensure,
+      name    => $::neutron::params::l3_agent_package,
       require => Package['neutron'],
     }
   } else {
@@ -120,9 +120,9 @@ class neutron::agents::l3 (
   }
 
   service { 'neutron-l3':
+    ensure  => $ensure,
     name    => $::neutron::params::l3_agent_service,
     enable  => $enabled,
-    ensure  => $ensure,
     require => Class['neutron'],
   }
 }

manifests/agents/lbaas.pp

@@ -46,8 +46,8 @@ class neutron::agents::lbaas (
     /\.haproxy/: {
       Package['haproxy'] -> Package<| title == 'neutron-lbaas-agent' |>
       package { 'haproxy':
-        name   => $::neutron::params::haproxy_package,
         ensure => present,
+        name   => $::neutron::params::haproxy_package,
       }
     }
     default: {
@@ -71,8 +71,8 @@ class neutron::agents::lbaas (
     Package['neutron-lbaas-agent'] -> Neutron_config<||>
     Package['neutron-lbaas-agent'] -> Neutron_lbaas_agent_config<||>
     package { 'neutron-lbaas-agent':
-      name    => $::neutron::params::lbaas_agent_package,
       ensure  => $package_ensure,
+      name    => $::neutron::params::lbaas_agent_package,
     }
   } else {
     # Some platforms (RedHat) do not provide a neutron LBaaS agent package.
@@ -87,9 +87,9 @@ class neutron::agents::lbaas (
   }
 
   service { 'neutron-lbaas-service':
+    ensure  => $ensure,
     name    => $::neutron::params::lbaas_agent_service,
     enable  => $enabled,
-    ensure  => $ensure,
     require => Class['neutron'],
   }
 }

manifests/agents/metadata.pp

@@ -34,8 +34,8 @@ class neutron::agents::metadata (
     Package['neutron-metadata'] -> Neutron_metadata_agent_config<||>
     Package['neutron-metadata'] -> Service['neutron-metadata']
     package { 'neutron-metadata':
-      name    => $::neutron::params::metadata_agent_package,
       ensure  => $package_ensure,
+      name    => $::neutron::params::metadata_agent_package,
       require => Package['neutron'],
     }
   }
@@ -47,9 +47,9 @@ class neutron::agents::metadata (
   }
 
   service { 'neutron-metadata':
+    ensure  => $ensure,
     name    => $::neutron::params::metadata_agent_service,
     enable  => $enabled,
-    ensure  => $ensure,
     require => Class['neutron'],
   }
 }

manifests/client.pp

@@ -15,8 +15,8 @@ class neutron::client (
   include neutron::params
 
   package { 'python-neutronclient':
+    ensure => $package_ensure,
     name   => $::neutron::params::client_package_name,
-    ensure => $package_ensure
   }
 
 }

manifests/init.pp

@@ -149,8 +149,8 @@ class neutron (
   file { '/etc/neutron/neutron.conf': }
 
   package { 'neutron':
+    ensure => $package_ensure,
     name   => $::neutron::params::package_name,
-    ensure => $package_ensure
   }
 
   neutron_config {

manifests/plugins/linuxbridge.pp

@@ -57,8 +57,8 @@ class neutron::plugins::linuxbridge (
 
   if $::osfamily == 'Redhat' {
     file {'/etc/neutron/plugin.ini':
-      ensure => link,
-      target => '/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini',
+      ensure  => link,
+      target  => '/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini',
       require => Package['neutron-plugin-linuxbridge']
     }
   }

manifests/server.pp

@@ -101,8 +101,8 @@ class neutron::server (
     Package['neutron-server'] -> Neutron_config<||>
     Package['neutron-server'] -> Service['neutron-server']
     package { 'neutron-server':
+      ensure => $package_ensure,
       name   => $::neutron::params::server_package,
-      ensure => $package_ensure
     }
   } else {
     # Some platforms (RedHat) does not provide a neutron-server package.
@@ -154,8 +154,8 @@ class neutron::server (
   }
 
   service { 'neutron-server':
-    name       => $::neutron::params::server_service,
     ensure     => $service_ensure,
+    name       => $::neutron::params::server_service,
     enable     => $enabled,
     hasstatus  => true,
     hasrestart => true,