From: chenshuai@huawei.com <chenshuai@huawei.com>
Date: Mon, 1 Feb 2016 08:43:43 +0000 (+0800)
Subject: bugfix: enable secgroup for yardstick
X-Git-Tag: colorado.1.0~204
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F8839%2F1;p=compass4nfv.git

bugfix: enable secgroup for yardstick

JIRA: COMPASS-297

Change-Id: I260a5011eca4969fa72a28ffadc2fef2df22ebab
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
---

diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf
index f8de70ee..0c221e9e 100644
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -18,11 +18,6 @@ export SUBNETS="10.1.0.0/24,172.16.2.0/24,172.16.3.0/24,172.16.4.0/24"
 export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-'10.1.0.50'}
 export MANAGEMENT_INTERFACE=${MANAGEMENT_INTERFACE:-eth0}
 export DASHBOARD_URL=""
-
-if [[ `echo $HOST_ROLES | grep odl` ]]; then
-    export ENABLE_SECGROUP="false"
-fi
-
 export ENABLE_SECGROUP=${ENABLE_SECGROUP:-"true"}
 export ENABLE_VPNAAS="false"
 export ENABLE_FWAAS="false"