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 --- apex/common/constants.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'apex/common') diff --git a/apex/common/constants.py b/apex/common/constants.py index 4f72b082..7ccfcd81 100644 --- a/apex/common/constants.py +++ b/apex/common/constants.py @@ -39,10 +39,13 @@ VIRT_PW = '--root-password' THT_DIR = '/usr/share/openstack-tripleo-heat-templates' THT_ENV_DIR = os.path.join(THT_DIR, 'environments') -THT_DOCKER_ENV_DIR = os.path.join(THT_ENV_DIR, 'services-docker') +THT_DOCKER_ENV_DIR = { + 'master': os.path.join(THT_ENV_DIR, 'services'), + 'queens': os.path.join(THT_ENV_DIR, 'services-docker') +} -DEFAULT_OS_VERSION = 'pike' -DEFAULT_ODL_VERSION = 'nitrogen' +DEFAULT_OS_VERSION = 'master' +DEFAULT_ODL_VERSION = 'oxygen' VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'master'] CEPH_VERSION_MAP = {'pike': 'jewel', 'queens': 'luminous', @@ -52,7 +55,8 @@ PUPPET_ODL_URL = 'https://git.opendaylight.org/gerrit/integration/packaging' \ DEBUG_OVERCLOUD_PW = 'opnfvapex' NET_ENV_FILE = 'network-environment.yaml' DEPLOY_TIMEOUT = 90 -UPSTREAM_RDO = 'https://images.rdoproject.org/pike/delorean/current-tripleo/' +UPSTREAM_RDO = 'https://images.rdoproject.org/master/delorean/current' \ + '-tripleo-rdo/' OPENSTACK_GERRIT = 'https://review.openstack.org' DOCKER_TAG = 'current-tripleo-rdo' @@ -65,4 +69,4 @@ VALID_DOCKER_SERVICES = { 'neutron-ml2-ovn.yaml': 'neutron-ovn.yaml' } DOCKERHUB_OOO = ('https://registry.hub.docker.com/v2/repositories' - '/tripleoupstream/?page_size=1024') + '/tripleomaster/?page_size=1024') -- cgit 1.2.3-korg