diff options
| author |   chenshuai@huawei.com <chenshuai@huawei.com> | 2016-08-04 23:17:34 -0400 |
|---|---|---|
| committer | chenshuai@huawei.com <chenshuai@huawei.com> | 2016-08-04 23:54:49 -0400 |
| commit | f32e14547b53b4ea3420df9443282c4ba6aa1f3d (patch) | |
| tree | f026d5251e1948510b813e240252b850c12fed7f | |
| parent | 5b533929e96a543172ca301797e9c664851ab443 (diff) | |
bugfix moon switch
JIRA: COMPASS-465
Change-Id: I7161d8ec018819ac8497b6f323adeafccbc8dfd9
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
| -rw-r--r-- | deploy/client.py | 2 | ||||
| -rwxr-xr-x | deploy/deploy_host.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/deploy/client.py b/deploy/client.py index d44a3716..51919838 100644 --- a/deploy/client.py +++ b/deploy/client.py @@ -733,7 +733,7 @@ class CompassClient(object): package_config['enable_fwaas'] = (CONF.enable_fwaas== "true") package_config['enable_vpnaas'] = (CONF.enable_vpnaas== "true") package_config['odl_l3_agent'] = "Enable" if CONF.odl_l3_agent == "Enable" else "Disable" - package_config['moon'] = "Enable" if CONF.odl_l3_agent == "Enable" else "Disable" + package_config['moon'] = "Enable" if CONF.moon == "Enable" else "Disable" package_config['onos_sfc'] = "Enable" if CONF.onos_sfc == "Enable" else "Disable" status, resp = self.client.update_cluster_config( diff --git a/deploy/deploy_host.sh b/deploy/deploy_host.sh index 22d9656e..b38f4209 100755 --- a/deploy/deploy_host.sh +++ b/deploy/deploy_host.sh @@ -45,7 +45,7 @@ function deploy_host(){ --deployment_timeout="${DEPLOYMENT_TIMEOUT}" --${POLL_SWITCHES_FLAG} --dashboard_url="${DASHBOARD_URL}" \ --cluster_vip="${VIP}" --network_cfg="$NETWORK" --neutron_cfg="$NEUTRON" \ --enable_secgroup="${ENABLE_SECGROUP}" --enable_fwaas="${ENABLE_FWAAS}" \ - --rsa_file="$rsa_file" --enable_vpnaas="${ENABLE_VPNAAS}" --odl_l3_agent="${odl_l3_agent}" --onos_sfc="${onos_sfc}" + --rsa_file="$rsa_file" --enable_vpnaas="${ENABLE_VPNAAS}" --odl_l3_agent="${odl_l3_agent}" --moon="${moon}" --onos_sfc="${onos_sfc}" RET=$? sleep $((AYNC_TIMEOUT+5)) |