support odl_l3_agent enable flag param

JIRA: COMPASS-318

Change-Id: I541cdb9c1b2f6873b1426b470a61af829d6bffce
Signed-off-by: baigk <baiguoku@huawei.com>

diff --git a/deploy/client.py b/deploy/client.py
index fc5dc72..a87decc 100644 (file)
--- a/deploy/client.py
+++ b/deploy/client.py
@@ -235,6 +235,9 @@ opts = [
     cfg.StrOpt('rsa_file',
               help='ssh rsa key file',
               default=''),
+    cfg.StrOpt('odl_l3_agent',
+              help='odl l3 agent enable flag',
+              default='Disable'),
 ]
 CONF.register_cli_opts(opts)
 
@@ -723,6 +726,7 @@ class CompassClient(object):
         package_config['enable_secgroup'] = (CONF.enable_secgroup == "true")
         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"
 
         status, resp = self.client.update_cluster_config(
             cluster_id, package_config=package_config)

diff --git a/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml b/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml
new file mode 100644 (file)
index 0000000..cc95ccd
--- /dev/null
+++ b/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml
@@ -0,0 +1,31 @@
+TYPE: virtual
+FLAVOR: cluster
+
+odl_l3_agent: "Enable"
+
+hosts:
+  - name: host1
+    roles:
+      - controller
+      - ha
+      - odl
+
+  - name: host2
+    roles:
+      - controller
+      - ha
+      - odl
+
+  - name: host3
+    roles:
+      - controller
+      - ha
+      - odl
+
+  - name: host4
+    roles:
+      - compute
+
+  - name: host5
+    roles:
+      - compute

diff --git a/deploy/deploy_host.sh b/deploy/deploy_host.sh
index 306f936..8e7997e 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}"
+    --rsa_file="$rsa_file" --enable_vpnaas="${ENABLE_VPNAAS}" --odl_l3_agent="${odl_l3_agent}"
 
     RET=$?
     sleep $((AYNC_TIMEOUT+5))