neutron server should not install lbaas or vpnaas agent

* currently if lbaas or vpnaas is enable, the neutron-server recipe will
  install the same packages as the node where lbaas-agent or vpnaas-agent is
  running on, while it just needs the python modules
* added attributes for definiton of python_dependencies for lbaas and vpnaas
  to allow neutron-server to have the modules without installing the full
  agent/service-packages

Change-Id: I1be325b7f246fa0628aed2d2a360acd604dd864a
This commit is contained in:
Jan Klare 2016-03-02 09:39:51 +01:00
parent d518462595
commit 875bda5cc5
2 changed files with 8 additions and 4 deletions

View File

@ -205,6 +205,10 @@ default['openstack']['network']['platform'].tap do |platform|
'neutron-metadata-agent'
platform['neutron_server_service'] =
'neutron-server'
platform['neutron_lbaas_python_dependencies'] =
'python-neutron-lbaas'
platform['neutron_vpnaas_python_dependencies'] =
'python-neutron-vpnaas'
case platform_family
when 'fedora', 'rhel' # :pragma-foodcritic: ~FC024 - won't fix this
platform['neutron_packages'] =

View File

@ -66,9 +66,9 @@ end
if node['openstack']['network_lbaas']['enabled']
# neutron-lbaas-agent may not running on network node, but on network node, neutron-server still need neutron_lbaas module
# when loading plugin if lbaas is list in service_plugins. In this case, we don't need include balance recipe for network node, but
# we need make sure neutron lbaas packages get installed on network ndoe before neutron-server start/restart, when lbaas is enabled.
# we need make sure neutron lbaas python packages get installed on network node before neutron-server start/restart, when lbaas is enabled.
# Otherwise neutron-server will crash for couldn't find lbaas plugin when invoking plugins from service_plugins.
platform_options['neutron_lbaas_packages'].each do |pkg|
platform_options['neutron_lbaas_python_dependencies'].each do |pkg|
package pkg do
options platform_options['package_overrides']
action :upgrade
@ -79,9 +79,9 @@ end
if node['openstack']['network_vpnaas']['enabled']
# neutron-vpnaas-agent may not running on network node, but on network node, neutron-server still need neutron_vpnaas module
# when loading plugin if vpnaas is list in service_plugins. In this case, we don't need include vpn_agent recipe for network node, but
# we need make sure neutron vpnaas packages get installed on network node before neutron-server start/restart, when vpnaas is enabled.
# we need make sure neutron vpnaas python packages get installed on network node before neutron-server start/restart, when vpnaas is enabled.
# Otherwise neutron-server will crash for couldn't find vpnaas plugin when invoking plugins from service_plugins.
platform_options['neutron_vpnaas_packages'].each do |pkg|
platform_options['neutron_vpnaas_python_dependencies'].each do |pkg|
package pkg do
options platform_options['package_overrides']
action :upgrade