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/defaults | |
| 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/defaults')
| -rw-r--r-- | roles/etcd/defaults/main.yaml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml index 78f231416..4b734d4ed 100644 --- a/roles/etcd/defaults/main.yaml +++ b/roles/etcd/defaults/main.yaml @@ -13,8 +13,6 @@ r_etcd_common_etcdctl_command: "{{ 'etcdctl' if r_etcd_common_etcd_runtime == 'h # etcd server vars etcd_conf_dir: '/etc/etcd' -r_etcd_common_system_container_host_dir: /var/lib/etcd/etcd.etcd -etcd_system_container_conf_dir: /var/lib/etcd/etc etcd_conf_file: "{{ etcd_conf_dir }}/etcd.conf" etcd_ca_file: "{{ etcd_conf_dir }}/ca.crt" etcd_cert_file: "{{ etcd_conf_dir }}/server.crt" @@ -54,7 +52,7 @@ etcd_is_containerized: False etcd_is_thirdparty: False # etcd dir vars -etcd_data_dir: "{{ '/var/lib/origin/openshift.local.etcd' if r_etcd_common_embedded_etcd | bool else '/var/lib/etcd/' if r_etcd_common_etcd_runtime != 'runc' else '/var/lib/etcd/etcd.etcd/' }}" +etcd_data_dir: "{{ '/var/lib/origin/openshift.local.etcd' if r_etcd_common_embedded_etcd | bool else '/var/lib/etcd/' }}" # etcd ports and protocols etcd_client_port: 2379 |