Merge "Add a new monitor type: MultiMonitor that can run any number of other monitors...

[yardstick.git] / yardstick / benchmark / scenarios / networking / ping6_post_teardown.bash

diff --git a/yardstick/benchmark/scenarios/networking/ping6_post_teardown.bash b/yardstick/benchmark/scenarios/networking/ping6_post_teardown.bash
index f40d47d..a0976e3 100644 (file)
--- a/yardstick/benchmark/scenarios/networking/ping6_post_teardown.bash
+++ b/yardstick/benchmark/scenarios/networking/ping6_post_teardown.bash
@@ -8,10 +8,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-sed -i 's/enable_security_group= False/enable_security_group = True/g' /etc/neutron/plugins/ml2/ml2_conf.ini
-sed -i 3d /etc/neutron/plugins/ml2/ml2_conf.ini
-sed -i 's/firewall_driver= neutron.agent.firewall.NoopFirewallDriver/firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver/g' /etc/neutron/plugins/ml2/ml2_conf.ini
-sed -i 's/security_group_api= nova/security_group_api = neutron/g' /etc/nova/nova.conf
+cp /etc/neutron/plugins/ml2/ml2_conf.ini_bkp /etc/neutron/plugins/ml2/ml2_conf.ini
 
 service neutron-l3-agent restart
 service neutron-dhcp-agent restart
@@ -23,4 +20,4 @@ service nova-conductor restart
 service nova-consoleauth restart
 service nova-novncproxy restart
 service nova-scheduler restart
-service nova-compute restart
\ No newline at end of file
+service nova-compute restart