Code Review
/
apex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Migrates master to use direct upstream
[apex.git]
/
apex
/
common
/
constants.py
diff --git
a/apex/common/constants.py
b/apex/common/constants.py
index
4f72b08
..
7ccfcd8
100644
(file)
--- 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_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 = '
nitro
gen'
+DEFAULT_OS_VERSION = '
master
'
+DEFAULT_ODL_VERSION = '
oxy
gen'
VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'master']
CEPH_VERSION_MAP = {'pike': 'jewel',
'queens': 'luminous',
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
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'
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'
'neutron-ml2-ovn.yaml': 'neutron-ovn.yaml'
}
DOCKERHUB_OOO = ('https://registry.hub.docker.com/v2/repositories'
- '/tripleo
upstream
/?page_size=1024')
+ '/tripleo
master
/?page_size=1024')