From 70d7315b25c62670b88d26ddde37ad034e8c5031 Mon Sep 17 00:00:00 2001
From: Sean Eagan <sean.eagan@att.com>
Date: Tue, 12 Mar 2019 16:56:46 -0500
Subject: [PATCH] Pin helm-toolkit to fix resiliency gate

See [0] for why this is needed.

[0]: https://review.openstack.org/#/c/642825/

Change-Id: I9808f22813f1c797d78d43169bf0f41d1c1578ab
---
 examples/basic/armada-resources.yaml          |  6 ++---
 .../bootstrap-armada-config.yaml              | 26 ++-----------------
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml
index 5324d00e..28a72e80 100644
--- a/examples/basic/armada-resources.yaml
+++ b/examples/basic/armada-resources.yaml
@@ -112,13 +112,13 @@ data:
     type: git
     location: https://git.openstack.org/openstack/openstack-helm-infra
     subpath: helm-toolkit
-    reference: master
+    reference: d6996b8004db35acad7d51412b0b3216189e745f
   dependencies: []
 ---
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
-  name: helm-toolkit-pinned
+  name: helm-toolkit-tiller
   layeringDefinition:
     abstract: false
     layer: site
@@ -1148,7 +1148,7 @@ data:
     subpath: charts/tiller
     reference: 8d1521e96c6b3163f7f6598ef15a11af0052cf04
   dependencies:
-    - helm-toolkit-pinned
+    - helm-toolkit-tiller
 ---
 schema: armada/Chart/v1
 metadata:
diff --git a/tools/gate/config-templates/bootstrap-armada-config.yaml b/tools/gate/config-templates/bootstrap-armada-config.yaml
index 5461f868..98d2912c 100644
--- a/tools/gate/config-templates/bootstrap-armada-config.yaml
+++ b/tools/gate/config-templates/bootstrap-armada-config.yaml
@@ -107,29 +107,7 @@ data:
     type: git
     location: https://git.openstack.org/openstack/openstack-helm-infra
     subpath: helm-toolkit
-    reference: master
-  dependencies: []
----
-schema: armada/Chart/v1
-metadata:
-  schema: metadata/Document/v1
-  name: infra-helm-toolkit
-  layeringDefinition:
-    abstract: false
-    layer: site
-  storagePolicy: cleartext
-data:
-  chart_name: infra-helm-toolkit
-  release: infra-helm-toolkit
-  namespace: infra-helm-toolkit
-  upgrade:
-    no_hooks: true
-  values: {}
-  source:
-    type: git
-    location: https://git.openstack.org/openstack/openstack-helm-infra
-    subpath: helm-toolkit
-    reference: master
+    reference: d6996b8004db35acad7d51412b0b3216189e745f
   dependencies: []
 ---
 schema: armada/Chart/v1
@@ -505,7 +483,7 @@ data:
     reference: master
     subpath: calico
   dependencies:
-    - infra-helm-toolkit
+    - helm-toolkit
 ---
 schema: armada/Chart/v1
 metadata: