diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-11-21 17:35:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 17:35:42 -0500 |
| commit | 7c6e0712b6bb57dcce6a055d4f88a2234449141f (patch) | |
| tree | cccd8eb39ee92cab7e65837c502bc461012b1b61 /roles | |
| parent | 1a505ac84b13dddde1ef74ecc01be3430b5209ae (diff) | |
| parent | 2050722ec61b6596a70b848a997401ad955e88a9 (diff) | |
| download | openshift-7c6e0712b6bb57dcce6a055d4f88a2234449141f.tar.gz openshift-7c6e0712b6bb57dcce6a055d4f88a2234449141f.tar.bz2 openshift-7c6e0712b6bb57dcce6a055d4f88a2234449141f.tar.xz openshift-7c6e0712b6bb57dcce6a055d4f88a2234449141f.zip | |
Merge pull request #6200 from mgugino-upstream-stage/node-sys-container
Fix node system container var
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/install.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/systemd_units.yml | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index 89d154ad7..816338fa1 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -4,6 +4,8 @@ openshift_node_debug_level: "{{ debug_level | default(2) }}" r_openshift_node_firewall_enabled: "{{ os_firewall_enabled | default(True) }}" r_openshift_node_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}" +l_is_node_system_container: "{{ (openshift_use_node_system_container | default(openshift_use_system_containers | default(false)) | bool) }}" + openshift_deployment_type: "{{ openshift_deployment_type | default('origin') }}" openshift_service_type: "{{ 'origin' if openshift_deployment_type == 'origin' else 'atomic-openshift' }}" diff --git a/roles/openshift_node/tasks/install.yml b/roles/openshift_node/tasks/install.yml index 6b7e40491..9a91e2fb6 100644 --- a/roles/openshift_node/tasks/install.yml +++ b/roles/openshift_node/tasks/install.yml @@ -20,7 +20,7 @@ - when: - openshift.common.is_containerized | bool - - not openshift.common.is_node_system_container | bool + - not l_is_node_system_container | bool block: - name: Pre-pull node image when containerized command: > diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml index 9c182ade6..9b4c24dfe 100644 --- a/roles/openshift_node/tasks/systemd_units.yml +++ b/roles/openshift_node/tasks/systemd_units.yml @@ -3,7 +3,7 @@ template: dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node.service" src: "{{ openshift.common.is_containerized | bool | ternary('openshift.docker.node.service', 'node.service.j2') }}" - when: not openshift.common.is_node_system_container | bool + when: not l_is_node_system_container | bool notify: - reload systemd units - restart node @@ -19,7 +19,7 @@ - name: Install Node system container include: node_system_container.yml when: - - openshift.common.is_node_system_container | bool + - l_is_node_system_container | bool - name: Install OpenvSwitch system containers include: openvswitch_system_container.yml |