aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/client.py
diff options
context:
space:
mode:
authorcarey.xu <carey.xuhan@huawei.com>2015-10-30 10:33:51 +0800
committercarey.xu <carey.xuhan@huawei.com>2015-11-08 12:29:42 +0800
commit2709a9bee6a562cc6acef75b394d7c4e9a3b3f3f (patch)
tree2e86fbbfe3779459a2fff18c45dbad43d7cfddd5 /deploy/client.py
parentfc218067fdea16f45b8b9d01201a8c8b25ca9eb0 (diff)
add option to disable security group
JIRA: COMPASS-126 Change-Id: Ie9417be0e78690b5580d460b9c61f77ccc1d91c6 Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy/client.py')
-rw-r--r--deploy/client.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/deploy/client.py b/deploy/client.py
index 84041af5..b69b8acc 100644
--- a/deploy/client.py
+++ b/deploy/client.py
@@ -201,6 +201,9 @@ opts = [
cfg.StrOpt('cluster_vip',
help='cluster ip address',
default=''),
+ cfg.StrOpt('enable_secgroup',
+ help='enable security group',
+ default='true'),
cfg.StrOpt('network_cfg',
help='netowrk config file',
default=''),
@@ -695,17 +698,11 @@ class CompassClient(object):
)
"""
package_config['ha_proxy'] = {}
-
- #TODO, we need two vip
- if CONF.cluster_pub_vip:
- package_config["ha_proxy"]["pub_vip"] = CONF.cluster_pub_vip
-
- if CONF.cluster_prv_vip:
- package_config["ha_proxy"]["prv_vip"] = CONF.cluster_prv_vip
-
if CONF.cluster_vip:
package_config["ha_proxy"]["vip"] = CONF.cluster_vip
+ package_config['enable_secgroup'] = (CONF.enable_secgroup == "true")
+
status, resp = self.client.update_cluster_config(
cluster_id, package_config=package_config)
LOG.info(