summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörgen Karlsson <jorgen.w.karlsson@ericsson.com>2016-01-27 17:22:47 +0000
committerJörgen Karlsson <jorgen.w.karlsson@ericsson.com>2016-01-27 17:22:47 +0000
commitf0123234b044fbdbb62a9bc0e85b7741c2e41ed7 (patch)
tree64795b946cde2070cfe496e59a62fef6d779a5ff
parent8236c94ecef8aa25af073c50f7a0eaafae9b4bc6 (diff)
Revert "Test: Workaround for ODL scenarios"
This reverts commit 8236c94ecef8aa25af073c50f7a0eaafae9b4bc6. Change-Id: I4652efe4f75e7f2605945e9896b33379eff059d1
-rw-r--r--yardstick/benchmark/contexts/heat.py11
1 files changed, 1 insertions, 10 deletions
diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py
index e58482286..8c514d250 100644
--- a/yardstick/benchmark/contexts/heat.py
+++ b/yardstick/benchmark/contexts/heat.py
@@ -7,7 +7,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-import os
import sys
import pkg_resources
@@ -55,13 +54,6 @@ class HeatContext(Context):
self.keypair_name = self.name + "-key"
self.secgroup_name = self.name + "-secgroup"
- # Temporarily removing security group due to
- # ssh problems with ODL scenarios.
- scenario = os.environ.get('DEPLOY_SCENARIO', None)
- if scenario and scenario.startswith('os-odl'):
- print "INFO: ODL scenario - removing security group."
- self.secgroup_name = None
-
if "image" in attrs:
self._image = attrs["image"]
@@ -100,8 +92,7 @@ class HeatContext(Context):
def _add_resources_to_template(self, template):
'''add to the template the resources represented by this context'''
template.add_keypair(self.keypair_name)
- if self.secgroup_name:
- template.add_security_group(self.secgroup_name)
+ template.add_security_group(self.secgroup_name)
for network in self.networks:
template.add_network(network.stack_name)