diff options
| author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-21 18:44:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-21 18:44:31 +0200 |
| commit | 4cd57c9d9f2ed4838f7dceed36cd48b418b5f2f3 (patch) | |
| tree | 9d52993b1625ed02ad7590e381b1313cebaa5d82 /roles/openshift_facts/tasks | |
| parent | 22dfad7ae3492cf949871981e3a84bcefbd138f0 (diff) | |
| parent | 4fcbe72aeaf359d56ac636a8722f817ec10c629f (diff) | |
| download | openshift-4cd57c9d9f2ed4838f7dceed36cd48b418b5f2f3.tar.gz openshift-4cd57c9d9f2ed4838f7dceed36cd48b418b5f2f3.tar.bz2 openshift-4cd57c9d9f2ed4838f7dceed36cd48b418b5f2f3.tar.xz openshift-4cd57c9d9f2ed4838f7dceed36cd48b418b5f2f3.zip | |
Merge pull request #4217 from ingvagabund/move-etcd-upgrade-code-into-role
Move etcd upgrade code into role
Diffstat (limited to 'roles/openshift_facts/tasks')
| -rw-r--r-- | roles/openshift_facts/tasks/main.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml index f657d86cf..1b9bda67e 100644 --- a/roles/openshift_facts/tasks/main.yml +++ b/roles/openshift_facts/tasks/main.yml @@ -15,6 +15,9 @@ l_is_etcd_system_container: "{{ (use_etcd_system_container | default(use_system_containers) | bool) }}" - set_fact: l_any_system_container: "{{ l_is_etcd_system_container or l_is_openvswitch_system_container or l_is_node_system_container or l_is_master_system_container }}" +- set_fact: + l_etcd_runtime: "{{ 'runc' if l_is_etcd_system_container else 'docker' if l_is_containerized else 'host' }}" + - name: Validate python version fail: @@ -80,6 +83,7 @@ is_node_system_container: "{{ l_is_node_system_container | default(false) }}" is_master_system_container: "{{ l_is_master_system_container | default(false) }}" is_etcd_system_container: "{{ l_is_etcd_system_container | default(false) }}" + etcd_runtime: "{{ l_etcd_runtime }}" system_images_registry: "{{ system_images_registry | default('') }}" public_hostname: "{{ openshift_public_hostname | default(None) }}" public_ip: "{{ openshift_public_ip | default(None) }}" |