diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-11-22 09:08:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 09:08:19 -0500 |
| commit | 4f83051b3b7c80e3ad71fc28108cd1fc3646b385 (patch) | |
| tree | ee55d37f54a05008201b29b8afcd22cf2d4ac234 /roles/etcd/defaults | |
| parent | 46ce19180bf4fe05327ab8a15bb689d908779e75 (diff) | |
| parent | a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1 (diff) | |
| download | openshift-4f83051b3b7c80e3ad71fc28108cd1fc3646b385.tar.gz openshift-4f83051b3b7c80e3ad71fc28108cd1fc3646b385.tar.bz2 openshift-4f83051b3b7c80e3ad71fc28108cd1fc3646b385.tar.xz openshift-4f83051b3b7c80e3ad71fc28108cd1fc3646b385.zip | |
Merge pull request #6193 from mgugino-upstream-stage/etc-runtime
Cleanup etcd runtime variable.
Diffstat (limited to 'roles/etcd/defaults')
| -rw-r--r-- | roles/etcd/defaults/main.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml index 9a3652a2b..a069e4d87 100644 --- a/roles/etcd/defaults/main.yaml +++ b/roles/etcd/defaults/main.yaml @@ -2,8 +2,10 @@ r_etcd_common_backup_tag: '' r_etcd_common_backup_sufix_name: '' +l_is_etcd_system_container: "{{ (openshift_use_etcd_system_container | default(openshift_use_system_containers | default(false)) | bool) }}" + # runc, docker, host -r_etcd_common_etcd_runtime: "docker" +r_etcd_common_etcd_runtime: "{{ 'runc' if l_is_etcd_system_container else 'docker' if l_is_containerized else 'host' }}" r_etcd_common_embedded_etcd: false osm_etcd_image: 'registry.access.redhat.com/rhel7/etcd' |