From 77d8afcffc83cff0206e0dc44fa407b6c779d9b6 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Tue, 12 Apr 2016 10:43:37 +0100
Subject: [PATCH] Drop use of quantum-security-groups in tests

Recent changes to nova-cloud-controller dropped the
quantum-security-groups configuration option; drop use
of this option from the amulet tests for this charm.

Change-Id: I379e7082f7e41f1f3832ac7746b18fa9c7733e72
---
 tests/basic_deployment.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 5822729e..2e30f30d 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -147,8 +147,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
 
         keystone_config = {'admin-password': 'openstack',
                            'admin-token': 'ubuntutesting'}
-        nova_cc_config = {'network-manager': 'Quantum',
-                          'quantum-security-groups': 'yes'}
+        nova_cc_config = {'network-manager': 'Neutron'}
         configs = {'neutron-gateway': neutron_gateway_config,
                    'keystone': keystone_config,
                    'nova-cloud-controller': nova_cc_config}