From 9abf6670e6ef4f6207ab43f0ab90b661f18f3881 Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Wed, 11 Dec 2013 17:30:13 +0100 Subject: [PATCH] service_plugins must not be list with empty string Change-Id: Ib2646588add5e0e09c6af5f14f6870fa911ee601 Fixes: rhbz#1040585 --- packstack/plugins/neutron_350.py | 8 +++++--- packstack/puppet/templates/neutron.pp | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packstack/plugins/neutron_350.py b/packstack/plugins/neutron_350.py index 2532a93d0..28e0e34d3 100644 --- a/packstack/plugins/neutron_350.py +++ b/packstack/plugins/neutron_350.py @@ -355,10 +355,12 @@ def createManifest(config): global q_hosts service_plugins = [] - if controller.CONF['CONFIG_NEUTRON_LBAAS_HOSTS']: - service_plugins.append("neutron.services.loadbalancer.plugin.LoadBalancerPlugin") + if config['CONFIG_NEUTRON_LBAAS_HOSTS']: + 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: manifest_file = "%s_neutron.pp" % (host,) diff --git a/packstack/puppet/templates/neutron.pp b/packstack/puppet/templates/neutron.pp index d54d0b5dd..0a72ec9b9 100644 --- a/packstack/puppet/templates/neutron.pp +++ b/packstack/puppet/templates/neutron.pp @@ -16,5 +16,5 @@ class { 'neutron': verbose => true, qpid_port => '%(CONFIG_QPID_CLIENTS_PORT)s', qpid_protocol => '%(CONFIG_QPID_PROTOCOL)s', - service_plugins => [ '%(SERVICE_PLUGINS)s' ] + service_plugins => %(SERVICE_PLUGINS)s, }