X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=apex%2Fcommon%2Fconstants.py;h=59988f74fa0569f732d0492dcf43f172e79064ae;hb=refs%2Fheads%2Fmaster;hp=bd8ffdbbf333aade8abc79e101fa0435271791d7;hpb=a16953172cca0026496ab2002f23e8ed1b709c5d;p=apex.git diff --git a/apex/common/constants.py b/apex/common/constants.py index bd8ffdbb..59988f74 100644 --- a/apex/common/constants.py +++ b/apex/common/constants.py @@ -43,17 +43,19 @@ 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'] +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 = 120 -UPSTREAM_RDO = 'https://images.rdoproject.org/master/rdo_trunk/current' \ - '-tripleo-rdo/' -OPENSTACK_GERRIT = 'https://review.openstack.org' +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 = { @@ -66,8 +68,10 @@ VALID_DOCKER_SERVICES = { } 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://artifacts.opnfv.org' +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)