From d9bebc99fe94c2a981e6b96f36d0292d7fa80879 Mon Sep 17 00:00:00 2001 From: ewolinetz Date: Fri, 27 Jan 2017 15:34:01 -0600 Subject: Updating to correctly pull handler for openshift_logging. Adding logic to openshift_hosted_logging too --- roles/openshift_hosted_logging/handlers/main.yml | 5 +++++ roles/openshift_hosted_logging/meta/main.yaml | 1 + roles/openshift_hosted_logging/tasks/deploy_logging.yaml | 7 +++++++ 3 files changed, 13 insertions(+) create mode 100644 roles/openshift_hosted_logging/handlers/main.yml (limited to 'roles/openshift_hosted_logging') diff --git a/roles/openshift_hosted_logging/handlers/main.yml b/roles/openshift_hosted_logging/handlers/main.yml new file mode 100644 index 000000000..ad79e62ae --- /dev/null +++ b/roles/openshift_hosted_logging/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: restart master + systemd: name={{ openshift.common.service_type }}-master state=restarted + when: (openshift.master.ha is not defined or not openshift.master.ha | bool) and (not (master_service_status_changed | default(false) | bool)) + notify: Verify API Server diff --git a/roles/openshift_hosted_logging/meta/main.yaml b/roles/openshift_hosted_logging/meta/main.yaml index b695bde87..044c8043c 100644 --- a/roles/openshift_hosted_logging/meta/main.yaml +++ b/roles/openshift_hosted_logging/meta/main.yaml @@ -1,3 +1,4 @@ --- dependencies: - { role: openshift_common } + - { role: openshift_master_facts } diff --git a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml index 513a74c69..c7f055b31 100644 --- a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml +++ b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml @@ -165,6 +165,13 @@ retries: 20 delay: 15 +- 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 + - debug: msg: "Logging components deployed. Note persistent volume for elasticsearch must be setup manually" -- cgit v1.2.3 From d5c8f481b6a1a23f95fa2c7c621cbbf2edf64b7a Mon Sep 17 00:00:00 2001 From: ewolinetz Date: Mon, 30 Jan 2017 12:50:57 -0600 Subject: Updating openshift_hosted_logging to update master-configs with publicLoggingURL --- roles/openshift_hosted_logging/tasks/deploy_logging.yaml | 7 +------ roles/openshift_hosted_logging/tasks/update_master_config.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 roles/openshift_hosted_logging/tasks/update_master_config.yaml (limited to 'roles/openshift_hosted_logging') diff --git a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml index c7f055b31..afd82766f 100644 --- a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml +++ b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml @@ -165,12 +165,7 @@ retries: 20 delay: 15 -- 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 - debug: msg: "Logging components deployed. Note persistent volume for elasticsearch must be setup manually" diff --git a/roles/openshift_hosted_logging/tasks/update_master_config.yaml b/roles/openshift_hosted_logging/tasks/update_master_config.yaml new file mode 100644 index 000000000..1122e059c --- /dev/null +++ b/roles/openshift_hosted_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://{{ logging_hostname }}" + notify: restart master -- cgit v1.2.3