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,
 }