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 --- config/deploy/os-odl-pike_upstream-noha.yaml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 config/deploy/os-odl-pike_upstream-noha.yaml (limited to 'config/deploy/os-odl-pike_upstream-noha.yaml') diff --git a/config/deploy/os-odl-pike_upstream-noha.yaml b/config/deploy/os-odl-pike_upstream-noha.yaml deleted file mode 100644 index 3fe1c734..00000000 --- a/config/deploy/os-odl-pike_upstream-noha.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -global_params: - ha_enabled: false -deploy_options: - containers: false - os_version: pike - sdn_controller: opendaylight - odl_version: carbon - tacker: false - congress: false - sfc: false - vpn: false -- cgit 1.2.3-korg