summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörgen Karlsson <jorgen.w.karlsson@ericsson.com>2016-02-09 13:45:03 +0000
committerJörgen Karlsson <jorgen.w.karlsson@ericsson.com>2016-02-09 13:45:23 +0000
commit41a4f75e6c951d527daa752419acf282b4626193 (patch)
tree36718c80c5b27ee1425e4efd7ff77db807e5d97a
parent21e49fe80a862c8f6c11348a648ec69f6d9b1859 (diff)
Revert "Test: Workaround for ODL Lithium"
This reverts commit 912fe3bb9877456cb8ef363f9304bfab733eaffd. Change-Id: I82e032ae43e49edff78cb8f7a0881a5ecd3f54db
-rw-r--r--yardstick/benchmark/contexts/heat.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py
index dcc2cbf1c..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,15 +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)
- installer = os.environ.get('INSTALLER_TYPE', None)
- if installer == 'joid' or installer == 'apex':
- 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"]
@@ -102,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)