summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2017-11-20 17:55:20 -0700
committerRich Megginson <rmeggins@redhat.com>2017-11-21 10:17:27 -0700
commit9196bc888bf481b05c3dba03e2e501d25aff6890 (patch)
tree2b60931313e7895684d4cb2161dedbdfda338a56 /roles
parent2a9e225c9f2f1d1f886c9ff6af0443dcd5fdae17 (diff)
downloadopenshift-9196bc888bf481b05c3dba03e2e501d25aff6890.tar.gz
openshift-9196bc888bf481b05c3dba03e2e501d25aff6890.tar.bz2
openshift-9196bc888bf481b05c3dba03e2e501d25aff6890.tar.xz
openshift-9196bc888bf481b05c3dba03e2e501d25aff6890.zip
containerPort must be an int; correctly quote/brace replicas value
The mux containerPort must be an int The eventrouter REPLICAS must use the double quote/double brace syntax documented here: https://docs.openshift.org/latest/dev_guide/templates.html#writing-parameters And must be escaped because it uses double braces, as explained here: http://jinja.pocoo.org/docs/dev/templates/#escaping
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_logging_eventrouter/templates/eventrouter-template.j22
-rw-r--r--roles/openshift_logging_mux/templates/mux.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2 b/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2
index 5a4f7f762..8529b61d5 100644
--- a/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2
+++ b/roles/openshift_logging_eventrouter/templates/eventrouter-template.j2
@@ -42,7 +42,7 @@ objects:
component: eventrouter
logging-infra: eventrouter
provider: openshift
- replicas: ${REPLICAS}
+ replicas: "${{ '{{' }}REPLICAS{{ '}}' }}"
template:
metadata:
labels:
diff --git a/roles/openshift_logging_mux/templates/mux.j2 b/roles/openshift_logging_mux/templates/mux.j2
index cfb13d59b..79e449b73 100644
--- a/roles/openshift_logging_mux/templates/mux.j2
+++ b/roles/openshift_logging_mux/templates/mux.j2
@@ -59,7 +59,7 @@ spec:
{% endif %}
{% endif %}
ports:
- - containerPort: "{{ openshift_logging_mux_port }}"
+ - containerPort: {{ openshift_logging_mux_port }}
name: mux-forward
volumeMounts:
- name: config