openstack/openstack-ansible
Code Issues Proposed changes

Revert "Add LXC and PIP mirrors"

Browse Source 
This reverts commit f55c977161a40695703095d8f156984ea74e02d9.

1. lxc_reverse_proxy as a variable is only used in role tests, not the
   integrated build. The integrated build sets it differently [a] and
   already uses the reverse proxy when appropriate [b].

2. pip_default_index in the integrated build uses the repo container
   and should not be overridden. The repo build process makes use of
   the repo_build_default_pip_index which is already set to use the
   infra mirrors [c].

3. pip_wheel_mirror as a variable is only used in role tests, not the
   integrated build. The integrated build makes use of the repo
   container instead, and uses the wheel mirror during the repo build
   process [d][e].

[a] 32aa425076/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 (L153-L157)
[b] 2696a5186b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml (L106-L114)
[c] 2696a5186b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml (L89)
[d] 2696a5186b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml (L95-L104)
[e] 32aa425076/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 (L183-L187)

Change-Id: I817fcc534a040bdfe7aee52eb4ad00620b386aeb
This commit is contained in:
Jesse Pretorius (odyssey4me) 2018-06-26 12:22:46 +00:00
parent f55c977161
commit cf01f788c5
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
View File

@ -74,12 +74,9 @@
shell: |
source /etc/ci/mirror_info.sh
NODEPOOL_OVERRIDES="/etc/openstack_deploy/user_openstackci.yml"
echo "lxc_reverse_proxy: '${NODEPOOL_MIRROR_HOST}'" >> ${NODEPOOL_OVERRIDES}
echo "uca_apt_repo_url: '${NODEPOOL_UCA_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
echo "openstack_hosts_centos_mirror_url: '${NODEPOOL_CENTOS_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
echo "opensuse_mirror: '${NODEPOOL_OPENSUSE_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
echo "pip_default_index: '${NODEPOOL_PYPI_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
echo "pip_wheel_mirror: '${NODEPOOL_WHEEL_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
echo "centos_epel_mirror: '${NODEPOOL_EPEL_MIRROR}'" >> ${NODEPOOL_OVERRIDES}
echo "galera_percona_xtrabackup_repo_host: '${NODEPOOL_PERCONA_PROXY}'" >> ${NODEPOOL_OVERRIDES}
echo "openstack_hosts_rdo_mirror_url: '${NODEPOOL_RDO_PROXY}'" >> ${NODEPOOL_OVERRIDES}