X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-flock%2Fstx-openstack-armada-app%2Fopenstack-helm-infra%2F0008-Enable-override-of-rabbitmq-probe-parameters.patch;fp=meta-starlingx%2Fmeta-stx-flock%2Fstx-openstack-armada-app%2Fopenstack-helm-infra%2F0008-Enable-override-of-rabbitmq-probe-parameters.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=bf41eb4bc3c20a997cf3abc31656973ab6b8d06d;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-flock/stx-openstack-armada-app/openstack-helm-infra/0008-Enable-override-of-rabbitmq-probe-parameters.patch b/meta-starlingx/meta-stx-flock/stx-openstack-armada-app/openstack-helm-infra/0008-Enable-override-of-rabbitmq-probe-parameters.patch
deleted file mode 100644
index bf41eb4..0000000
--- a/meta-starlingx/meta-stx-flock/stx-openstack-armada-app/openstack-helm-infra/0008-Enable-override-of-rabbitmq-probe-parameters.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 132df9829fa4c697e0b9701871888708973f9123 Mon Sep 17 00:00:00 2001
-From: Gerry Kopec <Gerry.Kopec@windriver.com>
-Date: Fri, 16 Aug 2019 14:29:46 -0400
-Subject: [PATCH] Enable override of rabbitmq probe parameters
-
-Add variables for initial delay, period and timeout for rabbitmq
-liveness and readiness probes.
-
-Change-Id: I8d2685118eb4ce3b8c27952892f7ad553fc5de77
-Signed-off-by: Gerry Kopec <Gerry.Kopec@windriver.com>
----
- rabbitmq/templates/statefulset.yaml | 10 ++++++----
- rabbitmq/values.yaml                |  9 +++++++++
- 2 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
-index e0e61e6..f71dc3e 100644
---- a/rabbitmq/templates/statefulset.yaml
-+++ b/rabbitmq/templates/statefulset.yaml
-@@ -200,14 +200,16 @@ spec:
-               value: {{ $envAll.Values.io_thread_pool.size | quote }}
- {{- end }}
-           readinessProbe:
--            initialDelaySeconds: 10
--            timeoutSeconds: 10
-+            initialDelaySeconds: {{ $envAll.Values.pod.probes.readiness.initialDelaySeconds }}
-+            periodSeconds: {{ $envAll.Values.pod.probes.readiness.periodSeconds }}
-+            timeoutSeconds: {{ $envAll.Values.pod.probes.readiness.timeoutSeconds }}
-             exec:
-               command:
-               - /tmp/rabbitmq-readiness.sh
-           livenessProbe:
--            initialDelaySeconds: 30
--            timeoutSeconds: 10
-+            initialDelaySeconds: {{ $envAll.Values.pod.probes.liveness.initialDelaySeconds }}
-+            periodSeconds: {{ $envAll.Values.pod.probes.liveness.periodSeconds }}
-+            timeoutSeconds: {{ $envAll.Values.pod.probes.liveness.timeoutSeconds }}
-             exec:
-               command:
-               - /tmp/rabbitmq-liveness.sh
-diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
-index 9cd3a91..2bae4cb 100644
---- a/rabbitmq/values.yaml
-+++ b/rabbitmq/values.yaml
-@@ -145,6 +145,15 @@ pod:
-         limits:
-           memory: "1024Mi"
-           cpu: "2000m"
-+  probes:
-+    readiness:
-+      initialDelaySeconds: 10
-+      periodSeconds: 10
-+      timeoutSeconds: 10
-+    liveness:
-+      initialDelaySeconds: 30
-+      periodSeconds: 10
-+      timeoutSeconds: 10
- 
- conf:
-   enabled_plugins:
--- 
-2.7.4
-