diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-27 17:18:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 17:18:27 -0400 |
| commit | e7ae854e6f9bbdcf961d00928c55345f706567d3 (patch) | |
| tree | 12a37adcd2ec817249cbe23c6f91ff379631ad31 | |
| parent | cf80c7e13e898c11bd02b829fbc5183a13aff817 (diff) | |
| parent | 844353c7d2967de111255da925dd93e3ac17c058 (diff) | |
| download | openshift-e7ae854e6f9bbdcf961d00928c55345f706567d3.tar.gz openshift-e7ae854e6f9bbdcf961d00928c55345f706567d3.tar.bz2 openshift-e7ae854e6f9bbdcf961d00928c55345f706567d3.tar.xz openshift-e7ae854e6f9bbdcf961d00928c55345f706567d3.zip | |
Merge pull request #4915 from sdodson/etcd-migration-changes
Stop masters before backing up, block migration for supported configs
| -rw-r--r-- | playbooks/common/openshift-etcd/migrate.yml | 40 | ||||
| -rw-r--r-- | roles/etcd_migrate/tasks/check.yml | 4 |
2 files changed, 24 insertions, 20 deletions
diff --git a/playbooks/common/openshift-etcd/migrate.yml b/playbooks/common/openshift-etcd/migrate.yml index c655449fa..3e7a48669 100644 --- a/playbooks/common/openshift-etcd/migrate.yml +++ b/playbooks/common/openshift-etcd/migrate.yml @@ -17,6 +17,26 @@ tags: - always +- name: Prepare masters for etcd data migration + hosts: oo_masters_to_config + tasks: + - set_fact: + master_services: + - "{{ openshift.common.service_type + '-master' }}" + - set_fact: + master_services: + - "{{ openshift.common.service_type + '-master-controllers' }}" + - "{{ openshift.common.service_type + '-master-api' }}" + when: + - (openshift_master_cluster_method is defined and openshift_master_cluster_method == "native") or openshift.common.is_master_system_container | bool + - debug: + msg: "master service name: {{ master_services }}" + - name: Stop masters + service: + name: "{{ item }}" + state: stopped + with_items: "{{ master_services }}" + - name: Backup v2 data hosts: oo_etcd_to_migrate gather_facts: no @@ -47,26 +67,6 @@ when: - etcd_backup_failed | length > 0 -- name: Prepare masters for etcd data migration - hosts: oo_masters_to_config - tasks: - - set_fact: - master_services: - - "{{ openshift.common.service_type + '-master' }}" - - set_fact: - master_services: - - "{{ openshift.common.service_type + '-master-controllers' }}" - - "{{ openshift.common.service_type + '-master-api' }}" - when: - - (openshift_master_cluster_method is defined and openshift_master_cluster_method == "native") or openshift.common.is_master_system_container | bool - - debug: - msg: "master service name: {{ master_services }}" - - name: Stop masters - service: - name: "{{ item }}" - state: stopped - with_items: "{{ master_services }}" - - name: Migrate etcd data from v2 to v3 hosts: oo_etcd_to_migrate gather_facts: no diff --git a/roles/etcd_migrate/tasks/check.yml b/roles/etcd_migrate/tasks/check.yml index 800073873..b66696b55 100644 --- a/roles/etcd_migrate/tasks/check.yml +++ b/roles/etcd_migrate/tasks/check.yml @@ -1,4 +1,8 @@ --- +- fail: + msg: "Currently etcd v3 migration is unsupported while we test it more thoroughly" + when: not openshift_enable_unsupported_configurations | default(false) | bool + # Check the cluster is healthy - include: check_cluster_health.yml |