Merge "Fix metadata agent for Red Hat distros"

manifests/agents/metadata.pp

@@ -9,7 +9,7 @@ class quantum::agents::metadata (
   $auth_url                     = 'http://localhost:35357/v2.0',
   $auth_region                  = 'RegionOne',
   $metadata_ip                  = '127.0.0.1',
-  $metadata_port                = '8775',
+  $metadata_port                = '8775'
   ) {
 
   include 'quantum::params'

manifests/params.pp

@@ -21,7 +21,8 @@ class quantum::params {
 
     $l3_agent_package   = false
     $l3_agent_service   = 'quantum-l3-agent'
-    $metadata_service   = 'quantum-metadata-agent'
+
+    $metadata_agent_service = 'quantum-metadata-agent'
 
     $cliff_package      = 'python-cliff'
 

spec/classes/quantum_agents_metadata_spec.rb

@@ -25,13 +25,6 @@ describe 'quantum::agents::metadata' do
 
     it { should include_class('quantum::params') }
 
-    it 'installs quantum metadata agent package' do
-      should contain_package('quantum-metadata').with(
-        :ensure => params[:package_ensure],
-        :name   => platform_params[:metadata_agent_package]
-      )
-    end
-
     it 'configures quantum metadata agent service' do
       should contain_service('quantum-metadata').with(
         :name    => platform_params[:metadata_agent_service],
@@ -64,6 +57,26 @@ describe 'quantum::agents::metadata' do
         :metadata_agent_service => 'quantum-metadata-agent' }
     end
 
+    it 'installs quantum metadata agent package' do
+      should contain_package('quantum-metadata').with(
+        :ensure => params[:package_ensure],
+        :name   => platform_params[:metadata_agent_package]
+      )
+    end
+
+    it_configures 'quantum metadata agent'
+
+  end
+
+  context 'on Red Hat platforms' do
+    let :facts do
+      { :osfamily => 'RedHat' }
+    end
+
+    let :platform_params do
+      { :metadata_agent_service => 'quantum-metadata-agent' }
+    end
+
     it_configures 'quantum metadata agent'
 
   end