starlingx
/
config
Code Issues Proposed changes

Rebase Armada to latest master 

Rebasing Armada to use the latest docker image tag
8a1638098f88d92bf799ef4934abe569789b885e-ubuntu_bionic.

Change-Id: Ic48a2e053d0de7dacfd6a07d817947e11dc8d596
Story: 2006347
Task: 36105
Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
Robert Church 2019-08-14 00:00:52 -04:00
parent 7fb5fbfd75
commit 38abbef079
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet-manifests/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
SRC_DIR="src"
TIS_PATCH_VER=92
TIS_PATCH_VER=93

2
puppet-manifests/src/modules/platform/manifests/helm.pp
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:dd2e56c473549fd16f94212b553ed58c48d1f51b-ubuntu_bionic",
command => "docker image pull ${quay_registry}/airshipit/armada:8a1638098f88d92bf799ef4934abe569789b885e-ubuntu_bionic",
logoutput => true,
}

2
puppet-modules-wrs/puppet-sysinv/centos/build_srpm.data
View File

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

2
puppet-modules-wrs/puppet-sysinv/src/sysinv/manifests/init.pp
View File

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

2
sysinv/sysinv/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
SRC_DIR="sysinv"
TIS_PATCH_VER=330
TIS_PATCH_VER=331

2
sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py
View File

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