From 558dda1c790cbbc18bcdec5f6b5d30904a3e505c Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Sun, 24 Jun 2018 20:41:14 -0400 Subject: [PATCH] Add NODEPOOL_MARIADB_PROXY and drop NODEPOOL_MARIADB_MIRROR The mirror was having issues and it only was mirorring Ubuntu, with the proxy, it will be caching all of the different architectures and operating systems. Depends-On: I30bd6b658d87abc765b5caee5003e387981850b4 Change-Id: I435b006abe434361014ad8cdc8093e6863c7a109 --- roles/mirror-info/templates/mirror_info.sh.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/mirror-info/templates/mirror_info.sh.j2 b/roles/mirror-info/templates/mirror_info.sh.j2 index 6fe88053..e87cfd90 100644 --- a/roles/mirror-info/templates/mirror_info.sh.j2 +++ b/roles/mirror-info/templates/mirror_info.sh.j2 @@ -58,7 +58,6 @@ export NODEPOOL_FEDORA_MIRROR=${NODEPOOL_FEDORA_MIRROR:-http://$NODEPOOL_MIRROR_ export NODEPOOL_OPENSUSE_MIRROR=${NODEPOOL_OPENSUSE_MIRROR:-http://$NODEPOOL_MIRROR_HOST/opensuse} export NODEPOOL_CEPH_MIRROR=${NODEPOOL_CEPH_MIRROR:-http://$NODEPOOL_MIRROR_HOST/ceph-deb-hammer} export NODEPOOL_UCA_MIRROR=${NODEPOOL_UCA_MIRROR:-http://$NODEPOOL_MIRROR_HOST/ubuntu-cloud-archive} -export NODEPOOL_MARIADB_MIRROR=${NODEPOOL_MARIADB_MIRROR:-http://$NODEPOOL_MIRROR_HOST/ubuntu-mariadb} # Reverse proxy servers export NODEPOOL_BUILDLOGS_CENTOS_PROXY=${NODEPOOL_BUILDLOGS_CENTOS_PROXY:-http://$NODEPOOL_MIRROR_HOST:8080/buildlogs.centos} export NODEPOOL_DOCKER_REGISTRY_PROXY=${NODEPOOL_DOCKER_REGISTRY_PROXY:-http://$NODEPOOL_MIRROR_HOST:8081/registry-1.docker/} @@ -67,7 +66,8 @@ export NODEPOOL_RUGYGEMS_PROXY=${NODEPOOL_RUBYGEMS_PROXY:-http://$NODEPOOL_MIRRO export NODEPOOL_NPM_REGISTRY_PROXY=${NODEPOOL_NPM_REGISTRY_PROXY:-http://$NODEPOOL_MIRROR_HOST:8080/registry.npmjs} export NODEPOOL_TARBALLS_PROXY=${NODEPOOL_TARBALLS_PROXY:-http://$NODEPOOL_MIRROR_HOST:8080/tarballs} -# NOTE(mnaser): The following two proxies are consumed by OpenStack Ansible. They do not contain `http://` because we +# NOTE(mnaser): The following three proxies are consumed by OpenStack Ansible. They do not contain `http://` because we # can only override hosts, not the entire base URL. export NODEPOOL_LXC_IMAGE_PROXY=${NODEPOOL_LXC_IMAGE_PROXY:-$NODEPOOL_MIRROR_HOST:8080/images.linuxcontainers} -export NODEPOOL_PERCONA_PROXY=${NODEPOOL_PERCONA_PROXY:-$NODEPOOL_MIRROR_HOST:8080/percona} \ No newline at end of file +export NODEPOOL_PERCONA_PROXY=${NODEPOOL_PERCONA_PROXY:-$NODEPOOL_MIRROR_HOST:8080/percona} +export NODEPOOL_MARIADB_PROXY=${NODEPOOL_MARIADB_PROXY:-$NODEPOOL_MIRROR_HOST:8080/mariadb}