starlingx/stx-puppet
Code Issues Proposed changes

Upversion Armada SHA to be a newer image

Browse Source 
Using SHA: af8a9ffd0873c2fbc915794e235dbd357f2adab1
which was built and tagged on April 9, 2019.

The previous Armada SHA was from Sept 2018.

The manifest.xml is updated to not generate armada warnings
for libvirt, openvswitch, nova and neutron.
The warning was:
  "label_selector" not specified,
  waiting with no labels may cause unintended consequences.

Story: 2005198
Task: 30436
Change-Id: I97b633d9e6e1e4574e25dc8b69500faae4b4a809
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2019-04-09 15:53:11 -05:00
parent aea942ba67
commit 7d632d0541
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,
}