bugfix moon switch

JIRA: COMPASS-465

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

diff --git a/deploy/client.py b/deploy/client.py
index d44a371..5191983 100644 (file)
--- 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 22d9656..b38f420 100755 (executable)
--- 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))