diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-01-27 15:34:01 -0600 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-01-27 15:34:01 -0600 |
| commit | d9bebc99fe94c2a981e6b96f36d0292d7fa80879 (patch) | |
| tree | 2d9dc0ed4542eb8a96dbda3cf8a7d865aa985890 | |
| parent | 9ed378a12afae4f30550ca91b21392077d094f53 (diff) | |
Updating to correctly pull handler for openshift_logging. Adding logic to openshift_hosted_logging too
| -rw-r--r-- | roles/openshift_hosted_logging/handlers/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_hosted_logging/meta/main.yaml | 1 | ||||
| -rw-r--r-- | roles/openshift_hosted_logging/tasks/deploy_logging.yaml | 7 | ||||
| -rw-r--r-- | roles/openshift_logging/handlers/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_logging/meta/main.yaml | 1 |
5 files changed, 19 insertions, 0 deletions
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" diff --git a/roles/openshift_logging/handlers/main.yml b/roles/openshift_logging/handlers/main.yml new file mode 100644 index 000000000..ad79e62ae --- /dev/null +++ b/roles/openshift_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_logging/meta/main.yaml b/roles/openshift_logging/meta/main.yaml index 9c480f73a..bc45dcdab 100644 --- a/roles/openshift_logging/meta/main.yaml +++ b/roles/openshift_logging/meta/main.yaml @@ -14,3 +14,4 @@ galaxy_info: dependencies: - role: lib_openshift - role: openshift_facts +- role: openshift_master_facts |