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.

Story: 2005860
Task: 33693

Change-Id: Ifd8a66d46e2dfd47ca7c5ab9807076ef43e67027
Signed-off-by: Jerry Sun <jerry.sun@windriver.com>
This commit is contained in:
Jerry Sun 2019-06-21 09:47:40 -04:00
parent 70609a3d55
commit 4809c9f489
6 changed files with 6 additions and 6 deletions

View File

@ -1,2 +1,2 @@
SRC_DIR="src"
TIS_PATCH_VER=89
TIS_PATCH_VER=90

View File

@ -117,7 +117,7 @@ class platform::helm
# TODO(tngo): If and when tiller image is upversioned, please ensure armada compatibility as part of the test
-> exec { 'load armada docker image':
command => "docker image pull ${quay_registry}/airshipit/armada:af8a9ffd0873c2fbc915794e235dbd357f2adab1",
command => "docker image pull ${quay_registry}/airshipit/armada:dd2e56c473549fd16f94212b553ed58c48d1f51b-ubuntu_bionic",
logoutput => true,
}

View File

@ -1,2 +1,2 @@
SRC_DIR="src"
TIS_PATCH_VER=5
TIS_PATCH_VER=6

View File

@ -224,7 +224,7 @@ class sysinv (
$quay_registry = 'quay.io'
}
$armada_img_tag = "${quay_registry}/airshipit/armada:af8a9ffd0873c2fbc915794e235dbd357f2adab1"
$armada_img_tag = "${quay_registry}/airshipit/armada:dd2e56c473549fd16f94212b553ed58c48d1f51b-ubuntu_bionic"
sysinv_config {
'DEFAULT/armada_image_tag': value => $armada_img_tag;
}

View File

@ -1,2 +1,2 @@
SRC_DIR="sysinv"
TIS_PATCH_VER=323
TIS_PATCH_VER=324

View File

@ -45,7 +45,7 @@ LOG = logging.getLogger(__name__)
kube_app_opts = [
cfg.StrOpt('armada_image_tag',
default=('quay.io/airshipit/armada:'
'af8a9ffd0873c2fbc915794e235dbd357f2adab1'),
'dd2e56c473549fd16f94212b553ed58c48d1f51b-ubuntu_bionic'),
help='Docker image tag of Armada.'),
]
CONF = cfg.CONF