Merge "Update OVB containers job to use infra docker proxy"

This commit is contained in:
Jenkins 2017-04-19 17:22:09 +00:00 committed by Gerrit Code Review
commit c7b8618603
2 changed files with 2 additions and 0 deletions

View File

@ -1,6 +1,7 @@
containerized_overcloud: true
ssl_overcloud: false
undercloud_generate_service_certificate: true
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
step_introspect: true
# Network settings

View File

@ -4,6 +4,7 @@ export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
# Mirrors
# NOTE(pabelanger): We have access to AFS mirrors, lets use them.
source /etc/nodepool/provider
source /etc/ci/mirror_info.sh
source $(dirname $0)/scripts/common_vars.bash
NODEPOOL_MIRROR_HOST=${NODEPOOL_MIRROR_HOST:-mirror.$NODEPOOL_REGION.$NODEPOOL_CLOUD.openstack.org}