x/packstack
Code Issues Proposed changes

service_plugins must not be list with empty string

Browse Source 
Change-Id: Ib2646588add5e0e09c6af5f14f6870fa911ee601
Fixes: rhbz#1040585
This commit is contained in:
Martin Magr
2013-12-11 17:30:13 +01:00
parent a602c6549f
commit 9abf6670e6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packstack/plugins/neutron_350.py
View File

@@ -355,10 +355,12 @@ def createManifest(config):
global q_hosts global q_hosts
service_plugins = [] service_plugins = []
if controller.CONF['CONFIG_NEUTRON_LBAAS_HOSTS']: if config['CONFIG_NEUTRON_LBAAS_HOSTS']:
service_plugins.append("neutron.services.loadbalancer.plugin.LoadBalancerPlugin") lbp = 'neutron.services.loadbalancer.plugin.LoadBalancerPlugin'
service_plugins.append(lbp)
config['SERVICE_PLUGINS'] = ",".join(service_plugins) config['SERVICE_PLUGINS'] = (str(service_plugins) if service_plugins
else 'undef')
for host in q_hosts: for host in q_hosts:
manifest_file = "%s_neutron.pp" % (host,) manifest_file = "%s_neutron.pp" % (host,)

2
packstack/puppet/templates/neutron.pp
View File

@@ -16,5 +16,5 @@ class { 'neutron':
verbose => true, verbose => true,
qpid_port => '%(CONFIG_QPID_CLIENTS_PORT)s', qpid_port => '%(CONFIG_QPID_CLIENTS_PORT)s',
qpid_protocol => '%(CONFIG_QPID_PROTOCOL)s', qpid_protocol => '%(CONFIG_QPID_PROTOCOL)s',
service_plugins => [ '%(SERVICE_PLUGINS)s' ] service_plugins => %(SERVICE_PLUGINS)s,
} }