diff options
author | Rich Megginson <rmeggins@redhat.com> | 2017-05-02 14:40:11 -0600 |
---|---|---|
committer | Rich Megginson <rmeggins@redhat.com> | 2017-05-31 14:36:03 -0600 |
commit | ecb9b40a0c5d5f9353722b0373b559284cae7798 (patch) | |
tree | a2384baea11fde08acd56897922af12c0aa8c8b1 /roles/openshift_logging_mux/tasks/main.yaml | |
parent | d175973070a4dce2055678f9309d2f74517d461e (diff) | |
download | openshift-ecb9b40a0c5d5f9353722b0373b559284cae7798.tar.gz openshift-ecb9b40a0c5d5f9353722b0373b559284cae7798.tar.bz2 openshift-ecb9b40a0c5d5f9353722b0373b559284cae7798.tar.xz openshift-ecb9b40a0c5d5f9353722b0373b559284cae7798.zip |
add mux docs; allow to specify mux namespaces
This adds the necessary documentation for the mux parameters and
behavior. This also adds new parameters which allow to specify
the namespaces mux must create by default, and which can be
optionally added.
This casts openshift_logging_use_mux to bool wherever it is used
as a boolean.
Also - use oc_service `labels` and `external_ips` which are now
available.
Diffstat (limited to 'roles/openshift_logging_mux/tasks/main.yaml')
-rw-r--r-- | roles/openshift_logging_mux/tasks/main.yaml | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/roles/openshift_logging_mux/tasks/main.yaml b/roles/openshift_logging_mux/tasks/main.yaml index 432cab9e9..54af40070 100644 --- a/roles/openshift_logging_mux/tasks/main.yaml +++ b/roles/openshift_logging_mux/tasks/main.yaml @@ -130,16 +130,14 @@ selector: component: mux provider: openshift - # pending #4091 - #labels: - #- logging-infra: 'support' + labels: + logging-infra: 'support' ports: - name: mux-forward port: "{{ openshift_logging_mux_port }}" targetPort: "mux-forward" - # pending #4091 - # externalIPs: - # - "{{ ansible_eth0.ipv4.address }}" + external_ips: + - "{{ ansible_eth0.ipv4.address }}" when: openshift_logging_mux_allow_external | bool - name: Set logging-mux service for internal communication @@ -150,9 +148,8 @@ selector: component: mux provider: openshift - # pending #4091 - #labels: - #- logging-infra: 'support' + labels: + logging-infra: 'support' ports: - name: mux-forward port: "{{ openshift_logging_mux_port }}" @@ -190,6 +187,13 @@ - "{{ tempdir }}/templates/logging-mux-dc.yaml" delete_after: true +- name: Add mux namespaces + oc_project: + state: present + name: "{{ item }}" + node_selector: "" + with_items: "{{ openshift_logging_mux_namespaces | union(openshift_logging_mux_default_namespaces) }}" + - name: Delete temp directory file: name: "{{ tempdir }}" |