diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-06-12 10:08:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-12 10:08:40 +0200 |
| commit | dc12c4b28321e944b2fd3a35241510fd6513fcae (patch) | |
| tree | a63c1cce828c5c74d2e54cf756797a5e2464f047 | |
| parent | 42f2439ff018885877f2aa6b8aa43a9f9e7883db (diff) | |
| parent | 7e2c88beadfdc788bcb207028fdd97fa7decf9f1 (diff) | |
| download | openshift-dc12c4b28321e944b2fd3a35241510fd6513fcae.tar.gz openshift-dc12c4b28321e944b2fd3a35241510fd6513fcae.tar.bz2 openshift-dc12c4b28321e944b2fd3a35241510fd6513fcae.tar.xz openshift-dc12c4b28321e944b2fd3a35241510fd6513fcae.zip | |
Merge pull request #4401 from ingvagabund/embedded-etcd-set-correct-etcd-path
set etcd working directory for embedded etcd
| -rw-r--r-- | roles/etcd_common/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/etcd_upgrade/defaults/main.yml | 4 | ||||
| -rw-r--r-- | roles/etcd_upgrade/meta/main.yml | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/roles/etcd_common/defaults/main.yml b/roles/etcd_common/defaults/main.yml index e1a080b34..de0739c3e 100644 --- a/roles/etcd_common/defaults/main.yml +++ b/roles/etcd_common/defaults/main.yml @@ -1,6 +1,7 @@ --- # runc, docker, host r_etcd_common_etcd_runtime: "docker" +r_etcd_common_embedded_etcd: false # etcd server vars etcd_conf_dir: "{{ '/etc/etcd' if r_etcd_common_etcd_runtime != 'runc' else '/var/lib/etcd/etcd.etcd/etc' }}" @@ -40,7 +41,7 @@ etcd_is_containerized: False etcd_is_thirdparty: False # etcd dir vars -etcd_data_dir: /var/lib/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 diff --git a/roles/etcd_upgrade/defaults/main.yml b/roles/etcd_upgrade/defaults/main.yml index 01ad8a268..b61bf526c 100644 --- a/roles/etcd_upgrade/defaults/main.yml +++ b/roles/etcd_upgrade/defaults/main.yml @@ -1,8 +1,8 @@ --- r_etcd_upgrade_action: upgrade r_etcd_upgrade_mechanism: rpm -r_etcd_upgrade_embedded_etcd: False - +r_etcd_upgrade_embedded_etcd: false +r_etcd_common_embedded_etcd: "{{ r_etcd_upgrade_embedded_etcd }}" # etcd run on a host => use etcdctl command directly # etcd run as a docker container => use docker exec # etcd run as a runc container => use runc exec diff --git a/roles/etcd_upgrade/meta/main.yml b/roles/etcd_upgrade/meta/main.yml index 018bdc8d7..afdb0267f 100644 --- a/roles/etcd_upgrade/meta/main.yml +++ b/roles/etcd_upgrade/meta/main.yml @@ -14,3 +14,4 @@ galaxy_info: - system dependencies: - role: etcd_common + r_etcd_common_embedded_etcd: "{{ r_etcd_upgrade_embedded_etcd }}" |