diff options
| -rw-r--r-- | LICENSE.rst | 4 | ||||
| -rw-r--r-- | build/Makefile | 3 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 4 | ||||
| -rw-r--r-- | build/patches/0001-Removes-doing-yum-update.patch | 4 | ||||
| -rw-r--r-- | build/variables.sh | 10 | ||||
| -rwxr-xr-x | ci/dev_dep_check.sh | 8 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 4 |
7 files changed, 18 insertions, 19 deletions
diff --git a/LICENSE.rst b/LICENSE.rst index 1b941f2d..dbcf58a6 100644 --- a/LICENSE.rst +++ b/LICENSE.rst @@ -55,8 +55,8 @@ Licenses as listed below: | RabbitMQ | Mozilla Public License | | | https://www.rabbitmq.com/mpl.html | +----------------+-----------------------------------------------------+ -| Linux | GPLv3 | -| | https://www.gnu.org/copyleft/gpl.html | +| Linux | GPL v2 | +| | https://www.gnu.org/licenses/gpl-2.0.html | +----------------+-----------------------------------------------------+ | Ceph | GPL v2 | | | https://www.gnu.org/licenses/gpl-2.0.html | diff --git a/build/Makefile b/build/Makefile index d44978e8..41e59eff 100644 --- a/build/Makefile +++ b/build/Makefile @@ -329,8 +329,9 @@ iso: iso-clean images rpms $(CENTISO) @ln $(RPMUDR) $(BUILD_DIR)/centos/Packages @ln $(RPMODL) $(BUILD_DIR)/centos/Packages # add packages to the centos packages - cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch openstack-tripleo jq oniguruma python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe + cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq oniguruma python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm + cd $(BUILD_DIR)/centos/Packages && curl -O http://mirror.centos.org/centos/7/cloud/x86_64/openstack-newton/openstack-tripleo-0.0.8-0.3.4de13b3git.el7.noarch.rpm # regenerate yum repo data @echo "Generating new yum metadata" createrepo --update -g $(BUILD_ROOT)/c7-opnfv-x86_64-comps.xml $(BUILD_DIR)/centos diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 67131184..39a549d5 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -79,7 +79,7 @@ popd > /dev/null populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga-3.tar.gz # Download ODL netvirt for VPP -populate_cache http://artifacts.opnfv.org/apex/danube/fdio_netvirt/odl-netvirt-vpp-distribution.tar.gz +populate_cache http://artifacts.opnfv.org/apex/danube/fdio_netvirt/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm # install ODL packages # Patch in OPNFV custom puppet-tripleO @@ -116,7 +116,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --run-command "cd /root/quagga; packages=\$(ls |grep -vE 'debuginfo|devel|contrib'); yum -y install \$packages" \ --run-command "sudo usermod -a -G quaggavt quagga" \ --upload ${BUILD_ROOT}/patches/neutron-patch-NSDriver.patch:/usr/lib/python2.7/site-packages/ \ - --upload ${CACHE_DIR}/odl-netvirt-vpp-distribution.tar.gz:/root/ \ + --upload ${CACHE_DIR}/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm:/root/ \ -a overcloud-full-opendaylight_build.qcow2 LIBGUESTFS_BACKEND=direct virt-sparsify --compress overcloud-full-opendaylight_build.qcow2 overcloud-full-opendaylight.qcow2 diff --git a/build/patches/0001-Removes-doing-yum-update.patch b/build/patches/0001-Removes-doing-yum-update.patch index 86e6ea3f..47b90fad 100644 --- a/build/patches/0001-Removes-doing-yum-update.patch +++ b/build/patches/0001-Removes-doing-yum-update.patch @@ -12,10 +12,10 @@ diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index 2b9ff8c..b26cb49 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py -@@ -1209,7 +1209,6 @@ def install(instack_root): - _validate_configuration() +@@ -1225,7 +1225,6 @@ def install(instack_root): instack_env = _generate_environment(instack_root) _generate_init_data(instack_env) + _die_tuskar_die() - _run_yum_update(instack_env) _run_instack(instack_env) _run_orc(instack_env) diff --git a/build/variables.sh b/build/variables.sh index 564d2286..ecbe266d 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -60,10 +60,10 @@ netvpp_pkg=python-networking-vpp-0.0.1-1.git${NETVPP_COMMIT}$(rpm -E %dist).noar gluon_rpm=gluon-0.0.1-1_20170302.noarch.rpm fdio_pkgs=( -'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp/17.04-release.x86_64/vpp-17.04-release.x86_64.rpm' -'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-api-python/17.04-release.x86_64/vpp-api-python-17.04-release.x86_64.rpm' -'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-lib/17.04-release.x86_64/vpp-lib-17.04-release.x86_64.rpm' -'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-plugins/17.04-release.x86_64/vpp-plugins-17.04-release.x86_64.rpm' +'http://artifacts.opnfv.org/apex/danube/fdio_common_rpms/vpp-17.04.1-3~ge3b7ad7~b72.x86_64.rpm' +'http://artifacts.opnfv.org/apex/danube/fdio_common_rpms/vpp-api-python-17.04.1-3~ge3b7ad7~b72.x86_64.rpm' +'http://artifacts.opnfv.org/apex/danube/fdio_common_rpms/vpp-lib-17.04.1-3~ge3b7ad7~b72.x86_64.rpm' +'http://artifacts.opnfv.org/apex/danube/fdio_common_rpms/vpp-plugins-17.04.1-3~ge3b7ad7~b72.x86_64.rpm' ) -honeycomb_pkg='http://artifacts.opnfv.org/apex/danube/fdio_common_rpms/honeycomb-1.17.04-2048.noarch.rpm' +honeycomb_pkg='http://artifacts.opnfv.org/apex/danube/fdio_common_rpms/honeycomb-1.17.04.1-2073.noarch.rpm' diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh index 6d0aa11f..86e6fd91 100755 --- a/ci/dev_dep_check.sh +++ b/ci/dev_dep_check.sh @@ -12,16 +12,14 @@ set -e -rdo_action="update" - # check for rdo-release if ! rpm -q rdo-release > /dev/null; then - rdo_action="install" + sudo yum remove rdo-release fi # make sure rdo release -if ! sudo yum $rdo_action -y https://www.rdoproject.org/repos/rdo-release.rpm; then - echo "Failed to $rdo_action RDO Release package..." +if ! sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-newton/rdo-release-newton-5.noarch.rpm; then + echo "Failed to install RDO Release package..." exit 1 fi diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 0ed91ef7..445f5fb5 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -285,8 +285,8 @@ EOI # Override ODL if we enable netvirt for fdio if [[ "${deploy_options_array['odl_vpp_netvirt']}" == 'True' && "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI - LIBGUESTFS_BACKEND=direct virt-customize --run-command "rm -rf /opt/opendaylight/*" \ - --run-command "tar zxvf /root/odl-netvirt-vpp-distribution.tar.gz -C /opt/opendaylight/" \ + LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum -y remove opendaylight" \ + --run-command "yum -y install /root/opendaylight-7.0.0-0.1.20170531snap665.el7.noarch.rpm" \ -a overcloud-full.qcow2 EOI fi |