Upversion Armada SHA to be a newer image

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>

kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data

@@ -1,3 +1,3 @@
 SRC_DIR="stx-openstack-helm"
 COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd $PKG_BASE/../../../helm-charts/ceph-pools-audit"
-TIS_PATCH_VER=9
+TIS_PATCH_VER=10

kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml

@@ -643,6 +643,10 @@ data:
   chart_name: libvirt
   release: openstack-libvirt
   namespace: openstack
+  wait:
+    timeout: 1800
+    labels:
+      release_group: osh-openstack-libvirt
   install:
     no_hooks: false
   upgrade:
@@ -673,11 +677,10 @@ data:
   release: openstack-openvswitch
   namespace: openstack
   # If we deploy ovs-dpdk on the host, ovs pod will not be created.
-  # We can use "native wait" instead. But it's not supported in current armada version.
-  # Before we upgrade armada to new version, we comment the wait
-  # https://github.com/openstack/airship-armada/blob/master/armada/schemas/armada-chart-schema.yaml#L81-L111
-  #wait:
-  #  timeout: 1800
+  wait:
+    timeout: 1800
+    labels:
+      release_group: osh-openstack-openvswitch
   install:
     no_hooks: false
   upgrade:
@@ -708,6 +711,10 @@ data:
   chart_name: nova
   release: openstack-nova
   namespace: openstack
+  wait:
+    timeout: 1800
+    labels:
+      release_group: osh-openstack-nova
   test:
     enabled: false
   install:
@@ -998,6 +1005,10 @@ data:
   chart_name: neutron
   release: openstack-neutron
   namespace: openstack
+  wait:
+    timeout: 1800
+    labels:
+      release_group: osh-openstack-neutron
   test:
     enabled: false
   install:

playbookconfig/playbookconfig/playbooks/bootstrap/roles/bringup-essential-services/vars/main.yml

@@ -1,6 +1,6 @@
 ---
 tiller_img: gcr.io/kubernetes-helm/tiller:v2.13.1
-armada_img: quay.io/airshipit/armada:f807c3a1ec727c883c772ffc618f084d960ed5c9
+armada_img: quay.io/airshipit/armada:af8a9ffd0873c2fbc915794e235dbd357f2adab1
 source_helm_repo: /opt/cgcs/helm_charts
 target_helm_repo: /www/pages/helm_charts
 kube_admin_yaml_template: /usr/share/puppet/modules/platform/templates/kubeadm.yaml.erb

puppet-manifests/centos/build_srpm.data

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

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

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

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

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

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

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

sysinv/sysinv/centos/build_srpm.data

@@ -1,2 +1,2 @@
 SRC_DIR="sysinv"
-TIS_PATCH_VER=310
+TIS_PATCH_VER=311

sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py

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