Merge "Fixed vpnaas agent for RedHat systems" into stable/havana

xbezdick · Apr 11, 2014 · 307aa01 · 307aa01
2 parents 7ec1575 + 8009169
commit 307aa01
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp
@@ -93,8 +93,6 @@
       name    => $::neutron::params::vpnaas_agent_package,
     }
   } else {
-    # Some platforms (RedHat) do not provide a neutron VPNaaS agent package.
-    # The neutron VPNaaS agent config file is provided by the neutron package.
     Package['neutron'] -> Neutron_vpnaas_agent_config<||>
   }
 

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -37,8 +37,8 @@
     $metering_agent_package = false
     $metering_agent_service = 'neutron-metering-agent'
 
-    $vpnaas_agent_package = false
-    $vpnaas_agent_service = 'neutron-vpnaas-agent'
+    $vpnaas_agent_package = 'openstack-neutron-vpn-agent'
+    $vpnaas_agent_service = 'neutron-vpn-agent'
     $openswan_package     = 'openswan'
 
     $l3_agent_package   = false

diff --git a/spec/classes/neutron_agents_vpnaas_spec.rb b/spec/classes/neutron_agents_vpnaas_spec.rb
@@ -144,7 +144,8 @@
 
     let :platform_params do
       { :openswan_package   => 'openswan',
-        :vpnaas_agent_service => 'neutron-vpnaas-agent'}
+        :vpnaas_agent_package => 'openstack-neutron-vpn-agent',
+        :vpnaas_agent_service => 'neutron-vpn-agent'}
     end
 
     it_configures 'neutron vpnaas agent'