diff options
| -rw-r--r-- | build/opnfv-apex-common.spec | 6 | ||||
| -rw-r--r-- | ci/PR_revision.log | 1 | ||||
| -rwxr-xr-x | ci/deploy.sh | 13 | ||||
| -rw-r--r-- | config/deploy/os-odl_l2-fdio-ha.yaml | 12 | ||||
| -rw-r--r-- | config/deploy/os-odl_l2-fdio-noha.yaml | 12 | ||||
| -rw-r--r-- | lib/python/apex/deploy_env.py | 3 |
6 files changed, 46 insertions, 1 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 958cb14a..d5532411 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -41,6 +41,8 @@ install config/deploy/os-nosdn-performance-ha.yaml %{buildroot}%{_sysconfdir}/op install config/deploy/os-nosdn-ovs-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml install config/deploy/os-odl_l2-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml install config/deploy/os-odl_l2-sfc-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml +install config/deploy/os-odl_l2-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml +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-ocl-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml @@ -94,6 +96,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml +%{_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-ocl-nofeature-ha.yaml @@ -109,6 +113,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Thu Jun 15 2016 Tim Rozet <trozet@redhat.com> - 3.0-9 +- Add fdio scenarios. * Tue Jun 14 2016 Feng Pan <fpan@redhat.com> - 3.0-8 - Add network_settings_v6.yaml * Thu Jun 2 2016 Michael Chapman <michapma@redhat.com> - 3.0-7 diff --git a/ci/PR_revision.log b/ci/PR_revision.log index ea30648a..2dcbe81c 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -8,3 +8,4 @@ 23,Fix odl env files 25,Force metadata on all scenarios 26,Fixes ODL ML2 IP +30,Adds OVS DPDK config diff --git a/ci/deploy.sh b/ci/deploy.sh index 6d75bac0..fba83a9c 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -143,6 +143,17 @@ parse_deploy_settings() { echo -e "${red}ERROR: Failed to parse deploy settings file $DEPLOY_SETTINGS_FILE ${reset}" exit 1 fi + + if [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then + if [ "$net_isolation_enabled" == "FALSE" ]; then + echo -e "${red}ERROR: flat network is not supported with ovs-dpdk ${reset}" + exit 1 + fi + if [[ ! $enabled_network_list =~ "private_network" ]]; then + echo -e "${red}ERROR: tenant network is not enabled for ovs-dpdk ${reset}" + exit 1 + fi + fi } ##parses baremetal yaml settings into compatible json @@ -780,6 +791,8 @@ function undercloud_prep_overcloud_deploy { DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sfc.yaml" elif [ "${deploy_options_array['vpn']}" == 'True' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml" + elif [ "${deploy_options_array['vpp']}" == 'True' ]; then + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_fdio.yaml" else DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml" fi diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml new file mode 100644 index 00000000..b258c653 --- /dev/null +++ b/config/deploy/os-odl_l2-fdio-ha.yaml @@ -0,0 +1,12 @@ +global_params: + ha_enabled: true + +deploy_options: + sdn_controller: opendaylight + sdn_l3: false + odl_version: boron + tacker: false + congress: false + sfc: false + vpn: false + vpp: true diff --git a/config/deploy/os-odl_l2-fdio-noha.yaml b/config/deploy/os-odl_l2-fdio-noha.yaml new file mode 100644 index 00000000..52e312e3 --- /dev/null +++ b/config/deploy/os-odl_l2-fdio-noha.yaml @@ -0,0 +1,12 @@ +global_params: + ha_enabled: false + +deploy_options: + sdn_controller: opendaylight + sdn_l3: false + odl_version: boron + tacker: false + congress: false + sfc: false + vpn: false + vpp: true diff --git a/lib/python/apex/deploy_env.py b/lib/python/apex/deploy_env.py index fb03cd07..4c71b54f 100644 --- a/lib/python/apex/deploy_env.py +++ b/lib/python/apex/deploy_env.py @@ -18,7 +18,8 @@ REQ_DEPLOY_SETTINGS = ['sdn_controller', 'congress', 'dataplane', 'sfc', - 'vpn'] + 'vpn', + 'vpp'] OPT_DEPLOY_SETTINGS = ['performance'] |