starlingx/stx-puppet
Code Issues Proposed changes

Merge "Rebase Armada to latest master"

Browse Source
This commit is contained in:
Zuul 2019-08-19 15:12:31 +00:00 committed by Gerrit Code Review
commit af1d792ae2
4 changed files with 4 additions and 4 deletions
modules/puppet-sysinv
centos
build_srpm.data
src/sysinv/manifests
init.pp
puppet-manifests
centos
build_srpm.data
src/modules/platform/manifests
helm.pp

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

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

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

@ -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
puppet-manifests/centos/build_srpm.data

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

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

@ -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,
}