From 38abbef079c78ba4172b15290188d7c7116cf176 Mon Sep 17 00:00:00 2001
From: Robert Church <robert.church@windriver.com>
Date: Wed, 14 Aug 2019 00:00:52 -0400
Subject: [PATCH] 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>
---
 puppet-manifests/centos/build_srpm.data                       | 2 +-
 puppet-manifests/src/modules/platform/manifests/helm.pp       | 2 +-
 puppet-modules-wrs/puppet-sysinv/centos/build_srpm.data       | 2 +-
 puppet-modules-wrs/puppet-sysinv/src/sysinv/manifests/init.pp | 2 +-
 sysinv/sysinv/centos/build_srpm.data                          | 2 +-
 sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/puppet-manifests/centos/build_srpm.data b/puppet-manifests/centos/build_srpm.data
index 0ef430acec..0c2259f1ac 100644
--- a/puppet-manifests/centos/build_srpm.data
+++ b/puppet-manifests/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="src"
-TIS_PATCH_VER=92
+TIS_PATCH_VER=93
diff --git a/puppet-manifests/src/modules/platform/manifests/helm.pp b/puppet-manifests/src/modules/platform/manifests/helm.pp
index cf39b4aa85..c699d7391c 100644
--- a/puppet-manifests/src/modules/platform/manifests/helm.pp
+++ b/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,
       }
 
diff --git a/puppet-modules-wrs/puppet-sysinv/centos/build_srpm.data b/puppet-modules-wrs/puppet-sysinv/centos/build_srpm.data
index 2b82f98a7e..76e75eaa9f 100644
--- a/puppet-modules-wrs/puppet-sysinv/centos/build_srpm.data
+++ b/puppet-modules-wrs/puppet-sysinv/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="src"
-TIS_PATCH_VER=6
+TIS_PATCH_VER=7
diff --git a/puppet-modules-wrs/puppet-sysinv/src/sysinv/manifests/init.pp b/puppet-modules-wrs/puppet-sysinv/src/sysinv/manifests/init.pp
index a3990acffa..c6de412c33 100644
--- a/puppet-modules-wrs/puppet-sysinv/src/sysinv/manifests/init.pp
+++ b/puppet-modules-wrs/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;
     }
diff --git a/sysinv/sysinv/centos/build_srpm.data b/sysinv/sysinv/centos/build_srpm.data
index a3599bb3e7..c6050e4ee3 100644
--- a/sysinv/sysinv/centos/build_srpm.data
+++ b/sysinv/sysinv/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="sysinv"
-TIS_PATCH_VER=330
+TIS_PATCH_VER=331
diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py b/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py
index e783501f70..076eeb0ef3 100644
--- a/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py
+++ b/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py
@@ -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