From 7b84f9c57fd9cc8fed2a5fdda1553230c6ed2823 Mon Sep 17 00:00:00 2001 From: Jerry Sun Date: Fri, 21 Jun 2019 09:51:58 -0400 Subject: [PATCH] Upversion armada image Upversion armada image from existing af8a9ffd0873c2fbc915794e235dbd357f2adab1 to dd2e56c473549fd16f94212b553ed58c48d1f51b-ubuntu_bionic The specific image was chosen because it contained upstream armada commit df68a90e057c2e1e3427d6b8497b437c8a4c3b7e, which is a fix for keystone kubernetes auth. The ubuntu bionic image was chosen because the old image was an ubuntu bionic based image. Testing done by applying stx-openstack on standard, simplex, and duplex systems. Depends-On: https://review.opendev.org/#/c/666839 Story: 2005860 Task: 33693 Change-Id: Ie759c863c51cca1b48935d9fa9f8b8ac4b56b620 Signed-off-by: Jerry Sun --- playbookconfig/centos/build_srpm.data | 2 +- .../bootstrap/roles/bringup-essential-services/vars/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbookconfig/centos/build_srpm.data b/playbookconfig/centos/build_srpm.data index 24a1597f1..a9e6da284 100644 --- a/playbookconfig/centos/build_srpm.data +++ b/playbookconfig/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="playbookconfig" -TIS_PATCH_VER=2 +TIS_PATCH_VER=3 diff --git a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/vars/main.yml b/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/vars/main.yml index 08615f17d..898e3a0a9 100644 --- a/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/vars/main.yml +++ b/playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/vars/main.yml @@ -1,6 +1,6 @@ --- tiller_img: gcr.io/kubernetes-helm/tiller:v2.13.1 -armada_img: quay.io/airshipit/armada:af8a9ffd0873c2fbc915794e235dbd357f2adab1 +armada_img: quay.io/airshipit/armada:dd2e56c473549fd16f94212b553ed58c48d1f51b-ubuntu_bionic source_helm_bind_dir: /opt/cgcs/helm_charts target_helm_bind_dir: /www/pages/helm_charts helm_repo_name_apps: starlingx