Sync charmhelpers

2015-02-16 12:07:08 +00:00
parent b43b167acd
commit e3712301af
3 changed files with 11 additions and 12 deletions
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -161,14 +161,6 @@ class NeutronOVSBasicDeployment(OpenStackAmuletDeployment):
                                           ['vxlan', 'gre'],
                                           'agent')

-#    def test_secgroup_propagation(self):
-#        """Verify that neutron-api secgroup propagates to neutron-ovs"""
-#        self.check_ml2_setting_propagation('neutron-api',
-#                                           'neutron-security-groups',
-#                                           'enable_security_group',
-#                                           ['False', 'True'],
-#                                           'securitygroup')
-
    def test_secgroup_propagation_local_override(self):
        """Verify disable-security-groups overrides what neutron-api says"""
        unit = self.compute_sentry