diff options
author | ewolinetz <ewolinet@redhat.com> | 2017-05-02 11:21:56 -0500 |
---|---|---|
committer | ewolinetz <ewolinet@redhat.com> | 2017-05-22 10:42:52 -0500 |
commit | 60ad4626f03cbfb119290a4bfaf9ecba53dc762b (patch) | |
tree | 766cafb64b81d26ba9cad66e84153248aad7141a /roles/openshift_logging/tasks/install_logging.yaml | |
parent | a8e826248539179c5ef69ec003701be608e89b70 (diff) | |
download | openshift-60ad4626f03cbfb119290a4bfaf9ecba53dc762b.tar.gz openshift-60ad4626f03cbfb119290a4bfaf9ecba53dc762b.tar.bz2 openshift-60ad4626f03cbfb119290a4bfaf9ecba53dc762b.tar.xz openshift-60ad4626f03cbfb119290a4bfaf9ecba53dc762b.zip |
Pulling in changes from master
Diffstat (limited to 'roles/openshift_logging/tasks/install_logging.yaml')
-rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 50 |
1 files changed, 44 insertions, 6 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index b5b266f2d..6083cdd26 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -8,14 +8,33 @@ oc_project: state: present name: "{{ openshift_logging_namespace }}" + node_selector: "{{ openshift_logging_nodeselector | default(null) }}" -- name: Install logging mux - include: "{{ role_path }}/tasks/install_mux.yaml" - when: openshift_logging_use_mux +- name: Labelling logging project + oc_label: + state: present + kind: namespace + name: "{{ openshift_logging_namespace }}" + labels: + - key: "{{ item.key }}" + value: "{{ item.value }}" + with_dict: "{{ openshift_logging_labels | default({}) }}" + when: + - openshift_logging_labels is defined + - openshift_logging_labels is dict -- find: paths={{ mktemp.stdout }}/templates patterns=*.yaml - register: object_def_files - changed_when: no +- name: Labelling logging project + oc_label: + state: present + kind: namespace + name: "{{ openshift_logging_namespace }}" + labels: + - key: "{{ openshift_logging_label_key }}" + value: "{{ openshift_logging_label_value }}" + when: + - openshift_logging_label_key is defined + - openshift_logging_label_key != "" + - openshift_logging_label_value is defined - name: Create logging cert directory file: @@ -166,6 +185,20 @@ when: - openshift_logging_use_ops | bool +## Mux +- include_role: + name: openshift_logging_mux + vars: + generated_certs_dir: "{{openshift.common.config_base}}/logging" + openshift_logging_mux_ops_host: "{{ ( openshift_logging_use_ops | bool ) | ternary('logging-es-ops', 'logging-es') }}" + openshift_logging_mux_namespace: "{{ openshift_logging_namespace }}" + openshift_logging_mux_master_url: "{{ openshift_logging_master_url }}" + openshift_logging_mux_image_prefix: "{{ openshift_logging_image_prefix }}" + openshift_logging_mux_image_version: "{{ openshift_logging_image_version }}" + openshift_logging_mux_image_pull_secret: "{{ openshift_logging_image_pull_secret }}" + when: + - openshift_logging_use_mux | bool + ## Fluentd - include_role: @@ -174,5 +207,10 @@ generated_certs_dir: "{{openshift.common.config_base}}/logging" openshift_logging_fluentd_ops_host: "{{ ( openshift_logging_use_ops | bool ) | ternary('logging-es-ops', 'logging-es') }}" openshift_logging_fluentd_use_journal: "{{ openshift.docker.options | search('journald') }}" + openshift_logging_fluentd_image_prefix: "{{ openshift_logging_image_prefix }}" + openshift_logging_fluentd_image_version: "{{ openshift_logging_image_version }}" + openshift_logging_fluentd_image_pull_secret: "{{ openshift_logging_image_pull_secret }}" + openshift_logging_fluentd_master_url: "{{ openshift_logging_master_url }}" + openshift_logging_fluentd_namespace: "{{ openshift_logging_namespace }}" - include: update_master_config.yaml |