diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-11-20 17:20:25 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-11-21 16:23:37 -0500 |
| commit | a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1 (patch) | |
| tree | 99ac77931e1770a6d45d07a5fd534460df7e1654 /roles/etcd/defaults | |
| parent | 51a0cbd42807c91a5e30fa58362b8745a40607f2 (diff) | |
| download | openshift-a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1.tar.gz openshift-a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1.tar.bz2 openshift-a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1.tar.xz openshift-a1fa70c1ac6fbe9a4c8ca740b2c6c3cf5ff27ef1.zip | |
Cleanup etcd runtime variable.
Cleaning out reference to etcd_runtime in openshift facts.
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' |