diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-07-03 21:51:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-03 21:51:03 -0400 |
| commit | fb3e913225f319622499af467b43770ce7f06c6e (patch) | |
| tree | 804dc569c99d7b23a49294ccf4f9df426fcd45e2 | |
| parent | 9e45069e4029e3c847fd4a778f45acb27110f322 (diff) | |
| parent | ddfb742877fa4be468fd0dad51624d8e6380a962 (diff) | |
| download | openshift-fb3e913225f319622499af467b43770ce7f06c6e.tar.gz openshift-fb3e913225f319622499af467b43770ce7f06c6e.tar.bz2 openshift-fb3e913225f319622499af467b43770ce7f06c6e.tar.xz openshift-fb3e913225f319622499af467b43770ce7f06c6e.zip | |
Merge pull request #4668 from giuseppe/etcd-system-container-fix-migration
Merged by openshift-bot
| -rw-r--r-- | roles/etcd/tasks/system_container.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/roles/etcd/tasks/system_container.yml b/roles/etcd/tasks/system_container.yml index a01df66b3..e735bf50a 100644 --- a/roles/etcd/tasks/system_container.yml +++ b/roles/etcd/tasks/system_container.yml @@ -1,4 +1,7 @@ --- +- set_fact: + l_etcd_src_data_dir: "{{ '/var/lib/origin/openshift.local.etcd' if r_etcd_common_embedded_etcd | bool else '/var/lib/etcd/' }}" + - name: Pull etcd system container command: atomic pull --storage=ostree {{ openshift.etcd.etcd_image }} register: pull_result @@ -50,7 +53,7 @@ - name: Check for previous etcd data store stat: - path: "{{ etcd_data_dir }}/member/" + path: "{{ l_etcd_src_data_dir }}/member/" register: src_datastore - name: Check for etcd system container data store @@ -66,7 +69,7 @@ - name: Copy etcd data store command: > - cp -a {{ etcd_data_dir }}/member + cp -a {{ l_etcd_src_data_dir }}/member {{ r_etcd_common_system_container_host_dir }}/etcd.etcd/member when: - src_datastore.stat.exists |