diff options
| author |   shuai chen <chenshuai@huawei.com> | 2016-02-23 09:23:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-02-23 09:23:51 +0000 |
| commit | 8906fd0b7886fac22cc85839992634cf9f020a23 (patch) | |
| tree | 276d18117c33bdcc0248900302c1d61739177cd0 | |
| parent | 3d55eab0b45c7f4ae4e4411f035c2fdd8e07c614 (diff) | |
| parent | 19e5c05e7bbb5b0ca8e5e52e7ae0a64bcf25da54 (diff) | |
Merge "support odl_l3_agent enable flag param"
| -rw-r--r-- | deploy/client.py | 4 | ||||
| -rw-r--r-- | deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml | 31 | ||||
| -rwxr-xr-x | deploy/deploy_host.sh | 2 |
3 files changed, 36 insertions, 1 deletions
diff --git a/deploy/client.py b/deploy/client.py index fc5dc729..a87decc9 100644 --- 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 index 00000000..cc95ccd5 --- /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 306f936a..8e7997ef 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}" + --rsa_file="$rsa_file" --enable_vpnaas="${ENABLE_VPNAAS}" --odl_l3_agent="${odl_l3_agent}" RET=$? sleep $((AYNC_TIMEOUT+5)) |