diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-16 11:54:03 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-16 11:54:03 -0500 |
commit | ef686396dfdf2cace926a5b226ff1694eb89d005 (patch) | |
tree | b015095e317f10971dd41a75ac6c7c738b17003a /roles/openshift_node | |
parent | 15fd42020a0b5fee665c45cd23b9ba3bd152251d (diff) | |
parent | c37fbea2f717c0343007d8dc79c2dd9e8697adf0 (diff) | |
download | openshift-ef686396dfdf2cace926a5b226ff1694eb89d005.tar.gz openshift-ef686396dfdf2cace926a5b226ff1694eb89d005.tar.bz2 openshift-ef686396dfdf2cace926a5b226ff1694eb89d005.tar.xz openshift-ef686396dfdf2cace926a5b226ff1694eb89d005.zip |
Merge pull request #4178 from mtnbikenc/fix-templating
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_node')
-rw-r--r-- | roles/openshift_node/tasks/systemd_units.yml | 2 | ||||
-rw-r--r-- | roles/openshift_node/templates/atomic-openshift-node.service.j2 (renamed from roles/openshift_node/templates/atomic-openshift-node.service) | 0 | ||||
-rw-r--r-- | roles/openshift_node/templates/origin-node.service.j2 (renamed from roles/openshift_node/templates/origin-node.service) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml index a0fbf7dfc..f58c803c4 100644 --- a/roles/openshift_node/tasks/systemd_units.yml +++ b/roles/openshift_node/tasks/systemd_units.yml @@ -28,7 +28,7 @@ - name: Install Node service file template: dest: "/etc/systemd/system/{{ openshift.common.service_type }}-node.service" - src: "{{ openshift.common.service_type }}-node.service" + src: "{{ openshift.common.service_type }}-node.service.j2" register: install_node_result when: not openshift.common.is_containerized | bool diff --git a/roles/openshift_node/templates/atomic-openshift-node.service b/roles/openshift_node/templates/atomic-openshift-node.service.j2 index 80232094a..80232094a 100644 --- a/roles/openshift_node/templates/atomic-openshift-node.service +++ b/roles/openshift_node/templates/atomic-openshift-node.service.j2 diff --git a/roles/openshift_node/templates/origin-node.service b/roles/openshift_node/templates/origin-node.service.j2 index 8047301e6..8047301e6 100644 --- a/roles/openshift_node/templates/origin-node.service +++ b/roles/openshift_node/templates/origin-node.service.j2 |