X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=apex%2Fcommon%2Fconstants.py;h=e0afbc0aa7fefd75b6d124fb72b116fccce483f9;hb=859fb4703b3f0359e80b35aaa62a94e752707bae;hp=4f72b0829cd2535a74f8e94937211b914b49f4a7;hpb=382fa452e0c9a8189911f615416e1b24badaf5e4;p=apex.git

diff --git a/apex/common/constants.py b/apex/common/constants.py
index 4f72b082..e0afbc0a 100644
--- a/apex/common/constants.py
+++ b/apex/common/constants.py
@@ -39,20 +39,18 @@ 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 = os.path.join(THT_ENV_DIR, 'services')
 
-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',
-                    'master': 'luminous'}
 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/pike/delorean/current-tripleo/'
+DEPLOY_TIMEOUT = 120
+UPSTREAM_RDO = 'https://images.rdoproject.org/master/rdo_trunk/current' \
+               '-tripleo-rdo/'
 OPENSTACK_GERRIT = 'https://review.openstack.org'
 
 DOCKER_TAG = 'current-tripleo-rdo'
@@ -62,7 +60,18 @@ 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'
-                 '/tripleoupstream/?page_size=1024')
+DOCKERHUB_OOO = 'https://registry.hub.docker.com/v2/repositories' \
+                '/tripleomaster/'
+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"