summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hussey <sh8121@att.com>2019-01-28 09:23:12 -0600
committerEvgeniy L <eli@mirantis.com>2019-03-12 21:22:51 +0000
commitda681cac7886883b563a8382693e738c94812cd5 (patch)
treea207969cf89bc249a1a370861e34ec38709074ed
parent919b44788663a29ec402a793a7a779e0d1866e06 (diff)
Cache registry image source config
- Allow the source for the cache registry image be tunable by env params. Change-Id: I9cd973317071f24bf820a79fa3b1ac87ea301e19
Notes
Notes (review): Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Code-Review+1: Drew Walters <drewwalters96@gmail.com> Code-Review+2: Evgeniy L <eli@mirantis.com> Workflow+1: Evgeniy L <eli@mirantis.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 12 Mar 2019 21:41:16 +0000 Reviewed-on: https://review.openstack.org/633525 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--tools/multi_nodes_gate/airship_gate/lib/config.sh1
-rw-r--r--tools/multi_nodes_gate/airship_gate/lib/registry.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/multi_nodes_gate/airship_gate/lib/config.sh b/tools/multi_nodes_gate/airship_gate/lib/config.sh
index b9da6c4..7879687 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/config.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/config.sh
@@ -11,6 +11,7 @@ export IMAGE_PEGLEG_CLI=${IMAGE_PEGLEG_CLI:-quay.io/airshipit/pegleg:50ce7a02e08
11export IMAGE_SHIPYARD_CLI=${IMAGE_SHIPYARD_CLI:-quay.io/airshipit/shipyard:4dd6b484d11e86ad51da733841b9ef137421d461} 11export IMAGE_SHIPYARD_CLI=${IMAGE_SHIPYARD_CLI:-quay.io/airshipit/shipyard:4dd6b484d11e86ad51da733841b9ef137421d461}
12export IMAGE_COREDNS=${IMAGE_COREDNS:-docker.io/coredns/coredns:1.2.2} 12export IMAGE_COREDNS=${IMAGE_COREDNS:-docker.io/coredns/coredns:1.2.2}
13export IMAGE_DRYDOCK_CLI=${IMAGE_DRYDOCK_CLI:-quay.io/airshipit/drydock:d93d6d5a0a370ced536180612d1ade708e29cd47} 13export IMAGE_DRYDOCK_CLI=${IMAGE_DRYDOCK_CLI:-quay.io/airshipit/drydock:d93d6d5a0a370ced536180612d1ade708e29cd47}
14export IMAGE_DOCKER_REGISTRY=${IMAGE_DOCKER_REGISTRY:-"docker.io/registry:2"}
14export PROMENADE_DEBUG=${PROMENADE_DEBUG:-0} 15export PROMENADE_DEBUG=${PROMENADE_DEBUG:-0}
15export REGISTRY_DATA_DIR=${REGISTRY_DATA_DIR:-/mnt/registry} 16export REGISTRY_DATA_DIR=${REGISTRY_DATA_DIR:-/mnt/registry}
16export VIRSH_POOL=${VIRSH_POOL:-airship} 17export VIRSH_POOL=${VIRSH_POOL:-airship}
diff --git a/tools/multi_nodes_gate/airship_gate/lib/registry.sh b/tools/multi_nodes_gate/airship_gate/lib/registry.sh
index 4fb69bb..2f6bb1c 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/registry.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/registry.sh
@@ -69,6 +69,6 @@ registry_up() {
69 --restart=always \ 69 --restart=always \
70 --name registry \ 70 --name registry \
71 -v "${REGISTRY_DATA_DIR}:/var/lib/registry" \ 71 -v "${REGISTRY_DATA_DIR}:/var/lib/registry" \
72 registry:2 &>> "${LOG_FILE}" 72 "${IMAGE_DOCKER_REGISTRY}" &>> "${LOG_FILE}"
73 fi 73 fi
74} 74}