summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaspars Skels <kaspars.skels@gmail.com>2019-02-04 15:27:59 -0600
committerKaspars Skels <kaspars.skels@gmail.com>2019-02-04 16:07:03 -0600
commit5613857adebf4b063f4e01ceaaee17fb62e50e3d (patch)
tree72b7d361ce9faf49f736fa9d329453807d3203c6
parent9cd5654b48ba9d28771bec15a7df4d19bd4377dd (diff)
Fix rabbitmq and pin CLIs to match versions.yaml
Notes
Notes (review): Code-Review+2: Bryan Strassner <strassner.bryan@gmail.com> Code-Review+1: Ahmad Mahmoudi <am495p@att.com> Code-Review+2: Craig Anderson <craig.anderson@att.com> Workflow+1: Kaspars Skels <kaspars.skels@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 04 Feb 2019 23:20:31 +0000 Reviewed-on: https://review.openstack.org/634812 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--deployment_files/global/v1.0demo/software/config/versions.yaml2
-rw-r--r--deployment_files/global/v1.0dev/software/config/versions.yaml2
-rw-r--r--tools/multi_nodes_gate/airship_gate/lib/config.sh8
3 files changed, 6 insertions, 6 deletions
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index d8b3eb0..b635b75 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -530,7 +530,7 @@ data:
530 memcached: docker.io/memcached:1.5.5 530 memcached: docker.io/memcached:1.5.5
531 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 531 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
532 rabbitmq: 532 rabbitmq:
533 rabbitmq: docker.io/rabbitmq:3.7 533 rabbitmq: docker.io/rabbitmq:3.7.4
534 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 534 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
535 #TODO Update to split ceph charts 535 #TODO Update to split ceph charts
536 ceph: 536 ceph:
diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml
index e134eac..8be93b9 100644
--- a/deployment_files/global/v1.0dev/software/config/versions.yaml
+++ b/deployment_files/global/v1.0dev/software/config/versions.yaml
@@ -379,7 +379,7 @@ data:
379 memcached: docker.io/memcached:1.5.5 379 memcached: docker.io/memcached:1.5.5
380 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 380 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
381 rabbitmq: 381 rabbitmq:
382 rabbitmq: docker.io/rabbitmq:3.7 382 rabbitmq: docker.io/rabbitmq:3.7.4
383 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 383 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
384 #TODO Update to split ceph charts 384 #TODO Update to split ceph charts
385 ceph: 385 ceph:
diff --git a/tools/multi_nodes_gate/airship_gate/lib/config.sh b/tools/multi_nodes_gate/airship_gate/lib/config.sh
index d897cff..d42d064 100644
--- a/tools/multi_nodes_gate/airship_gate/lib/config.sh
+++ b/tools/multi_nodes_gate/airship_gate/lib/config.sh
@@ -6,18 +6,18 @@ export SCRIPT_DEPOT="${TEMP_DIR}/scripts/"
6export GENESIS_WORK_DIR=${GENESIS_WORK_DIR:-/work} 6export GENESIS_WORK_DIR=${GENESIS_WORK_DIR:-/work}
7export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736} 7export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736}
8export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img} 8export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/xenial/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img}
9export IMAGE_PROMENADE_CLI=${IMAGE_PROMENADE_CLI:-quay.io/airshipit/promenade:master} 9export IMAGE_PROMENADE_CLI=${IMAGE_PROMENADE_CLI:-quay.io/airshipit/promenade:cfb8aa498c294c2adbc369ba5aaee19b49550d22}
10export IMAGE_PEGLEG_CLI=${IMAGE_PEGLEG_CLI:-quay.io/airshipit/pegleg:ac6297eae6c51ab2f13a96978abaaa10cb46e3d6} 10export IMAGE_PEGLEG_CLI=${IMAGE_PEGLEG_CLI:-quay.io/airshipit/pegleg:ac6297eae6c51ab2f13a96978abaaa10cb46e3d6}
11export IMAGE_SHIPYARD_CLI=${IMAGE_SHIPYARD_CLI:-quay.io/airshipit/shipyard:master} 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:master} 13export IMAGE_DRYDOCK_CLI=${IMAGE_DRYDOCK_CLI:-quay.io/airshipit/drydock:d93d6d5a0a370ced536180612d1ade708e29cd47}
14export PROMENADE_DEBUG=${PROMENADE_DEBUG:-0} 14export PROMENADE_DEBUG=${PROMENADE_DEBUG:-0}
15export SHIPYARD_PASSWORD=${SHIPYARD_OS_PASSWORD:-password18} 15export SHIPYARD_PASSWORD=${SHIPYARD_OS_PASSWORD:-password18}
16export REGISTRY_DATA_DIR=${REGISTRY_DATA_DIR:-/mnt/registry} 16export REGISTRY_DATA_DIR=${REGISTRY_DATA_DIR:-/mnt/registry}
17export VIRSH_POOL=${VIRSH_POOL:-airship} 17export VIRSH_POOL=${VIRSH_POOL:-airship}
18export VIRSH_POOL_PATH=${VIRSH_POOL_PATH:-/var/lib/libvirt/airship} 18export VIRSH_POOL_PATH=${VIRSH_POOL_PATH:-/var/lib/libvirt/airship}
19export VIRSH_CPU_OPTS=${VIRSH_CPU_OPTS:-host} 19export VIRSH_CPU_OPTS=${VIRSH_CPU_OPTS:-host}
20export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8 208.67.220.220"} 20export UPSTREAM_DNS=${UPSTREAM_DNS:-"8.8.8.8 8.8.4.4"}
21 21
22config_vm_memory() { 22config_vm_memory() {
23 nodename=${1} 23 nodename=${1}