diff options
| -rw-r--r-- | build/Makefile | 79 | ||||
| -rw-r--r-- | build/c7-opnfv-x86_64-comps.xml | 18 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight-sfc.sh | 27 | ||||
| -rw-r--r-- | build/rpm_specs/opnfv-apex-opendaylight-sfc.spec | 34 | ||||
| -rw-r--r-- | build/variables.sh | 4 | ||||
| -rw-r--r-- | ci/PR_revision.log | 1 | ||||
| -rwxr-xr-x | ci/build.sh | 3 | ||||
| -rwxr-xr-x | ci/clean.sh | 4 | ||||
| -rwxr-xr-x | ci/deploy.sh | 1 | ||||
| -rw-r--r-- | docs/installationprocedure/baremetal.rst | 19 | ||||
| -rw-r--r-- | docs/releasenotes/release-notes.rst | 1 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 23 | ||||
| -rw-r--r-- | lib/python/apex/common/constants.py | 1 | ||||
| -rw-r--r-- | lib/python/apex/network_settings.py | 3 | ||||
| -rwxr-xr-x | tests/smoke_tests/execute_smoke_tests.sh | 2 | ||||
| -rw-r--r-- | tests/smoke_tests/prepare_undercloud.yml | 2 |
16 files changed, 62 insertions, 160 deletions
diff --git a/build/Makefile b/build/Makefile index d17b8b52..c98e07b6 100644 --- a/build/Makefile +++ b/build/Makefile @@ -17,30 +17,30 @@ export RPMCOM = $(shell pwd)/noarch/opnfv-apex-common-$(RPMVERS)-$(shell echo ${ export RPMUDR = $(shell pwd)/noarch/opnfv-apex-undercloud-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm export RPMODL = $(shell pwd)/noarch/opnfv-apex-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm export RPMONO = $(shell pwd)/noarch/opnfv-apex-onos-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm -export RPMSFC = $(shell pwd)/noarch/opnfv-apex-opendaylight-sfc-$(RPMVERS)-$(shell echo ${RELEASE} | tr -d '_-').noarch.rpm .PHONY: all all: iso .PHONY: clean -clean: images-clean rpms-clean iso-clean tacker-clean congress-clean vpp-clean +clean: images-clean rpms-clean iso-clean tacker-clean tackerclient-clean congress-clean vpp-clean .PHONY: images -images: undercloud overcloud-full overcloud-opendaylight overcloud-onos overcloud-opendaylight-sfc +images: undercloud overcloud-full overcloud-opendaylight overcloud-onos .PHONY: images-clean -images-clean: undercloud-clean overcloud-full-clean overcloud-opendaylight-clean overcloud-onos-clean overcloud-opendaylight-sfc-clean - @rm -rf images/ +images-clean: undercloud-clean overcloud-full-clean overcloud-opendaylight-clean overcloud-onos-clean + rm -rf images/ .PHONY: rpms -rpms: common-rpm undercloud-rpm opendaylight-rpm onos-rpm opendaylight-sfc-rpm +rpms: common-rpm undercloud-rpm opendaylight-rpm onos-rpm .PHONY: rpms-check -rpms-check: common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rpm-check opendaylight-sfc-rpm-check +rpms-check: common-rpm-check undercloud-rpm-check opendaylight-rpm-check onos-rpm-check .PHONY: rpms-clean -rpms-clean: common-rpm-clean undercloud-rpm-clean opendaylight-rpm-clean onos-rpm-clean opendaylight-sfc-rpm-clean +rpms-clean: common-rpm-clean undercloud-rpm-clean opendaylight-rpm-clean onos-rpm-clean + rm -rf noarch opnfv-apex-common.tar.gz: pushd ../ && git archive --format=tar.gz --prefix=opnfv-apex-common-$(RPMVERS)/ HEAD > build/opnfv-apex-common.tar.gz @@ -57,6 +57,9 @@ $(RPMCOM): # build the common RPM rpmbuild --clean -ba rpm_specs/opnfv-apex-common.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')" +.PHONY: common-rpm-clean +common-rpm-clean: + ################## # PYTHON TESTS # ################## @@ -88,8 +91,8 @@ python-pep8-check: .PHONY: tacker-clean tacker-clean: - @rm -rf openstack-tacker-2015.2 - @rm -f openstack-tacker.tar.gz + rm -rf openstack-tacker-2015.2 + rm -f openstack-tacker.tar.gz openstack-tacker.tar.gz: @echo "Preparing the Tacker RPM prerequisites" @@ -108,10 +111,9 @@ openstack-tacker-2015.2-1.trozet.noarch.rpm: ################# .PHONY: tackerclient-clean - tackerclient-clean: - @rm -rf python-tackerclient-2015.2 - @rm -f python-tackerclient.tar.gz + rm -rf python-tackerclient-2015.2 + rm -f python-tackerclient.tar.gz python-tackerclient.tar.gz: @echo "Preparing the TackerClient RPM prerequisites" @@ -209,7 +211,9 @@ networking-vpp: .PHONY: undercloud-clean undercloud-clean: - @rm -f images/undercloud.* + rm -f images/undercloud.* + rm -rf opnfv-tht.tar.gz + rm -rf opnfv-tht/ .PHONY: undercloud undercloud: images/undercloud.qcow2 @@ -236,14 +240,21 @@ $(RPMUDR): @echo "Building the Apex Undercloud RPM" rpmbuild --clean -ba rpm_specs/opnfv-apex-undercloud.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')" +.PHONY: undercloud-rpm-clean +undercloud-rpm-clean: + ############### # OVERCLOUD # ############### .PHONY: overcloud-full-clean overcloud-full-clean: - @rm -rf images/overcloud-full.d - @rm -f images/overcloud-full.* + rm -rf images/overcloud-full.d + rm -f images/overcloud-full.* + rm -rf opnfv-puppet-tripleo.tar.gz + rm -rf opnfv-puppet-tripleo/ + rm -rf os-net-config.tar.gz + rm -rf os-net-config/ .PHONY: overcloud-full overcloud-full: images/overcloud-full.qcow2 @@ -282,6 +293,9 @@ $(RPMODL): # build the overcloud RPM rpmbuild --clean -ba rpm_specs/opnfv-apex.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')" +.PHONY: opendaylight-rpm-clean +opendaylight-rpm-clean: + ############### # ONOS # ############### @@ -301,7 +315,8 @@ images/overcloud-full-onos.qcow2: images/overcloud-full.qcow2 .PHONY: onos-rpm-clean onos-rpm-clean: - @rpmbuild --clean rpm_specs/opnfv-apex-onos.spec -D "release $(shell echo $RELEASE | tr -d '_-')" + @#rpmbuild --clean rpm_specs/opnfv-apex-onos.spec -D "release $(shell echo $RELEASE | tr -d '_-')" + rm -rf opnfv-apex-onos.tar.gz opnfv-apex-onos.tar.gz: images/overcloud-full-onos.qcow2 tar -czf opnfv-apex-onos.tar.gz --xform="s:images/overcloud-full-onos.qcow2:opnfv-apex-onos-$(RPMVERS)/build/images/overcloud-full-onos.qcow2:" images/overcloud-full-onos.qcow2 @@ -319,35 +334,6 @@ $(RPMONO): rpmbuild --clean -ba rpm_specs/opnfv-apex-onos.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')" ############### -# ODL-SFC # -############### - -.PHONY: overcloud-opendaylight-sfc-clean -overcloud-opendaylight-sfc-clean: - @rm -f images/overcloud-full-opendaylight-sfc.qcow2 - -.PHONY: overcloud-opendaylight-sfc -overcloud-opendaylight-sfc: images/overcloud-full-opendaylight-sfc.qcow2 - -images/overcloud-full-opendaylight-sfc.qcow2: images/overcloud-full-opendaylight.qcow2 - @echo "Building the Apex OpenDaylight Overcloud Image" - @./overcloud-opendaylight-sfc.sh - -opnfv-apex-opendaylight-sfc.tar.gz: images/overcloud-full-opendaylight-sfc.qcow2 - tar -czf opnfv-apex-opendaylight-sfc.tar.gz --xform="s:images/overcloud-full-opendaylight-sfc.qcow2:opnfv-apex-opendaylight-sfc-$(RPMVERS)/build/images/overcloud-full-opendaylight-sfc.qcow2:" images/overcloud-full-opendaylight-sfc.qcow2 - -.PHONY: opendaylight-sfc-rpm-check -opendaylight-sfc-rpm-check: opnfv-apex-opendaylight-sfc.tar.gz - rpmbuild --clean -bi -bl rpm_specs/opnfv-apex-opendaylight-sfc.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')" - -.PHONY: opendaylight-sfc-rpm -opendaylight-sfc-rpm: opnfv-apex-opendaylight-sfc.tar.gz $(RPMSFC) - -$(RPMSFC): - @echo "Building the Apex OpenDaylight SFC RPM" - rpmbuild --clean -ba rpm_specs/opnfv-apex-opendaylight-sfc.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' -D "release $(shell echo $(RELEASE) | tr -d '_-')" - -############### # ISO # ############### @@ -385,7 +371,6 @@ iso: iso-clean images rpms $(CENTISO) @ln $(RPMUDR) centos/Packages @ln $(RPMODL) centos/Packages @ln $(RPMONO) centos/Packages - @ln $(RPMSFC) centos/Packages # add packages to the centos packages cd centos/Packages && yumdownloader openvswitch cd centos/Packages && yumdownloader openstack-tripleo diff --git a/build/c7-opnfv-x86_64-comps.xml b/build/c7-opnfv-x86_64-comps.xml index a9b0af0c..67a0e511 100644 --- a/build/c7-opnfv-x86_64-comps.xml +++ b/build/c7-opnfv-x86_64-comps.xml @@ -3,7 +3,7 @@ <comps> <group> <id>apex-opendaylight</id> - <name>OPNFV Apex OpenDaylight (non-sfc) Support</name> + <name>OPNFV Apex OpenDaylight Support</name> <description>Disk images and configuration files used to launch an Apex OpenDaylight deployment.</description> <default>false</default> <uservisible>false</uservisible> @@ -15,7 +15,7 @@ </group> <group> <id>apex-onos</id> - <name>OPNFV Apex ONOS (non-sfc) Support</name> + <name>OPNFV Apex ONOS Support</name> <description>Disk images and configuration files used to launch an Apex ONOS deployment.</description> <default>false</default> <uservisible>false</uservisible> @@ -26,18 +26,6 @@ </packagelist> </group> <group> - <id>apex-opendaylight-sfc</id> - <name>OPNFV Apex OpenDaylight SFC Support</name> - <description>Disk images and configuration files used to launch an Apex ODL SFC deployment.</description> - <default>false</default> - <uservisible>false</uservisible> - <packagelist> - <packagereq type="mandatory">opnfv-apex-opendaylight-sfc</packagereq> - <packagereq type="mandatory">opnfv-common</packagereq> - <packagereq type="mandatory">opnfv-undercloud</packagereq> - </packagelist> - </group> - <group> <id>additional-devel</id> <name>Additional Development</name> <name xml:lang="as">অতিৰিক্ত উন্নয়ন</name> @@ -7852,7 +7840,6 @@ <groupid>virtualization-tools</groupid> <groupid>apex-opendaylight</groupid> <groupid>apex-onos</groupid> - <groupid>apex-opendaylight-sfc</groupid> </grouplist> <optionlist> <groupid>virtualization-platform</groupid> @@ -7879,7 +7866,6 @@ <groupid>virtualization-tools</groupid> <groupid>apex-opendaylight</groupid> <groupid>apex-onos</groupid> - <groupid>apex-opendaylight-sfc</groupid> </grouplist> <optionlist> <groupid>kde-desktop</groupid> diff --git a/build/overcloud-opendaylight-sfc.sh b/build/overcloud-opendaylight-sfc.sh deleted file mode 100755 index 444d284a..00000000 --- a/build/overcloud-opendaylight-sfc.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -############################################################################## -# Copyright (c) 2015 Tim Rozet (Red Hat), Dan Radez (Red Hat) and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -set -e -source ./variables.sh -pushd images > /dev/null - -################################################ -##### Adding SFC+OpenDaylight overcloud ##### -################################################ - -#copy opendaylight overcloud full to odl-sfc -cp -f overcloud-full-opendaylight.qcow2 overcloud-full-opendaylight-sfc_build.qcow2 - -# upgrade ovs into ovs 2.5.90 with NSH function -LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_kmod_rpm_name}" \ - --run-command "yum upgrade -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_rpm_name}" \ - -a overcloud-full-opendaylight-sfc_build.qcow2 - -mv overcloud-full-opendaylight-sfc_build.qcow2 overcloud-full-opendaylight-sfc.qcow2 -popd > /dev/null diff --git a/build/rpm_specs/opnfv-apex-opendaylight-sfc.spec b/build/rpm_specs/opnfv-apex-opendaylight-sfc.spec deleted file mode 100644 index a63ec7c5..00000000 --- a/build/rpm_specs/opnfv-apex-opendaylight-sfc.spec +++ /dev/null @@ -1,34 +0,0 @@ -Name: opnfv-apex-opendaylight-sfc -Version: 3.0 -Release: %{release} -Summary: Overcloud Disk images for OPNFV Apex OpenDaylight with SFC deployment - -Group: System Environment -License: Apache 2.0 -URL: https://gerrit.opnfv.org/gerrit/apex.git -Source0: opnfv-apex-opendaylight-sfc.tar.gz - -Provides: opnfv-apex-sdn -BuildArch: noarch -Requires: opnfv-apex-common opnfv-apex-undercloud - -%description -Overcloud Disk images for OPNFV Apex OpenDaylight with SFC deployment -https://wiki.opnfv.org/apex - -%prep -%setup -q - -%install -mkdir -p %{buildroot}%{_var}/opt/opnfv/images/ -install build/images/overcloud-full-opendaylight-sfc.qcow2 %{buildroot}%{_var}/opt/opnfv/images/ - -%files -%defattr(644, root, root, -) -%{_var}/opt/opnfv/images/overcloud-full-opendaylight-sfc.qcow2 - -%changelog -* Mon Apr 04 2016 Dan Radez <dradez@redhat.com> - 3.0-0 -- Version update for Colorado -* Tue Jan 19 2016 Dan Radez <dradez@redhat.com> - 2.1-1 -- Initial Packaging diff --git a/build/variables.sh b/build/variables.sh index b26e7406..6d657186 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -37,10 +37,6 @@ fdio_pkgs=( ) honeycomb_pkg='honeycomb-1.16.9-FINAL.noarch.rpm' - -ovs_rpm_name=openvswitch-2.5.90-1.el7.centos.x86_64.rpm -ovs_kmod_rpm_name=openvswitch-kmod-2.5.90-1.el7.centos.x86_64.rpm - virt_uri_base=https://people.redhat.com/~rjones/libguestfs-RHEL-7.3-preview libguestfs_pkg='libguestfs-1.32.7-3.el7.x86_64.rpm' virt_pkgs=( diff --git a/ci/PR_revision.log b/ci/PR_revision.log index 16cf08f8..78cd7091 100644 --- a/ci/PR_revision.log +++ b/ci/PR_revision.log @@ -45,3 +45,4 @@ 86,Moves sdnvpn config to env file 87,Pass vlan flag to fdio module when vlan is used for tenant network 88,Default tenant_nic to its physical name +89,Add enic workaround for UCS with OVS DPDK diff --git a/ci/build.sh b/ci/build.sh index f3ab497d..f1333ce4 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -132,9 +132,6 @@ if [[ "$MAKE_TARGETS" == "images" ]]; then if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-onos.spec* ]]; then MAKE_TARGETS+=" onos-rpm-check" fi - if [[ $commit_file_list == *build/rpm_specs/opnfv-apex-opendaylight-sfc.spec* ]]; then - MAKE_TARGETS+=" opendaylight-sfc-rpm-check" - fi fi fi diff --git a/ci/clean.sh b/ci/clean.sh index c00a4df2..1e5e320e 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -30,8 +30,8 @@ for lib in common-functions parse-functions; do done vm_index=4 -ovs_bridges="br-admin br-tenant br-public br-storage" -ovs_bridges+=" br-private br-external" # Legecy names, remove in E river +ovs_bridges="br-admin br-tenant br-external br-storage" +ovs_bridges+=" br-private br-public" # Legacy names, remove in E river #OPNFV_NETWORK_TYPES=$(python3 -c 'from apex.common.constants import OPNFV_NETWORK_TYPES; print(" ".join(OPNFV_NETWORK_TYPES))') OPNFV_NETWORK_TYPES+=" admin tenant external storage api" diff --git a/ci/deploy.sh b/ci/deploy.sh index 9affa80a..6d3ded02 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -24,7 +24,6 @@ green=$(tput setaf 2 || echo "") interactive="FALSE" ping_site="8.8.8.8" -ntp_server="pool.ntp.org" post_config="TRUE" debug="FALSE" diff --git a/docs/installationprocedure/baremetal.rst b/docs/installationprocedure/baremetal.rst index 2de6e8a8..95412a1f 100644 --- a/docs/installationprocedure/baremetal.rst +++ b/docs/installationprocedure/baremetal.rst @@ -119,7 +119,6 @@ Install Bare Metal Jumphost - opnfv-apex - OpenDaylight L2 / L3 and ONOS support * - opnfv-apex-onos - ONOS support * - - opnfv-apex-opendaylight-sfc - OpenDaylight SFC support * - opnfv-apex-undercloud - (reqed) Undercloud Image - opnfv-apex-common - (reqed) Supporting config files and scripts - python34-markupsafe - (reqed) Dependency of opnfv-apex-common ** @@ -127,9 +126,9 @@ Install Bare Metal Jumphost - python3-ipmi - (reqed) Dependency of opnfv-apex-common ** \* One or more of these RPMs is required - Only one of opnfv-apex, opnfv-apex-onos and opnfv-apex-opendaylight-sfc is - required. It is safe to leave the unneeded SDN controller's RPMs - uninstalled if you do not intend to use them. + Only one of opnfv-apex or opnfv-apex-onos is required. It is safe to leave + the unneeded SDN controller's RPMs uninstalled if you do not intend to use + them. ** These RPMs are not yet distributed by CentOS or EPEL. Apex has built these for distribution with Apex while CentOS and EPEL do @@ -185,18 +184,20 @@ IPMI configuration information gathered in section - ``ipmi_user``: IPMI username - ``ipmi_password``: IPMI password - ``pm_type``: Power Management driver to use for the node + values: pxe_ipmitool (tested) or pxe_wol (untested) or pxe_amt (untested) - ``cpus``: (Introspected*) CPU cores available - ``memory``: (Introspected*) Memory available in Mib - ``disk``: (Introspected*) Disk space available in Gb - ``arch``: (Introspected*) System architecture - - ``capabilities``: (Opt**) Node role (profile:control or profile:compute) + - ``capabilities``: (Opt**) Node's role in deployment + values: profile:control or profile:compute -\* *Introspection looks up the overcloud node's resources and overrides these + \* Introspection looks up the overcloud node's resources and overrides these value. You can leave default values and Apex will get the correct values when - it runs introspection on the nodes.* + it runs introspection on the nodes. -** *If capabilities profile is not specified then Apex will select node's roles - in the OPNFV cluster in a non-deterministic fashion.* + ** If capabilities profile is not specified then Apex will select node's roles + in the OPNFV cluster in a non-deterministic fashion. Creating the Settings Files --------------------------- diff --git a/docs/releasenotes/release-notes.rst b/docs/releasenotes/release-notes.rst index 52b676ec..927c07c9 100644 --- a/docs/releasenotes/release-notes.rst +++ b/docs/releasenotes/release-notes.rst @@ -224,7 +224,6 @@ Software Deliverables - Apex .iso file - Apex overcloud .rpm (opnfv-apex) - For nosdn and OpenDaylight Scenarios - Apex overcloud onos .rpm (opnfv-apex-onos) - ONOS Scenarios -- Apex overcloud ODL SFC .rpm (opnfv-apex-opendaylight-sfc) - ODL SFC Scenario - Apex undercloud .rpm (opnfv-apex-undercloud) - Apex common .rpm (opnfv-apex-common) - build.sh - Builds the above artifacts diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index a7fc5c2e..a42162f2 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -29,14 +29,6 @@ function overcloud_deploy { DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml" fi SDN_IMAGE=opendaylight - if [ "${deploy_options_array['sfc']}" == 'True' ]; then - SDN_IMAGE+=-sfc - if [ ! -f $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then - echo "${red} $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 is required to execute an SFC deployment." - echo "Please install the opnfv-apex-opendaylight-sfc package to provide this overcloud image for deployment.${reset}" - exit 1 - fi - fi elif [ "${deploy_options_array['sdn_controller']}" == 'opendaylight-external' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight-external.yaml" SDN_IMAGE=opendaylight @@ -117,12 +109,6 @@ EOF -a overcloud-full.qcow2 fi - if [ "${deploy_options_array['sdn_controller']}" == 'onos' && "${deploy_options_array['sfc']}" == 'True' ]; then - # upgrade ovs into ovs 2.5.90 with NSH function - LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_kmod_rpm_name}" \ - --run-command "yum upgrade -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_rpm_name}" \ - -a overcloud-full.qcow2 - fi EOI elif [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then @@ -134,6 +120,15 @@ EOI ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex" fi + # upgrade ovs into ovs 2.5.90 with NSH function if SFC is enabled + if [ "${deploy_options_array['sfc']}" == 'True' && "${deploy_options_array['dataplane']}" == 'ovs' ]; then + ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI + LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_kmod_rpm_name}" \ + --run-command "yum upgrade -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_rpm_name}" \ + -a overcloud-full.qcow2 +EOI + fi + # Set ODL version accordingly if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['odl_version']}" == 'boron' ]]; then ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI diff --git a/lib/python/apex/common/constants.py b/lib/python/apex/common/constants.py index db0a9fd1..741bb4f8 100644 --- a/lib/python/apex/common/constants.py +++ b/lib/python/apex/common/constants.py @@ -18,6 +18,7 @@ COMPUTE = 'compute' OPNFV_NETWORK_TYPES = [ADMIN_NETWORK, TENANT_NETWORK, EXTERNAL_NETWORK, STORAGE_NETWORK, API_NETWORK] DNS_SERVERS = ["8.8.8.8", "8.8.4.4"] +NTP_SERVER = ["pool.ntp.org"] COMPUTE = 'compute' CONTROLLER = 'controller' ROLES = [COMPUTE, CONTROLLER] diff --git a/lib/python/apex/network_settings.py b/lib/python/apex/network_settings.py index ca40ba93..c9f7d450 100644 --- a/lib/python/apex/network_settings.py +++ b/lib/python/apex/network_settings.py @@ -21,6 +21,7 @@ from .common.constants import ( ROLES, DOMAIN_NAME, DNS_SERVERS, + NTP_SERVER, ADMIN_NETWORK, EXTERNAL_NETWORK, OPNFV_NETWORK_TYPES, @@ -113,6 +114,7 @@ class NetworkSettings(dict): if 'dns-domain' not in self: self['domain_name'] = DOMAIN_NAME self['dns_servers'] = self.get('dns_nameservers', DNS_SERVERS) + self['ntp_servers'] = self.get('ntp', NTP_SERVER) def _validate_overcloud_nic_order(self, network): """ @@ -333,6 +335,7 @@ class NetworkSettings(dict): bash_str += flatten('ip_addr_family', self.get_ip_addr_family()) bash_str += flatten('dns_servers', self['dns_servers'], ' ') bash_str += flatten('domain_name', self['dns-domain'], ' ') + bash_str += flatten('ntp_server', self['ntp_servers'][0], ' ') if path: with open(path, 'w') as file: file.write(bash_str) diff --git a/tests/smoke_tests/execute_smoke_tests.sh b/tests/smoke_tests/execute_smoke_tests.sh index 245ccc53..6f9e17f3 100755 --- a/tests/smoke_tests/execute_smoke_tests.sh +++ b/tests/smoke_tests/execute_smoke_tests.sh @@ -3,4 +3,4 @@ cd ~/provisioning/python export PYTHONPATH=$PYTHONPATH:$(pwd) -python unit_test_suite.py ~stack/overcloudrc
\ No newline at end of file +python unit_test_suite.py -e ~stack/overcloudrc -n external -l INFO
\ No newline at end of file diff --git a/tests/smoke_tests/prepare_undercloud.yml b/tests/smoke_tests/prepare_undercloud.yml index 8f0cb709..d4e318a9 100644 --- a/tests/smoke_tests/prepare_undercloud.yml +++ b/tests/smoke_tests/prepare_undercloud.yml @@ -13,4 +13,4 @@ - pip: name=PyYAML - pip: name=ansible==2.1.0 - - git: repo=https://nougat.cablelabs.com/SNAPS/provisioning.git dest=~/provisioning + - git: repo=https://gerrit.cablelabs.com/snaps-provisioning dest=~/provisioning |