summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-16 11:54:03 -0500
committerGitHub <noreply@github.com>2017-05-16 11:54:03 -0500
commitef686396dfdf2cace926a5b226ff1694eb89d005 (patch)
treeb015095e317f10971dd41a75ac6c7c738b17003a /roles/openshift_master
parent15fd42020a0b5fee665c45cd23b9ba3bd152251d (diff)
parentc37fbea2f717c0343007d8dc79c2dd9e8697adf0 (diff)
downloadopenshift-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_master')
-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
4 files changed, 2 insertions, 1 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