Browse Source

Fix rabbitmq and pin CLIs to match versions.yaml

Change-Id: I53e5bdbf5db0ae950912847367c1f3e7520ee8e8
Kaspars Skels 2 months ago
parent
commit
5613857ade

+ 1
- 1
deployment_files/global/v1.0demo/software/config/versions.yaml View File

@@ -530,7 +530,7 @@ data:
530 530
         memcached: docker.io/memcached:1.5.5
531 531
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
532 532
       rabbitmq:
533
-        rabbitmq: docker.io/rabbitmq:3.7
533
+        rabbitmq: docker.io/rabbitmq:3.7.4
534 534
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
535 535
     #TODO Update to split ceph charts
536 536
     ceph:

+ 1
- 1
deployment_files/global/v1.0dev/software/config/versions.yaml View File

@@ -379,7 +379,7 @@ data:
379 379
         memcached: docker.io/memcached:1.5.5
380 380
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
381 381
       rabbitmq:
382
-        rabbitmq: docker.io/rabbitmq:3.7
382
+        rabbitmq: docker.io/rabbitmq:3.7.4
383 383
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
384 384
     #TODO Update to split ceph charts
385 385
     ceph:

+ 4
- 4
tools/multi_nodes_gate/airship_gate/lib/config.sh View File

@@ -6,18 +6,18 @@ export SCRIPT_DEPOT="${TEMP_DIR}/scripts/"
6 6
 export GENESIS_WORK_DIR=${GENESIS_WORK_DIR:-/work}
7 7
 export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736}
8 8
 export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img}
9
-export IMAGE_PROMENADE_CLI=${IMAGE_PROMENADE_CLI:-quay.io/airshipit/promenade:master}
9
+export IMAGE_PROMENADE_CLI=${IMAGE_PROMENADE_CLI:-quay.io/airshipit/promenade:cfb8aa498c294c2adbc369ba5aaee19b49550d22}
10 10
 export IMAGE_PEGLEG_CLI=${IMAGE_PEGLEG_CLI:-quay.io/airshipit/pegleg:ac6297eae6c51ab2f13a96978abaaa10cb46e3d6}
11
-export IMAGE_SHIPYARD_CLI=${IMAGE_SHIPYARD_CLI:-quay.io/airshipit/shipyard:master}
11
+export IMAGE_SHIPYARD_CLI=${IMAGE_SHIPYARD_CLI:-quay.io/airshipit/shipyard:4dd6b484d11e86ad51da733841b9ef137421d461}
12 12
 export IMAGE_COREDNS=${IMAGE_COREDNS:-docker.io/coredns/coredns:1.2.2}
13
-export IMAGE_DRYDOCK_CLI=${IMAGE_DRYDOCK_CLI:-quay.io/airshipit/drydock:master}
13
+export IMAGE_DRYDOCK_CLI=${IMAGE_DRYDOCK_CLI:-quay.io/airshipit/drydock:d93d6d5a0a370ced536180612d1ade708e29cd47}
14 14
 export PROMENADE_DEBUG=${PROMENADE_DEBUG:-0}
15 15
 export SHIPYARD_PASSWORD=${SHIPYARD_OS_PASSWORD:-password18}
16 16
 export REGISTRY_DATA_DIR=${REGISTRY_DATA_DIR:-/mnt/registry}
17 17
 export VIRSH_POOL=${VIRSH_POOL:-airship}
18 18
 export VIRSH_POOL_PATH=${VIRSH_POOL_PATH:-/var/lib/libvirt/airship}
19 19
 export VIRSH_CPU_OPTS=${VIRSH_CPU_OPTS:-host}
20
-export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8 208.67.220.220"}
20
+export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8 8.8.4.4"}
21 21
 
22 22
 config_vm_memory() {
23 23
     nodename=${1}

Loading…
Cancel
Save