From 34f2e9af479b61d29539e962f01da1ee8f46f518 Mon Sep 17 00:00:00 2001
From: Aaron Sheffield <ajs@sheffieldfamily.net>
Date: Fri, 22 Jun 2018 12:05:43 -0500
Subject: [PATCH] Update to Newer Armada

- Updates Armada to user the protected flag.

Change-Id: Ib2676eb3e6c74e689642fc223b1afc2110076e9b
---
 .../global/v1.0demo/software/config/versions.yaml           | 6 +++---
 .../global/v1.0dev/software/config/versions.yaml            | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index 630446ba..bdf4f337 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -132,7 +132,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/airship-armada
         subpath: charts/armada
-        reference: 2b714888c490a9f7c5a11383eb18b7226d1b1dc8
+        reference: 1e97cec61167b4a4f08375aa6b62d2644f119c7f
       armada-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -286,7 +286,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/airship-armada
         subpath: charts/tiller
-        reference: 35b426db32a7440d862c88e7ac3eef3a453acfc9
+        reference: 1e97cec61167b4a4f08375aa6b62d2644f119c7f
       tiller-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -419,7 +419,7 @@ data:
   images:
     ucp:
       armada:
-        api: artifacts-aic.atlantafoundry.com/att-comdev/armada:2b714888c490a9f7c5a11383eb18b7226d1b1dc8
+        api: quay.io/airshipit/armada:1e97cec61167b4a4f08375aa6b62d2644f119c7f
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         ks_endpoints: docker.io/openstackhelm/heat:ocata
         ks_service: docker.io/openstackhelm/heat:ocata
diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml
index c12b057e..a3dd41bc 100644
--- a/deployment_files/global/v1.0dev/software/config/versions.yaml
+++ b/deployment_files/global/v1.0dev/software/config/versions.yaml
@@ -132,7 +132,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/airship-armada
         subpath: charts/armada
-        reference: 2b714888c490a9f7c5a11383eb18b7226d1b1dc8
+        reference: 1e97cec61167b4a4f08375aa6b62d2644f119c7f
       armada-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -286,7 +286,7 @@ data:
         type: git
         location: https://git.openstack.org/openstack/airship-armada
         subpath: charts/tiller
-        reference: 35b426db32a7440d862c88e7ac3eef3a453acfc9
+        reference: 1e97cec61167b4a4f08375aa6b62d2644f119c7f
       tiller-htk:
         type: git
         location: https://git.openstack.org/openstack/openstack-helm
@@ -297,7 +297,7 @@ data:
   images:
     ucp:
       armada:
-        api: artifacts-aic.atlantafoundry.com/att-comdev/armada:2b714888c490a9f7c5a11383eb18b7226d1b1dc8
+        api: quay.io/airshipit/armada:1e97cec61167b4a4f08375aa6b62d2644f119c7f
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         ks_endpoints: docker.io/openstackhelm/heat:ocata
         ks_service: docker.io/openstackhelm/heat:ocata