diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-20 12:23:45 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-20 12:23:45 -0800 |
commit | 898b43c24a0db0f53cd272de0f3dec2a32bbc34e (patch) | |
tree | 99cb6240e59a7118b2b4c9be603efc7eaeaf4679 /roles/openshift_node/tasks/systemd_units.yml | |
parent | a5de165b8e7113631a30ef0e4a20b5f74db073f0 (diff) | |
parent | e6c159afb4ba39a7266c750d43d6a5e911cc8f21 (diff) | |
download | openshift-898b43c24a0db0f53cd272de0f3dec2a32bbc34e.tar.gz openshift-898b43c24a0db0f53cd272de0f3dec2a32bbc34e.tar.bz2 openshift-898b43c24a0db0f53cd272de0f3dec2a32bbc34e.tar.xz openshift-898b43c24a0db0f53cd272de0f3dec2a32bbc34e.zip |
Merge pull request #6516 from mgugino-upstream-stage/defact-is-containerized
Automatic merge from submit-queue.
Remove openshift.common.{is_atomic|is_containerized}
We set these variables using facts in init, no need
to duplicate the logic all around the codebase.
Diffstat (limited to 'roles/openshift_node/tasks/systemd_units.yml')
-rw-r--r-- | roles/openshift_node/tasks/systemd_units.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml index 262ee698b..e33a4999f 100644 --- a/roles/openshift_node/tasks/systemd_units.yml +++ b/roles/openshift_node/tasks/systemd_units.yml @@ -2,13 +2,13 @@ - name: Install Node service file template: dest: "/etc/systemd/system/{{ openshift_service_type }}-node.service" - src: "{{ openshift.common.is_containerized | bool | ternary('openshift.docker.node.service', 'node.service.j2') }}" + src: "{{ openshift_is_containerized | bool | ternary('openshift.docker.node.service', 'node.service.j2') }}" when: not l_is_node_system_container | bool notify: - reload systemd units - restart node -- when: openshift.common.is_containerized | bool +- when: openshift_is_containerized | bool block: - name: include node deps docker service file include_tasks: config/install-node-deps-docker-service-file.yml |