summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Volkov <av903u@att.com>2018-10-03 13:44:02 -0700
committerAndrey Volkov <av903u@att.com>2018-10-05 07:33:47 -0700
commitb26c2cfeff3130cac16d79a695beacf0dc963df4 (patch)
tree7030c316d61b66ce53f61bf8dcbff9e730d25b2f
parentbd9a1b00cad80a599597f503426cc7482a553524 (diff)
Make haproxy-anchor cleanup optional
Continuation of Ia1449d188c15b71dd756e96b1ea2d4a672011a17. This patch creates the additional var "conf.anchor.enable_cleanup" that is true by default. False value will effectively disable cleanup procedure. Change-Id: I7f74454190dcd1d563d6cb3c9fef8504a3e0806a
Notes
Notes (review): Code-Review+1: Serge Kovaleff <sk607s@att.com> Code-Review+2: Mark Burnett <mark.m.burnett@gmail.com> Code-Review+2: Scott Hussey <sthussey@att.com> Workflow+1: Scott Hussey <sthussey@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 23 Oct 2018 15:22:43 +0000 Reviewed-on: https://review.openstack.org/607707 Project: openstack/airship-promenade Branch: refs/heads/master
-rw-r--r--charts/haproxy/templates/bin/_anchor.tpl2
-rw-r--r--charts/haproxy/values.yaml1
2 files changed, 3 insertions, 0 deletions
diff --git a/charts/haproxy/templates/bin/_anchor.tpl b/charts/haproxy/templates/bin/_anchor.tpl
index d84ca16..a910c46 100644
--- a/charts/haproxy/templates/bin/_anchor.tpl
+++ b/charts/haproxy/templates/bin/_anchor.tpl
@@ -124,7 +124,9 @@ cleanup() {
124while true; do 124while true; do
125 if [ -e /tmp/stop ]; then 125 if [ -e /tmp/stop ]; then
126 echo Stopping 126 echo Stopping
127 {%- if .Values.conf.anchor.enable_cleanup %}
127 cleanup 128 cleanup
129 {%- end %}
128 break 130 break
129 fi 131 fi
130 132
diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml
index fc6182e..98400ce 100644
--- a/charts/haproxy/values.yaml
+++ b/charts/haproxy/values.yaml
@@ -41,6 +41,7 @@ conf:
41 - mode tcp 41 - mode tcp
42 - option tcp-check 42 - option tcp-check
43 - option redispatch 43 - option redispatch
44 enable_cleanup: true
44 45
45 haproxy: 46 haproxy:
46 container_config_dir: /usr/local/etc/haproxy 47 container_config_dir: /usr/local/etc/haproxy