diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-07-14 14:55:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-14 14:55:21 +0000 |
| commit | 88d5b2462933cce79cb059c81e007ec83ee2cd9e (patch) | |
| tree | 2f0f10b9485fc9b51422bc7b37512b892a0d38dc | |
| parent | 544b55bacd84b37d0723e743d13992e2aca6c95e (diff) | |
| parent | c67b3e583eb1109c8e7305e885a7f701414bc29d (diff) | |
Merge "add onos SFC feature config file"
| -rw-r--r-- | build/opnfv-apex-common.spec | 2 | ||||
| -rw-r--r-- | config/deploy/os-onos-sfc-ha.yaml | 10 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 6 | ||||
| -rw-r--r-- | tests/test_apex_deploy_env.py | 3 |
4 files changed, 19 insertions, 2 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 8808cdb1..5e1a9b36 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -45,6 +45,7 @@ install config/deploy/os-odl_l2-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-ap install config/deploy/os-odl_l2-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml +install config/deploy/os-onos-sfc-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml install config/deploy/os-ocl-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml install config/network/network_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings.yaml install config/network/network_settings_v6.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings_v6.yaml @@ -112,6 +113,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml +%{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml %{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/network_settings.yaml %{_sysconfdir}/opnfv-apex/network_settings_v6.yaml diff --git a/config/deploy/os-onos-sfc-ha.yaml b/config/deploy/os-onos-sfc-ha.yaml new file mode 100644 index 00000000..a81023db --- /dev/null +++ b/config/deploy/os-onos-sfc-ha.yaml @@ -0,0 +1,10 @@ +global_params: + ha_enabled: true + +deploy_options: + sdn_controller: onos + sdn_l3: true + tacker: false + congress: false + sfc: true + vpn: false diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 067a6417..992d22af 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -36,7 +36,11 @@ function overcloud_deploy { DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight-external.yaml" SDN_IMAGE=opendaylight elif [ "${deploy_options_array['sdn_controller']}" == 'onos' ]; then - DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/onos.yaml" + if [ "${deploy_options_array['sfc']}" == 'True' ]; then + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/onos_sfc.yaml" + else + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/onos.yaml" + fi SDN_IMAGE=onos elif [ "${deploy_options_array['sdn_controller']}" == 'opencontrail' ]; then echo -e "${red}ERROR: OpenContrail is currently unsupported...exiting${reset}" diff --git a/tests/test_apex_deploy_env.py b/tests/test_apex_deploy_env.py index 648923d0..563bfd8f 100644 --- a/tests/test_apex_deploy_env.py +++ b/tests/test_apex_deploy_env.py @@ -27,7 +27,8 @@ deploy_files = ('deploy_settings.yaml', 'os-nosdn-performance-ha.yaml', 'os-odl_l2-nofeature-ha.yaml', 'os-odl_l2-sfc-noha.yaml', - 'os-onos-nofeature-ha.yaml') + 'os-onos-nofeature-ha.yaml', + 'os-onos-sfc-ha.yaml') test_deploy_content = ( 'global_params:', |