From 03b02165b29addbba15b2d672233ce6d4d44ec8e Mon Sep 17 00:00:00 2001
From: Drew Walters <drewwalters96@gmail.com>
Date: Thu, 17 Jan 2019 13:44:01 -0600
Subject: [PATCH] airskiff: Disable rabbitmq tests

Currently, the tests for the OSH rabbitmq charts are disabled; however,
the value that disables the chart is sometimes discarded during document
layering because the `.test` value does not get merged with the parent
document.  This commit adds an action to merge the test key and disable
the rabbitmq tests.

Change-Id: Ia23042bd03871cc085f69c232a85375571282af6
---
 .../charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml  | 6 ++----
 .../charts/osh/openstack-compute-kit/nova-rabbitmq.yaml     | 4 +---
 .../software/charts/osh/openstack-glance/rabbitmq.yaml      | 6 ++----
 .../software/charts/osh/openstack-heat/rabbitmq.yaml        | 6 ++----
 .../software/charts/osh/openstack-keystone/rabbitmq.yaml    | 6 ++----
 5 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/site/airskiff/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml b/site/airskiff/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml
index cdecfd2eb..be0493f7b 100644
--- a/site/airskiff/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml
+++ b/site/airskiff/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml
@@ -10,12 +10,10 @@ metadata:
       name: neutron-rabbitmq-global
       component: neutron
     actions:
-      - method: merge
-        path: .values.pod
       - method: delete
         path: .values.labels.prometheus_rabbitmq_exporter
-      - method: replace
-        path: .values.monitoring
+      - method: merge
+        path: .
   storagePolicy: cleartext
 data:
   test:
diff --git a/site/airskiff/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml b/site/airskiff/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml
index c7b89eb53..ad1f7daae 100644
--- a/site/airskiff/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml
+++ b/site/airskiff/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml
@@ -10,12 +10,10 @@ metadata:
       name: nova-rabbitmq-global
       component: nova
     actions:
-      - method: merge
-        path: .values.pod
       - method: delete
         path: .values.labels.prometheus_rabbitmq_exporter
       - method: merge
-        path: .values.monitoring
+        path: .
   storagePolicy: cleartext
 data:
   test:
diff --git a/site/airskiff/software/charts/osh/openstack-glance/rabbitmq.yaml b/site/airskiff/software/charts/osh/openstack-glance/rabbitmq.yaml
index 3ca66a93f..978cdf99c 100644
--- a/site/airskiff/software/charts/osh/openstack-glance/rabbitmq.yaml
+++ b/site/airskiff/software/charts/osh/openstack-glance/rabbitmq.yaml
@@ -10,12 +10,10 @@ metadata:
       name: glance-rabbitmq-global
       component: glance
     actions:
-      - method: merge
-        path: .values.pod
       - method: delete
         path: .values.labels.prometheus_rabbitmq_exporter
-      - method: replace
-        path: .values.monitoring
+      - method: merge
+        path: .
   storagePolicy: cleartext
 data:
   test:
diff --git a/site/airskiff/software/charts/osh/openstack-heat/rabbitmq.yaml b/site/airskiff/software/charts/osh/openstack-heat/rabbitmq.yaml
index df9af7a85..1e219ab8f 100644
--- a/site/airskiff/software/charts/osh/openstack-heat/rabbitmq.yaml
+++ b/site/airskiff/software/charts/osh/openstack-heat/rabbitmq.yaml
@@ -10,12 +10,10 @@ metadata:
       name: heat-rabbitmq-global
       component: heat
     actions:
-      - method: merge
-        path: .values.pod
       - method: delete
         path: .values.labels.prometheus_rabbitmq_exporter
-      - method: replace
-        path: .values.monitoring
+      - method: merge
+        path: .
   storagePolicy: cleartext
 data:
   test:
diff --git a/site/airskiff/software/charts/osh/openstack-keystone/rabbitmq.yaml b/site/airskiff/software/charts/osh/openstack-keystone/rabbitmq.yaml
index ad1da4b16..e5ebc2789 100644
--- a/site/airskiff/software/charts/osh/openstack-keystone/rabbitmq.yaml
+++ b/site/airskiff/software/charts/osh/openstack-keystone/rabbitmq.yaml
@@ -10,12 +10,10 @@ metadata:
       name: keystone-rabbitmq-global
       component: keystone
     actions:
-      - method: merge
-        path: .values.pod
       - method: delete
         path: .values.labels.prometheus_rabbitmq_exporter
-      - method: replace
-        path: .values.monitoring
+      - method: merge
+        path: .
   storagePolicy: cleartext
 data:
   test: