From d2913d4bcc0fcd25dc3d01f6604049dfd0a9217d Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 2 May 2018 12:34:38 -0400 Subject: Migrates master to use direct upstream We now move master to deploy from upstream. That means we do not need to build undercloud/overcloud images anymore. Changes-Include: - Remove bash build scripts as we do not need to build anything other than the python package anymore - Remove building images or iso from build.py - Remove building of images and iso from Makefile - Rename/refactor deploy settings files for nosdn and odl. The new convention is that the typical scenario names we use will deploy master. We also support n-1 OS, so in that case we use the branch name for the "feature" in the scenario name: os-odl-queens-noha. - Tacker/Congress are disabled in settings files until we fix that with upstream. Containers are now enabled by default. - Disable TLS for undercloud (was changed upstream to default enabled) - Fix environments docker directory for master THT (was changed upstream) - Includes fix for LP#1768901 - Includes workaround for LP#1770692 - Moves to docker.io for container images as it is more stable and should contain the same images - Removes the term 'common' from apex packaging for referencing the Python Apex package Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a Signed-off-by: Tim Rozet --- build/rpm_specs/opnfv-apex-undercloud.spec | 53 ------------------------------ 1 file changed, 53 deletions(-) delete mode 100644 build/rpm_specs/opnfv-apex-undercloud.spec (limited to 'build/rpm_specs/opnfv-apex-undercloud.spec') diff --git a/build/rpm_specs/opnfv-apex-undercloud.spec b/build/rpm_specs/opnfv-apex-undercloud.spec deleted file mode 100644 index fc3c3ec1..00000000 --- a/build/rpm_specs/opnfv-apex-undercloud.spec +++ /dev/null @@ -1,53 +0,0 @@ -Name: opnfv-apex-undercloud -Version: 6.0 -Release: %{_release} -Summary: Scripts and Disk images to launch the Undercloud for OPNFV Apex - -Group: System Environment -License: Apache 2.0 -URL: https://gerrit.opnfv.org/gerrit/apex.git -Source0: opnfv-apex-undercloud.tar.gz - -BuildArch: noarch -BuildRequires: python-docutils -Requires: openvswitch libvirt qemu-kvm bridge-utils libguestfs-tools - -%description -Scripts and Disk images to launch the Undercloud for OPNFV Apex -https://wiki.opnfv.org/apex - -%prep -%setup -q - -%build - -%install -mkdir -p %{buildroot}%{_var}/opt/opnfv/images/ -mkdir -p %{buildroot}%{_var}/opt/opnfv/nics/ - -install build/undercloud.qcow2 %{buildroot}%{_var}/opt/opnfv/images/ -install build/network-environment.yaml %{buildroot}%{_var}/opt/opnfv/ -install build/nics-template.yaml.jinja2 %{buildroot}%{_var}/opt/opnfv/ - -%files -%defattr(644, root, root, -) -%{_var}/opt/opnfv/images/undercloud.qcow2 -%{_var}/opt/opnfv/network-environment.yaml -%{_var}/opt/opnfv/nics-template.yaml.jinja2 - - -%changelog -* Wed Nov 29 2017 Tim Rozet - 6.0-0 - Bump version for Fraser -* Tue Apr 04 2017 Dan Radez - 5.0-1 -- Version update for Euphrates -* Wed Nov 2 2016 Dan Radez - 4.0-1 -- Version update for Danube -* Tue May 24 2016 Tim Rozet - 3.0-1 -- Adds jinja2 nic templates -* Mon Apr 04 2016 Dan Radez - 3.0-0 -- Version update for Colorado -* Wed Mar 30 2016 Dan Radez - 2.1-2 -- Replacing NIC files with templates -* Thu Jan 14 2016 Dan Radez - 2.1-1 -- Package Split -- cgit 1.2.3-korg