summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew Walters <drewwalters96@gmail.com>2019-01-17 13:44:01 -0600
committerDrew Walters <drewwalters96@gmail.com>2019-01-18 14:30:16 -0600
commit03b02165b29addbba15b2d672233ce6d4d44ec8e (patch)
tree8be205e1cbcee74a02d1ad93504f75d48300fe6b
parent2b181a94a3155c6d4bbb8549a293b9b3ccb50c5d (diff)
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
Notes
Notes (review): Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Code-Review+1: Dustin Specker <dustin.specker@att.com> Code-Review+1: Jeffrey Williams <jw2610@att.com> Code-Review+2: Matt McEuen <matt.mceuen@att.com> Workflow+1: Matt McEuen <matt.mceuen@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 22 Jan 2019 17:07:37 +0000 Reviewed-on: https://review.openstack.org/631610 Project: openstack/airship-treasuremap Branch: refs/heads/master
-rw-r--r--site/airskiff/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml6
-rw-r--r--site/airskiff/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml4
-rw-r--r--site/airskiff/software/charts/osh/openstack-glance/rabbitmq.yaml6
-rw-r--r--site/airskiff/software/charts/osh/openstack-heat/rabbitmq.yaml6
-rw-r--r--site/airskiff/software/charts/osh/openstack-keystone/rabbitmq.yaml6
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 cdecfd2..be0493f 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:
10 name: neutron-rabbitmq-global 10 name: neutron-rabbitmq-global
11 component: neutron 11 component: neutron
12 actions: 12 actions:
13 - method: merge
14 path: .values.pod
15 - method: delete 13 - method: delete
16 path: .values.labels.prometheus_rabbitmq_exporter 14 path: .values.labels.prometheus_rabbitmq_exporter
17 - method: replace 15 - method: merge
18 path: .values.monitoring 16 path: .
19 storagePolicy: cleartext 17 storagePolicy: cleartext
20data: 18data:
21 test: 19 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 c7b89eb..ad1f7da 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:
10 name: nova-rabbitmq-global 10 name: nova-rabbitmq-global
11 component: nova 11 component: nova
12 actions: 12 actions:
13 - method: merge
14 path: .values.pod
15 - method: delete 13 - method: delete
16 path: .values.labels.prometheus_rabbitmq_exporter 14 path: .values.labels.prometheus_rabbitmq_exporter
17 - method: merge 15 - method: merge
18 path: .values.monitoring 16 path: .
19 storagePolicy: cleartext 17 storagePolicy: cleartext
20data: 18data:
21 test: 19 test:
diff --git a/site/airskiff/software/charts/osh/openstack-glance/rabbitmq.yaml b/site/airskiff/software/charts/osh/openstack-glance/rabbitmq.yaml
index 3ca66a9..978cdf9 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:
10 name: glance-rabbitmq-global 10 name: glance-rabbitmq-global
11 component: glance 11 component: glance
12 actions: 12 actions:
13 - method: merge
14 path: .values.pod
15 - method: delete 13 - method: delete
16 path: .values.labels.prometheus_rabbitmq_exporter 14 path: .values.labels.prometheus_rabbitmq_exporter
17 - method: replace 15 - method: merge
18 path: .values.monitoring 16 path: .
19 storagePolicy: cleartext 17 storagePolicy: cleartext
20data: 18data:
21 test: 19 test:
diff --git a/site/airskiff/software/charts/osh/openstack-heat/rabbitmq.yaml b/site/airskiff/software/charts/osh/openstack-heat/rabbitmq.yaml
index df9af7a..1e219ab 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:
10 name: heat-rabbitmq-global 10 name: heat-rabbitmq-global
11 component: heat 11 component: heat
12 actions: 12 actions:
13 - method: merge
14 path: .values.pod
15 - method: delete 13 - method: delete
16 path: .values.labels.prometheus_rabbitmq_exporter 14 path: .values.labels.prometheus_rabbitmq_exporter
17 - method: replace 15 - method: merge
18 path: .values.monitoring 16 path: .
19 storagePolicy: cleartext 17 storagePolicy: cleartext
20data: 18data:
21 test: 19 test:
diff --git a/site/airskiff/software/charts/osh/openstack-keystone/rabbitmq.yaml b/site/airskiff/software/charts/osh/openstack-keystone/rabbitmq.yaml
index ad1da4b..e5ebc27 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:
10 name: keystone-rabbitmq-global 10 name: keystone-rabbitmq-global
11 component: keystone 11 component: keystone
12 actions: 12 actions:
13 - method: merge
14 path: .values.pod
15 - method: delete 13 - method: delete
16 path: .values.labels.prometheus_rabbitmq_exporter 14 path: .values.labels.prometheus_rabbitmq_exporter
17 - method: replace 15 - method: merge
18 path: .values.monitoring 16 path: .
19 storagePolicy: cleartext 17 storagePolicy: cleartext
20data: 18data:
21 test: 19 test: