Merge "[Victoria Only] Switch to RDO victoria" into stable/victoria
This commit is contained in:
commit
6d0d320cf8
@ -18,10 +18,10 @@ OS_NAME_VERS=${REDHAT_SUPPORT_PRODUCT}${REDHAT_SUPPORT_PRODUCT_VERSION}
|
|||||||
|
|
||||||
# Write out facts to the facter folder when we generate them.
|
# Write out facts to the facter folder when we generate them.
|
||||||
export WRITE_FACTS=${WRITE_FACTS:-true}
|
export WRITE_FACTS=${WRITE_FACTS:-true}
|
||||||
export DLRN_BASE=${DLRN_BASE:-${OS_NAME_VERS}-master/puppet-passed-ci}
|
export DLRN_BASE=${DLRN_BASE:-${OS_NAME_VERS}-victoria/puppet-passed-ci}
|
||||||
export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-master/deps/latest/}
|
export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-victoria/deps/latest/}
|
||||||
export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-master/puppet-passed-ci/delorean.repo}
|
export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-victoria/puppet-passed-ci/delorean.repo}
|
||||||
export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-master/delorean-deps.repo}
|
export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-victoria/delorean-deps.repo}
|
||||||
export CEPH_VERSION=${CEPH_VERSION:-nautilus}
|
export CEPH_VERSION=${CEPH_VERSION:-nautilus}
|
||||||
|
|
||||||
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
|
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
|
||||||
|
@ -57,8 +57,8 @@ class openstack_integration::repos {
|
|||||||
manage_epel => false,
|
manage_epel => false,
|
||||||
centos_mirror_url => $centos_mirror,
|
centos_mirror_url => $centos_mirror,
|
||||||
repo_source_hash => {
|
repo_source_hash => {
|
||||||
'delorean.repo' => "https://trunk.rdoproject.org/centos${::os['release']['major']}-master/puppet-passed-ci/delorean.repo",
|
'delorean.repo' => "https://trunk.rdoproject.org/centos${::os['release']['major']}-victoria/puppet-passed-ci/delorean.repo",
|
||||||
'delorean-deps.repo' => "https://trunk.rdoproject.org/centos${::os['release']['major']}-master/delorean-deps.repo"
|
'delorean-deps.repo' => "https://trunk.rdoproject.org/centos${::os['release']['major']}-victoria/delorean-deps.repo"
|
||||||
},
|
},
|
||||||
repo_replace => false,
|
repo_replace => false,
|
||||||
update_packages => true,
|
update_packages => true,
|
||||||
|
Loading…
Reference in New Issue
Block a user