diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-01-13 16:25:16 -0600 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-01-13 16:25:16 -0600 |
| commit | 054c2a9f169c5547458a4e168855aeb4812b5797 (patch) | |
| tree | f6935f502bda8717abf3ac060e7ba6446b09d6a2 /roles/openshift_logging/tasks/upgrade_logging.yaml | |
| parent | 8db66f0929fecb26b3c4e71fe0797f20df13007a (diff) | |
| download | openshift-054c2a9f169c5547458a4e168855aeb4812b5797.tar.gz openshift-054c2a9f169c5547458a4e168855aeb4812b5797.tar.bz2 openshift-054c2a9f169c5547458a4e168855aeb4812b5797.tar.xz openshift-054c2a9f169c5547458a4e168855aeb4812b5797.zip | |
Updating upgrade_logging to be more idempotent
Diffstat (limited to 'roles/openshift_logging/tasks/upgrade_logging.yaml')
| -rw-r--r-- | roles/openshift_logging/tasks/upgrade_logging.yaml | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/roles/openshift_logging/tasks/upgrade_logging.yaml b/roles/openshift_logging/tasks/upgrade_logging.yaml index 9b285a5fe..a93463239 100644 --- a/roles/openshift_logging/tasks/upgrade_logging.yaml +++ b/roles/openshift_logging/tasks/upgrade_logging.yaml @@ -7,7 +7,7 @@ vars: start_cluster: False -# ensure that ES is running +# start ES so that we can run migrate script - command: > {{openshift.common.client_binary}} --config={{mktemp.stdout}}/admin.kubeconfig get dc -l component=es -o name -n {{openshift_logging_namespace}} register: es_dc @@ -21,13 +21,21 @@ loop_control: loop_var: object -- copy: - src: es_migration.sh - dest: {{mktemp.stdout}}/es_migration.sh +- command: > + {{ openshift.common.client_binary}} --config={{mktemp.stdout}}/admin.kubeconfig get pods -n {{openshift_logging_namespace}} -l component=es -o jsonpath='{.items[?(@.status.phase == "Running")].metadata.name}' + register: running_pod + until: running_pod.stdout != '' + retries: 30 + delay: 10 + changed_when: no + check_mode: no -- name: Run upgrade scripts - command: > - sh {{mktemp.stdout}}/es_migration.sh {{openshift.common.config_base}}/logging/ca.crt {{openshift.common.config_base}}/logging/system.admin.key {{openshift.common.config_base}}/logging/system.admin.crt {{openshift_logging_es_host}} {{openshift_logging_es_port}} {{openshift_logging_namespace}} +- name: Run upgrade script + script: es_migration.sh {{openshift.common.config_base}}/logging/ca.crt {{openshift.common.config_base}}/logging/system.admin.key {{openshift.common.config_base}}/logging/system.admin.crt {{openshift_logging_es_host}} {{openshift_logging_es_port}} {{openshift_logging_namespace}} + register: script_output + changed_when: + - script_output.rc == 0 + - script_output.stdout.find("skipping update_for_uuid") == -1 or script_output.stdout.find("skipping update_for_common_data_model") == -1 - name: Start up rest of cluster include: start_cluster.yaml |