diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-08-23 17:57:12 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-08-29 10:26:27 -0400 |
| commit | 3b3f160130f1465a3c40b6d9f9cf66c5de6f9ad6 (patch) | |
| tree | eda62eecedf4e4305f7c57f1f85d92e6014aa811 /roles/openshift_node/tasks/systemd_units.yml | |
| parent | f2ae4eeecb94d5194131a4c31c2beea5071d84b9 (diff) | |
| download | openshift-3b3f160130f1465a3c40b6d9f9cf66c5de6f9ad6.tar.gz openshift-3b3f160130f1465a3c40b6d9f9cf66c5de6f9ad6.tar.bz2 openshift-3b3f160130f1465a3c40b6d9f9cf66c5de6f9ad6.tar.xz openshift-3b3f160130f1465a3c40b6d9f9cf66c5de6f9ad6.zip | |
Merging openshift_node with openshift bootstrap.
Diffstat (limited to 'roles/openshift_node/tasks/systemd_units.yml')
| -rw-r--r-- | roles/openshift_node/tasks/systemd_units.yml | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml index b86bb1549..4687400cd 100644 --- a/roles/openshift_node/tasks/systemd_units.yml +++ b/roles/openshift_node/tasks/systemd_units.yml @@ -1,22 +1,6 @@ --- # This file is included both in the openshift_master role and in the upgrade # playbooks. - -- include: config/install-node-deps-docker-service-file.yml - when: openshift.common.is_containerized | bool - -- block: - - name: Pre-pull node image - command: > - docker pull {{ openshift.node.node_image }}:{{ openshift_image_tag }} - register: pull_result - changed_when: "'Downloaded newer image' in pull_result.stdout" - - - include: config/install-node-docker-service-file.yml - when: - - openshift.common.is_containerized | bool - - not openshift.common.is_node_system_container | bool - - name: Install Node service file template: dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node.service" @@ -26,24 +10,24 @@ - reload systemd units - restart node -- include: config/install-ovs-service-env-file.yml - when: openshift.common.is_containerized | bool +- when: openshift.common.is_containerized | bool + block: + - name: include node deps docker service file + include: config/install-node-deps-docker-service-file.yml -- name: Install Node system container - include: node_system_container.yml - when: - - openshift.common.is_containerized | bool - - openshift.common.is_node_system_container | bool + - name: include ovs service environment file + include: config/install-ovs-service-env-file.yml -- name: Install OpenvSwitch system containers - include: openvswitch_system_container.yml - when: - - openshift.common.use_openshift_sdn | default(true) | bool - - openshift.common.is_containerized | bool - - openshift.common.is_openvswitch_system_container | bool + - name: Install Node system container + include: node_system_container.yml + when: + - openshift.common.is_node_system_container | bool -- include: config/workaround-bz1331590-ovs-oom-fix.yml - when: openshift.common.use_openshift_sdn | default(true) | bool + - name: Install OpenvSwitch system containers + include: openvswitch_system_container.yml + when: + - openshift.common.use_openshift_sdn | default(true) | bool + - openshift.common.is_openvswitch_system_container | bool - block: - name: Pre-pull openvswitch image |