diff options
| author | Russell Teague <rteague@redhat.com> | 2017-09-03 22:59:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-03 22:59:02 -0400 |
| commit | 2687979a5dd8df82b6843937e2bcc6a76b6b1668 (patch) | |
| tree | 6aaeec8abe005baf374305e7e2b2bb615703c3db /playbooks/common | |
| parent | 20cf3396e4aae5aef6485a23e6cc3134c7a2d1be (diff) | |
| parent | 679683df12afa2f07d83d16d58462d9077130776 (diff) | |
| download | openshift-2687979a5dd8df82b6843937e2bcc6a76b6b1668.tar.gz openshift-2687979a5dd8df82b6843937e2bcc6a76b6b1668.tar.bz2 openshift-2687979a5dd8df82b6843937e2bcc6a76b6b1668.tar.xz openshift-2687979a5dd8df82b6843937e2bcc6a76b6b1668.zip | |
Merge pull request #5288 from mtnbikenc/etcd-entry-standardization
Standardize etcd entry point playbooks
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-etcd/migrate.yml | 18 |
2 files changed, 0 insertions, 20 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index a406b5656..5f420a76c 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -23,8 +23,6 @@ - always - include: ../openshift-etcd/config.yml - tags: - - etcd - include: ../openshift-nfs/config.yml tags: diff --git a/playbooks/common/openshift-etcd/migrate.yml b/playbooks/common/openshift-etcd/migrate.yml index 311ff84b6..a2af7bb21 100644 --- a/playbooks/common/openshift-etcd/migrate.yml +++ b/playbooks/common/openshift-etcd/migrate.yml @@ -1,22 +1,12 @@ --- -- include: ../openshift-cluster/evaluate_groups.yml - tags: - - always - - name: Run pre-checks hosts: oo_etcd_to_migrate - tags: - - always roles: - role: etcd_migrate r_etcd_migrate_action: check r_etcd_common_embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}" etcd_peer: "{{ ansible_default_ipv4.address }}" -- include: ../openshift-cluster/initialize_facts.yml - tags: - - always - # TODO: This will be different for release-3.6 branch - name: Prepare masters for etcd data migration hosts: oo_masters_to_config @@ -36,8 +26,6 @@ - name: Backup v2 data hosts: oo_etcd_to_migrate gather_facts: no - tags: - - always roles: - role: openshift_facts - role: etcd_common @@ -66,8 +54,6 @@ - name: Stop etcd hosts: oo_etcd_to_migrate gather_facts: no - tags: - - always pre_tasks: - set_fact: l_etcd_service: "{{ 'etcd_container' if openshift.common.is_containerized else 'etcd' }}" @@ -79,8 +65,6 @@ - name: Migrate data on first etcd hosts: oo_etcd_to_migrate[0] gather_facts: no - tags: - - always roles: - role: etcd_migrate r_etcd_migrate_action: migrate @@ -92,8 +76,6 @@ - name: Clean data stores on remaining etcd hosts hosts: oo_etcd_to_migrate[1:] gather_facts: no - tags: - - always roles: - role: etcd_migrate r_etcd_migrate_action: clean_data |