diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-12-11 16:47:44 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-12-12 18:00:05 -0500 |
| commit | 504930b1915c2b6329c1f68f23b1188beaabcbe9 (patch) | |
| tree | 9271d4c9ee71ed2a80f140e1fac2c9d8596e7501 /roles/openshift_node/tasks/systemd_units.yml | |
| parent | a6d5c625956a5051b7bbd9fc48430b9df11084ee (diff) | |
| download | openshift-504930b1915c2b6329c1f68f23b1188beaabcbe9.tar.gz openshift-504930b1915c2b6329c1f68f23b1188beaabcbe9.tar.bz2 openshift-504930b1915c2b6329c1f68f23b1188beaabcbe9.tar.xz openshift-504930b1915c2b6329c1f68f23b1188beaabcbe9.zip | |
upgrade node mark 2
Diffstat (limited to 'roles/openshift_node/tasks/systemd_units.yml')
| -rw-r--r-- | roles/openshift_node/tasks/systemd_units.yml | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml index c532147b1..262ee698b 100644 --- a/roles/openshift_node/tasks/systemd_units.yml +++ b/roles/openshift_node/tasks/systemd_units.yml @@ -16,29 +16,10 @@ - name: include ovs service environment file include_tasks: config/install-ovs-service-env-file.yml - - name: Install Node system container - include_tasks: node_system_container.yml - when: - - l_is_node_system_container | bool - - - name: Install OpenvSwitch system containers - include_tasks: openvswitch_system_container.yml + - include_tasks: config/install-ovs-docker-service-file.yml when: - openshift_node_use_openshift_sdn | bool - - l_is_openvswitch_system_container | bool - -- block: - - name: Pre-pull openvswitch image - command: > - docker pull {{ openshift.node.ovs_image }}:{{ openshift_image_tag }} - register: pull_result - changed_when: "'Downloaded newer image' in pull_result.stdout" - - - include_tasks: config/install-ovs-docker-service-file.yml - when: - - openshift.common.is_containerized | bool - - openshift_node_use_openshift_sdn | bool - - not l_is_openvswitch_system_container | bool + - not l_is_openvswitch_system_container | bool - include_tasks: config/configure-node-settings.yml - include_tasks: config/configure-proxy-settings.yml |