diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-25 16:22:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-25 16:22:08 -0700 |
| commit | d82771fc2c4da0fea5fd20dece069520f650ebb1 (patch) | |
| tree | dbe4bc230a95ea793bb9edaa06d08a040fe313a7 /roles/etcd/tasks/backup/vars.yml | |
| parent | 305e4897dd6591ee8055414f80e43275696558d2 (diff) | |
| parent | 657cf2a8290d7ba1d3307234f7214b09f5fbeb90 (diff) | |
| download | openshift-d82771fc2c4da0fea5fd20dece069520f650ebb1.tar.gz openshift-d82771fc2c4da0fea5fd20dece069520f650ebb1.tar.bz2 openshift-d82771fc2c4da0fea5fd20dece069520f650ebb1.tar.xz openshift-d82771fc2c4da0fea5fd20dece069520f650ebb1.zip | |
Merge pull request #5655 from giuseppe/etcd-additional-bind-mount
Automatic merge from submit-queue.
etcd: remove hacks for the system container
This removes the special handling of the etcd directories when running as a system container.
Marked as WIP as it depends from this [change](https://bugzilla.redhat.com/show_bug.cgi?id=1484326) in the etcd image to be reflected into `registry.access.redhat.com/rhel7/etcd`
Diffstat (limited to 'roles/etcd/tasks/backup/vars.yml')
| -rw-r--r-- | roles/etcd/tasks/backup/vars.yml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/roles/etcd/tasks/backup/vars.yml b/roles/etcd/tasks/backup/vars.yml index 3c009f557..3ffa641b3 100644 --- a/roles/etcd/tasks/backup/vars.yml +++ b/roles/etcd/tasks/backup/vars.yml @@ -6,13 +6,10 @@ l_backup_dir_name: "openshift-backup-{{ r_etcd_common_backup_tag }}{{ r_etcd_common_backup_sufix_name }}" - set_fact: - l_etcd_data_dir: "{{ etcd_data_dir }}{{ '/etcd.etcd' if r_etcd_common_etcd_runtime == 'runc' else '' }}" - -- set_fact: l_etcd_incontainer_data_dir: "{{ etcd_data_dir }}" - set_fact: l_etcd_incontainer_backup_dir: "{{ l_etcd_incontainer_data_dir }}/{{ l_backup_dir_name }}" - set_fact: - l_etcd_backup_dir: "{{ l_etcd_data_dir }}/{{ l_backup_dir_name }}" + l_etcd_backup_dir: "{{ etcd_data_dir }}/{{ l_backup_dir_name }}" |