Skip to content

Commit bf4d711

Browse files
authored
Merge pull request #6690 from openshift-cherrypick-robot/cherry-pick-6609-to-release-3.7
[release-3.7] Don't hardcode the network interface in the openshift_logging_mux role
2 parents cceb895 + c1e0514 commit bf4d711

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

roles/openshift_logging/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@ Elasticsearch OPS too, if using an OPS cluster:
177177
clients will use to connect to mux, and will be used in the TLS server cert
178178
subject.
179179
- `openshift_logging_mux_port`: 24284
180+
- `openshift_logging_mux_external_address`: The IP address that mux will listen
181+
on for connections from *external* clients. Default is the default ipv4
182+
interface as reported by the `ansible_default_ipv4` fact.
180183
- `openshift_logging_mux_cpu_request`: 100m
181184
- `openshift_logging_mux_memory_limit`: 512Mi
182185
- `openshift_logging_mux_default_namespaces`: Default `["mux-undefined"]` - the

roles/openshift_logging_mux/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ openshift_logging_mux_allow_external: False
3030
openshift_logging_use_mux: "{{ openshift_logging_mux_allow_external | default(False) }}"
3131
openshift_logging_mux_hostname: "{{ 'mux.' ~ (openshift_master_default_subdomain | default('router.default.svc.cluster.local', true)) }}"
3232
openshift_logging_mux_port: 24284
33+
openshift_logging_mux_external_address: "{{ ansible_default_ipv4.address }}"
3334
# the namespace to use for undefined projects should come first, followed by any
3435
# additional namespaces to create by default - users will typically not need to set this
3536
openshift_logging_mux_default_namespaces: ["mux-undefined"]

roles/openshift_logging_mux/tasks/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
port: "{{ openshift_logging_mux_port }}"
151151
targetPort: "mux-forward"
152152
external_ips:
153-
- "{{ ansible_eth0.ipv4.address }}"
153+
- "{{ openshift_logging_mux_external_address }}"
154154
when: openshift_logging_mux_allow_external | bool
155155

156156
- name: Set logging-mux service for internal communication

0 commit comments

Comments
 (0)