diff options
| -rw-r--r-- | build/opnfv-apex-common.spec | 6 | ||||
| -rwxr-xr-x | build/overcloud-full.sh | 5 | ||||
| -rwxr-xr-x | ci/build.sh | 4 | ||||
| -rwxr-xr-x | ci/deploy.sh | 9 | ||||
| -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 |
7 files changed, 49 insertions, 2 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/build/overcloud-full.sh b/build/overcloud-full.sh index 340053b3..f35e3ceb 100755 --- a/build/overcloud-full.sh +++ b/build/overcloud-full.sh @@ -18,6 +18,11 @@ if [ ! -d images/ ]; then mkdir images; fi tar -xf cache/overcloud-full.tar -C images/ mv -f images/overcloud-full.qcow2 images/overcloud-full_build.qcow2 +# Add extra space to the overcloud image +qemu-img resize images/overcloud-full_build.qcow2 +1G +LIBGUESTFS_BACKEND=direct virt-customize -a images/overcloud-full_build.qcow2 \ + --run-command 'resize2fs /dev/sda' + ########################################################## ##### Prep initial overcloud image with common deps ##### ########################################################## diff --git a/ci/build.sh b/ci/build.sh index dd9f9fd1..fd079c91 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -113,7 +113,9 @@ fi # Conditionally execute RPM build checks if the specs change and target is not rpm or iso if [[ "$MAKE_TARGETS" == "images" ]]; then commit_file_list=$(git show --pretty="format:" --name-only) - if [[ $commit_file_list == *build/Makefile* ]]; then + if git show -s | grep "force-build-rpms"; then + MAKE_TARGETS+=" rpms" + elif [[ $commit_file_list == *build/Makefile* ]]; then # Makefile forces all rpms to be checked MAKE_TARGETS+=" rpms-check" else diff --git a/ci/deploy.sh b/ci/deploy.sh index 30f8e0f9..abf3866b 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -814,6 +814,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 @@ -1088,11 +1090,18 @@ echo "Configuring Neutron external network" neutron net-create external --router:external=True --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') neutron subnet-create --name external-net --tenant-id \$(openstack project show service | grep id | awk '{ print \$4 }') --disable-dhcp external --gateway ${public_network_gateway} --allocation-pool start=${public_network_floating_ip_range%%,*},end=${public_network_floating_ip_range##*,} ${public_network_cidr} +echo "Removing sahara endpoint and service" +sahara_service_id=\$(openstack service list | grep sahara | cut -d ' ' -f 2) +sahara_endpoint_id=\$(openstack endpoint list | grep sahara | cut -d ' ' -f 2) +openstack endpoint delete \$sahara_endpoint_id +openstack service delete \$sahara_service_id + echo "Removing swift endpoint and service" swift_service_id=\$(openstack service list | grep swift | cut -d ' ' -f 2) swift_endpoint_id=\$(openstack endpoint list | grep swift | cut -d ' ' -f 2) openstack endpoint delete \$swift_endpoint_id openstack service delete \$swift_service_id + EOI echo -e "${blue}INFO: Checking if OVS bridges have IP addresses...${reset}" 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'] |