summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-23 15:22:43 +0000
committerGerrit Code Review <review@openstack.org>2018-10-23 15:22:43 +0000
commit034c43cf17b7a8b0b826644f3dca76a3e8e879a6 (patch)
treef2d6c925cfabb37282dd348610a8f74625a1fd23
parent20f27f628141752a98948453217a897d9df9bf8c (diff)
parentb26c2cfeff3130cac16d79a695beacf0dc963df4 (diff)
Merge "Make haproxy-anchor cleanup optional"
-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