summaryrefslogtreecommitdiffstats
path: root/roles/docker/tasks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-10-30 14:49:36 -0400
committerGitHub <noreply@github.com>2017-10-30 14:49:36 -0400
commitadb1d12a72479ad9e1ebb648b3c13fe8768f03fc (patch)
tree7ee9ec9d3b1f6fad3bc4325dd3291245eadd9bd1 /roles/docker/tasks
parent416282af74b086cd800a88ffea6e011dd4ed9e12 (diff)
parentee6adf9e9a520cc5873bf9f36924ae9aa4c47c7c (diff)
downloadopenshift-adb1d12a72479ad9e1ebb648b3c13fe8768f03fc.tar.gz
openshift-adb1d12a72479ad9e1ebb648b3c13fe8768f03fc.tar.bz2
openshift-adb1d12a72479ad9e1ebb648b3c13fe8768f03fc.tar.xz
openshift-adb1d12a72479ad9e1ebb648b3c13fe8768f03fc.zip
Merge pull request #5917 from ashcrow/kennys-patch
docker: Create openshift_docker_is_node_or_master variable
Diffstat (limited to 'roles/docker/tasks')
-rw-r--r--roles/docker/tasks/main.yml2
-rw-r--r--roles/docker/tasks/systemcontainer_crio.yml8
2 files changed, 5 insertions, 5 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 5ea73568a..1539af53f 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -35,4 +35,4 @@
include: systemcontainer_crio.yml
when:
- l_use_crio
- - inventory_hostname in groups['oo_masters_to_config'] or inventory_hostname in groups['oo_nodes_to_config']
+ - openshift_docker_is_node_or_master | bool
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml
index 5a87813a0..67ede0d21 100644
--- a/roles/docker/tasks/systemcontainer_crio.yml
+++ b/roles/docker/tasks/systemcontainer_crio.yml
@@ -3,16 +3,16 @@
# TODO: Much of this file is shared with container engine tasks
- set_fact:
l_insecure_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l2_docker_insecure_registries)) }}"
- when: l2_docker_insecure_registries
+ when: l2_docker_insecure_registries | bool
- set_fact:
l_crio_registries: "{{ l2_docker_additional_registries + ['docker.io'] }}"
- when: l2_docker_additional_registries
+ when: l2_docker_additional_registries | bool
- set_fact:
l_crio_registries: "{{ ['docker.io'] }}"
- when: not l2_docker_additional_registries
+ when: not (l2_docker_additional_registries | bool)
- set_fact:
l_additional_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l_crio_registries)) }}"
- when: l2_docker_additional_registries
+ when: l2_docker_additional_registries | bool
- set_fact:
l_openshift_image_tag: "{{ openshift_image_tag | string }}"