From c9afeb9e86ff5389d68e2fe25b9e6baaf56b72c6 Mon Sep 17 00:00:00 2001 From: ewolinetz Date: Mon, 30 Jan 2017 10:59:45 -0600 Subject: Breaking out master-config changing and updated playbook to apply change to other masters --- playbooks/common/openshift-cluster/openshift_logging.yml | 7 +++++++ roles/openshift_logging/tasks/install_logging.yaml | 7 +------ roles/openshift_logging/tasks/update_master_config.yaml | 7 +++++++ 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 roles/openshift_logging/tasks/update_master_config.yaml diff --git a/playbooks/common/openshift-cluster/openshift_logging.yml b/playbooks/common/openshift-cluster/openshift_logging.yml index 6347cbc26..3257018a0 100644 --- a/playbooks/common/openshift-cluster/openshift_logging.yml +++ b/playbooks/common/openshift-cluster/openshift_logging.yml @@ -3,3 +3,10 @@ hosts: oo_first_master roles: - openshift_logging + +- name: Update Master configs + hosts: masters:!oo_first_master + tasks: + - include_role: + name: openshift_logging + tasks_from: update_master_config diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index f0bc709df..32007e8f2 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -44,12 +44,7 @@ loop_var: file when: not ansible_check_mode -- name: Adding Kibana route information to loggingPublicURL - modify_yaml: - dest: "{{ openshift.common.config_base }}/master/master-config.yaml" - yaml_key: assetConfig.loggingPublicURL - yaml_value: "https://{{ openshift_logging_kibana_hostname }}" - notify: restart master +- include: update_master_config.yaml - name: Printing out objects to create debug: msg={{file.content | b64decode }} diff --git a/roles/openshift_logging/tasks/update_master_config.yaml b/roles/openshift_logging/tasks/update_master_config.yaml new file mode 100644 index 000000000..af303c47c --- /dev/null +++ b/roles/openshift_logging/tasks/update_master_config.yaml @@ -0,0 +1,7 @@ +--- +- name: Adding Kibana route information to loggingPublicURL + modify_yaml: + dest: "{{ openshift.common.config_base }}/master/master-config.yaml" + yaml_key: assetConfig.loggingPublicURL + yaml_value: "https://{{ openshift_logging_kibana_hostname }}" + notify: restart master -- cgit v1.2.1