summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-05-12 14:25:34 -0400
committerRussell Teague <rteague@redhat.com>2017-05-12 16:47:53 -0400
commitc37fbea2f717c0343007d8dc79c2dd9e8697adf0 (patch)
tree4edc42533c3a8958cba5cb1c43ebeedb48a7f5e7
parentd1d60e24b54ca6ba0dc98e8b0b2ea4cfa8b92830 (diff)
downloadopenshift-c37fbea2f717c0343007d8dc79c2dd9e8697adf0.tar.gz
openshift-c37fbea2f717c0343007d8dc79c2dd9e8697adf0.tar.bz2
openshift-c37fbea2f717c0343007d8dc79c2dd9e8697adf0.tar.xz
openshift-c37fbea2f717c0343007d8dc79c2dd9e8697adf0.zip
Fix templating of static service files
-rw-r--r--roles/openshift_master/files/atomic-openshift-master.service (renamed from roles/openshift_master/templates/atomic-openshift-master.service)0
-rw-r--r--roles/openshift_master/files/origin-master.service (renamed from roles/openshift_master/templates/origin-master.service)0
l---------roles/openshift_master/tasks/files1
-rw-r--r--roles/openshift_master/tasks/systemd_units.yml2
-rw-r--r--roles/openshift_node/tasks/systemd_units.yml2
-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
7 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/atomic-openshift-master.service b/roles/openshift_master/files/atomic-openshift-master.service
index 02af4dd16..02af4dd16 100644
--- a/roles/openshift_master/templates/atomic-openshift-master.service
+++ b/roles/openshift_master/files/atomic-openshift-master.service
diff --git a/roles/openshift_master/templates/origin-master.service b/roles/openshift_master/files/origin-master.service
index cf79dda02..cf79dda02 100644
--- a/roles/openshift_master/templates/origin-master.service
+++ b/roles/openshift_master/files/origin-master.service
diff --git a/roles/openshift_master/tasks/files b/roles/openshift_master/tasks/files
new file mode 120000
index 000000000..feb122881
--- /dev/null
+++ b/roles/openshift_master/tasks/files
@@ -0,0 +1 @@
+../files \ No newline at end of file
diff --git a/roles/openshift_master/tasks/systemd_units.yml b/roles/openshift_master/tasks/systemd_units.yml
index cfa860edf..dfc255b3d 100644
--- a/roles/openshift_master/tasks/systemd_units.yml
+++ b/roles/openshift_master/tasks/systemd_units.yml
@@ -33,7 +33,7 @@
register: create_master_unit_file
- name: Install Master service file
- template:
+ copy:
dest: "/etc/systemd/system/{{ openshift.common.service_type }}-master.service"
src: "{{ openshift.common.service_type }}-master.service"
register: create_master_unit_file
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