X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=apex%2Fcommon%2Fconstants.py;h=59988f74fa0569f732d0492dcf43f172e79064ae;hb=refs%2Fheads%2Fmaster;hp=89c3e6e1a42abcd6732fe828f8f7f6dad8045727;hpb=f07870e4a3933cc7e78e6dc6457724bb49cad4f8;p=apex.git

diff --git a/apex/common/constants.py b/apex/common/constants.py
index 89c3e6e1..59988f74 100644
--- a/apex/common/constants.py
+++ b/apex/common/constants.py
@@ -39,34 +39,43 @@ 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 = {
-    'master': os.path.join(THT_ENV_DIR, 'services'),
-    'queens': os.path.join(THT_ENV_DIR, 'services-docker')
-}
+THT_DOCKER_ENV_DIR = os.path.join(THT_ENV_DIR, 'services')
 
 DEFAULT_OS_VERSION = 'master'
 DEFAULT_ODL_VERSION = 'oxygen'
-VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'master']
-CEPH_VERSION_MAP = {'pike': 'jewel',
-                    'queens': 'luminous',
-                    'master': 'luminous'}
+VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'fluorine',
+                      'neon', 'master']
 PUPPET_ODL_URL = 'https://git.opendaylight.org/gerrit/integration/packaging' \
                  '/puppet-opendaylight'
 DEBUG_OVERCLOUD_PW = 'opnfvapex'
 NET_ENV_FILE = 'network-environment.yaml'
-DEPLOY_TIMEOUT = 90
-UPSTREAM_RDO = 'https://images.rdoproject.org/master/delorean/current' \
-               '-tripleo-rdo/'
-OPENSTACK_GERRIT = 'https://review.openstack.org'
+DEPLOY_TIMEOUT = 120
+RDO_TAG = 'current-tripleo'
+UPSTREAM_RDO = "https://images.rdoproject.org/master/rdo_trunk/{}/".format(
+    RDO_TAG)
+OPENSTACK_GERRIT = 'https://review.opendev.org'
 
-DOCKER_TAG = 'current-tripleo-rdo'
+DOCKER_TAG = RDO_TAG
 # Maps regular service files to docker versions
 # None value means mapping is same as key
 VALID_DOCKER_SERVICES = {
     'neutron-opendaylight.yaml': None,
     'neutron-opendaylight-dpdk.yaml': None,
     'neutron-opendaylight-sriov.yaml': None,
-    'neutron-ml2-ovn.yaml': 'neutron-ovn.yaml'
+    'neutron-bgpvpn-opendaylight.yaml': None,
+    'neutron-sfc-opendaylight.yaml': None,
+    'neutron-ml2-ovn.yaml': 'neutron-ovn-ha.yaml'
 }
 DOCKERHUB_OOO = 'https://registry.hub.docker.com/v2/repositories' \
                 '/tripleomaster/'
+DOCKERHUB_AARCH64 = 'https://registry.hub.docker.com/v2/repositories' \
+                    '/armbandapex/'
+KUBESPRAY_URL = 'https://github.com/kubernetes-incubator/kubespray.git'
+OPNFV_ARTIFACTS = 'http://storage.googleapis.com/artifacts.opnfv.org'
+CUSTOM_OVS = '{}/apex/random/openvswitch-2.9.0-9.el7fdn.x86_64.' \
+             'rpm'.format(OPNFV_ARTIFACTS)
+
+OVS_URL = "http://openvswitch.org/releases/openvswitch-2.9.2.tar.gz"
+QUAGGA_URL = "{}/sdnvpn/quagga/quagga-4.tar.gz".format(OPNFV_ARTIFACTS)
+CALIPSO_INSTALLER_URL = "https://raw.githubusercontent.com/opnfv/calipso" \
+                        "/master/app/install/calipso-installer.py"