Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-3.11] kibana, curator ops false; wait for es deploy #11220

Merged
merged 1 commit into from
Feb 21, 2019
Merged

[release-3.11] kibana, curator ops false; wait for es deploy #11220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions roles/openshift_logging/tasks/install_logging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@
name: openshift_logging_kibana
vars:
generated_certs_dir: "{{openshift.common.config_base}}/logging"
openshift_logging_kibana_ops_deployment: false
openshift_logging_kibana_namespace: "{{ openshift_logging_namespace }}"
openshift_logging_kibana_master_url: "{{ openshift_logging_master_url }}"
openshift_logging_kibana_master_public_url: "{{ openshift_logging_master_public_url }}"
Expand Down Expand Up @@ -278,6 +279,7 @@
name: openshift_logging_curator
vars:
generated_certs_dir: "{{openshift.common.config_base}}/logging"
openshift_logging_curator_ops_deployment: false
openshift_logging_curator_namespace: "{{ openshift_logging_namespace }}"
openshift_logging_curator_es_host: "{{ openshift_logging_es_host }}"
openshift_logging_curator_es_port: "{{ openshift_logging_es_port }}"
Expand Down
11 changes: 11 additions & 0 deletions roles/openshift_logging_elasticsearch/tasks/restart_es_node.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,23 @@
- (_disable_output.stdout | from_json)['acknowledged'] | bool
failed_when: false

- name: "Check if there is a rollout in progress for {{ _es_node }}"
command: >
{{ openshift_client_binary }}
--config={{ openshift.common.config_base }}/master/admin.kubeconfig
rollout status --watch=false dc/{{ _es_node }}
-n {{ openshift_logging_elasticsearch_namespace }}
register: _rollout_status
ignore_errors: True

- name: "Rolling out new pod(s) for {{ _es_node }}"
command: >
{{ openshift_client_binary }}
--config={{ openshift.common.config_base }}/master/admin.kubeconfig
rollout latest {{ _es_node }}
-n {{ openshift_logging_elasticsearch_namespace }}
when:
- _rollout_status.stdout.find('Waiting for rollout to finish') < 0

- when: not _skip_healthcheck | bool
name: "Waiting for {{ _es_node }} to finish scaling up"
Expand Down