diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-06-28 08:07:55 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-28 08:07:55 -0400 |
commit | 646c4a93ed6405c80bc634fa64081950e1bf8e0a (patch) | |
tree | b241b89752dcca1c8482330876b4739a6588b54e /roles/etcd_migrate/tasks/migrate.yml | |
parent | 2230e46276b004a1124dc06552a947b9023b8d4c (diff) | |
parent | 2b521c8ae6c468fd2bb98362221483eced103696 (diff) | |
download | openshift-646c4a93ed6405c80bc634fa64081950e1bf8e0a.tar.gz openshift-646c4a93ed6405c80bc634fa64081950e1bf8e0a.tar.bz2 openshift-646c4a93ed6405c80bc634fa64081950e1bf8e0a.tar.xz openshift-646c4a93ed6405c80bc634fa64081950e1bf8e0a.zip |
Merge pull request #4623 from ingvagabund/run-ttl-migration-only-one-on-the-first-master
attach leases via the first master only and only once
Diffstat (limited to 'roles/etcd_migrate/tasks/migrate.yml')
-rw-r--r-- | roles/etcd_migrate/tasks/migrate.yml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/roles/etcd_migrate/tasks/migrate.yml b/roles/etcd_migrate/tasks/migrate.yml index cb479b0cc..27eb945aa 100644 --- a/roles/etcd_migrate/tasks/migrate.yml +++ b/roles/etcd_migrate/tasks/migrate.yml @@ -20,10 +20,12 @@ - name: Check the etcd v2 data are correctly migrated fail: msg: "Failed to migrate a member" - when: "'finished transforming keys' not in l_etcdctl_migrate.stdout" + when: "'finished transforming keys' not in l_etcdctl_migrate.stdout and 'no v2 keys to migrate' not in l_etcdctl_migrate.stdout" + +- name: Migration message + debug: + msg: "Etcd migration finished with: {{ l_etcdctl_migrate.stdout }}" -# TODO(jchaloup): start the etcd on a different port so noone can access it -# Once the validation is done - name: Enable etcd member service: name: "{{ l_etcd_service }}" @@ -35,7 +37,7 @@ --cert {{ etcd_peer_cert_file }} \ --key {{ etcd_peer_key_file }} \ --cacert {{ etcd_peer_ca_file }} \ - --etcd-address 'https://{{ etcd_peer }}:2379' \ + --etcd-address 'https://{{ etcd_peer }}:{{ etcd_client_port }}' \ --ttl-keys-prefix {{ item }} \ --lease-duration 1h environment: @@ -43,11 +45,8 @@ with_items: - "/kubernetes.io/events" - "/kubernetes.io/masterleases" + delegate_to: "{{ groups.oo_first_master[0] }}" + run_once: true - set_fact: r_etcd_migrate_success: true - -- name: Enable etcd member - service: - name: "{{ l_etcd_service }}" - state: started |