X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=apex%2Fcommon%2Fconstants.py;h=5a2b7f98e84673eb6942ef3d5a03aba2166c989c;hb=df388a8afedc29f9cfebdab3cc39ef27f93d9612;hp=138166f0888c55ec27d6c61dd643b7bc779f2704;hpb=c4b66d46770847e9090a06c4c2ec3e8266606282;p=apex.git

diff --git a/apex/common/constants.py b/apex/common/constants.py
index 138166f0..5a2b7f98 100644
--- a/apex/common/constants.py
+++ b/apex/common/constants.py
@@ -39,10 +39,7 @@ 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')
-}
+THT_DOCKER_ENV_DIR = os.path.join(THT_ENV_DIR, 'services')
 
 DEFAULT_OS_VERSION = 'master'
 DEFAULT_ODL_VERSION = 'oxygen'
@@ -51,7 +48,7 @@ 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
+DEPLOY_TIMEOUT = 120
 UPSTREAM_RDO = 'https://images.rdoproject.org/master/delorean/current' \
                '-tripleo-rdo/'
 OPENSTACK_GERRIT = 'https://review.openstack.org'
@@ -64,12 +61,17 @@ VALID_DOCKER_SERVICES = {
     'neutron-opendaylight-dpdk.yaml': None,
     'neutron-opendaylight-sriov.yaml': None,
     'neutron-bgpvpn-opendaylight.yaml': None,
-    'neutron-ml2-ovn.yaml': 'neutron-ovn.yaml'
+    'neutron-sfc-opendaylight.yaml': None,
+    'neutron-ml2-ovn.yaml': 'neutron-ovn-ha.yaml'
 }
 DOCKERHUB_OOO = 'https://registry.hub.docker.com/v2/repositories' \
                 '/tripleomaster/'
 KUBESPRAY_URL = 'https://github.com/kubernetes-incubator/kubespray.git'
-CUSTOM_OVS = 'http://artifacts.opnfv.org/apex/random/openvswitch-2.9.0-9' \
-             '.el7fdn.x86_64.rpm'
+OPNFV_ARTIFACTS = 'http://artifacts.opnfv.org'
+CUSTOM_OVS = '{}/apex/random/openvswitch-2.9.0-9.el7fdn.x86_64.' \
+             'rpm'.format(OPNFV_ARTIFACTS)
 
-QUAGGA_URL = "http://artifacts.opnfv.org/sdnvpn/quagga/quagga-4.tar.gz"
+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"