Code Review
/
compass4nfv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
a863046
)
bugfix: enable secgroup for yardstick
39/8839/1
author
chenshuai@huawei.com
<chenshuai@huawei.com>
Mon, 1 Feb 2016 08:43:43 +0000
(16:43 +0800)
committer
chenshuai@huawei.com
<chenshuai@huawei.com>
Mon, 1 Feb 2016 08:43:43 +0000
(16:43 +0800)
JIRA: COMPASS-297
Change-Id: I260a5011eca4969fa72a28ffadc2fef2df22ebab
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
deploy/conf/base.conf
patch
|
blob
|
history
diff --git
a/deploy/conf/base.conf
b/deploy/conf/base.conf
index
f8de70e
..
0c221e9
100644
(file)
--- 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"