diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-30 14:49:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30 14:49:36 -0400 |
| commit | adb1d12a72479ad9e1ebb648b3c13fe8768f03fc (patch) | |
| tree | 7ee9ec9d3b1f6fad3bc4325dd3291245eadd9bd1 | |
| parent | 416282af74b086cd800a88ffea6e011dd4ed9e12 (diff) | |
| parent | ee6adf9e9a520cc5873bf9f36924ae9aa4c47c7c (diff) | |
| download | openshift-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
| -rw-r--r-- | roles/docker/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/docker/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/docker/tasks/systemcontainer_crio.yml | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 3f0752f4c..fe938e52b 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -29,3 +29,6 @@ r_crio_os_firewall_deny: [] r_crio_os_firewall_allow: - service: crio port: 10010/tcp + + +openshift_docker_is_node_or_master: "{{ True if inventory_hostname in (groups['oo_masters_to_config']|default([])) or inventory_hostname in (groups['oo_nodes_to_config']|default([])) else False | bool }}" 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 }}" |