summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorLuke Meyer <sosiouxme@gmail.com>2017-11-21 17:24:07 -0500
committerGitHub <noreply@github.com>2017-11-21 17:24:07 -0500
commit1a505ac84b13dddde1ef74ecc01be3430b5209ae (patch)
tree2b58adfacabc254b7cc4debbae59cdb7015aef80 /roles
parentc007db1a6520b084edc7154fae863d67c230fe4b (diff)
parent9196bc888bf481b05c3dba03e2e501d25aff6890 (diff)
downloadopenshift-1a505ac84b13dddde1ef74ecc01be3430b5209ae.tar.gz
openshift-1a505ac84b13dddde1ef74ecc01be3430b5209ae.tar.bz2
openshift-1a505ac84b13dddde1ef74ecc01be3430b5209ae.tar.xz
openshift-1a505ac84b13dddde1ef74ecc01be3430b5209ae.zip
Merge pull request #6204 from richm/mux-int-port
mux containerPort must be an int not a string
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