starlingx/stx-puppet
Code Issues Proposed changes

Merge "Upversion Armada SHA to be a newer image"

Browse Source
This commit is contained in:
Zuul 2019-04-12 15:32:36 +00:00 committed by Gerrit Code Review
commit 83990eb894
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -1,2 +1,2 @@
SRC_DIR="src"
TIS_PATCH_VER=84
TIS_PATCH_VER=85

2
puppet-manifests/src/modules/platform/manifests/helm.pp
View File

@ -47,7 +47,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:f807c3a1ec727c883c772ffc618f084d960ed5c9",
command => "docker image pull ${quay_registry}/airshipit/armada:af8a9ffd0873c2fbc915794e235dbd357f2adab1",
logoutput => true,
}