summaryrefslogtreecommitdiffstats
path: root/apex/common/constants.py
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2019-04-26 17:43:34 -0400
committerTim Rozet <trozet@redhat.com>2019-04-30 15:03:25 -0400
commit237dc19886b4ae03c42f584999d1dff466b6c6da (patch)
tree394183b35f7bf2f648a5d72142c449198e86efbe /apex/common/constants.py
parent8f294ab694a95e60abb29af6f1ef560ae365d436 (diff)
Updates scenario files for hunter branch
Removes dependency on python2-networking-sfc Change-Id: I56d0df5810c04da59532b03a1b586db82a3aa0d7 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/common/constants.py')
-rw-r--r--apex/common/constants.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/apex/common/constants.py b/apex/common/constants.py
index 59988f74..01cb2b7b 100644
--- a/apex/common/constants.py
+++ b/apex/common/constants.py
@@ -41,7 +41,7 @@ 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')
-DEFAULT_OS_VERSION = 'master'
+DEFAULT_OS_VERSION = 'rocky'
DEFAULT_ODL_VERSION = 'oxygen'
VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'fluorine',
'neon', 'master']
@@ -51,8 +51,8 @@ DEBUG_OVERCLOUD_PW = 'opnfvapex'
NET_ENV_FILE = 'network-environment.yaml'
DEPLOY_TIMEOUT = 120
RDO_TAG = 'current-tripleo'
-UPSTREAM_RDO = "https://images.rdoproject.org/master/rdo_trunk/{}/".format(
- RDO_TAG)
+UPSTREAM_RDO = "https://images.rdoproject.org/{}/rdo_trunk/{}/".format(
+ DEFAULT_OS_VERSION, RDO_TAG)
OPENSTACK_GERRIT = 'https://review.opendev.org'
DOCKER_TAG = RDO_TAG