summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/files
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-08-09 08:01:36 -0400
committerGitHub <noreply@github.com>2017-08-09 08:01:36 -0400
commit57db37245e12a190030b4a7075251f37cd83665b (patch)
tree9617c27a059fc79e95702a4027f69a35c3fb80e2 /roles/openshift_master/files
parent5fe4c8c5478ef8b87f88b413c9033ff68987d4e1 (diff)
parentc71bed77b350bf66f7c3342ce1e26b9bc389ba3f (diff)
downloadopenshift-57db37245e12a190030b4a7075251f37cd83665b.tar.gz
openshift-57db37245e12a190030b4a7075251f37cd83665b.tar.bz2
openshift-57db37245e12a190030b4a7075251f37cd83665b.tar.xz
openshift-57db37245e12a190030b4a7075251f37cd83665b.zip
Merge pull request #4832 from smarterclayton/stop_using_old_mode
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_master/files')
-rw-r--r--roles/openshift_master/files/atomic-openshift-master.service23
-rw-r--r--roles/openshift_master/files/origin-master.service23
2 files changed, 0 insertions, 46 deletions
diff --git a/roles/openshift_master/files/atomic-openshift-master.service b/roles/openshift_master/files/atomic-openshift-master.service
deleted file mode 100644
index 02af4dd16..000000000
--- a/roles/openshift_master/files/atomic-openshift-master.service
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=Atomic OpenShift Master
-Documentation=https://github.com/openshift/origin
-After=network-online.target
-After=etcd.service
-Before=atomic-openshift-node.service
-Requires=network-online.target
-
-[Service]
-Type=notify
-EnvironmentFile=/etc/sysconfig/atomic-openshift-master
-Environment=GOTRACEBACK=crash
-ExecStart=/usr/bin/openshift start master --config=${CONFIG_FILE} $OPTIONS
-LimitNOFILE=131072
-LimitCORE=infinity
-WorkingDirectory=/var/lib/origin/
-SyslogIdentifier=atomic-openshift-master
-Restart=always
-RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
-WantedBy=atomic-openshift-node.service
diff --git a/roles/openshift_master/files/origin-master.service b/roles/openshift_master/files/origin-master.service
deleted file mode 100644
index cf79dda02..000000000
--- a/roles/openshift_master/files/origin-master.service
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=Origin Master Service
-Documentation=https://github.com/openshift/origin
-After=network-online.target
-After=etcd.service
-Before=origin-node.service
-Requires=network-online.target
-
-[Service]
-Type=notify
-EnvironmentFile=/etc/sysconfig/origin-master
-Environment=GOTRACEBACK=crash
-ExecStart=/usr/bin/openshift start master --config=${CONFIG_FILE} $OPTIONS
-LimitNOFILE=131072
-LimitCORE=infinity
-WorkingDirectory=/var/lib/origin/
-SyslogIdentifier=origin-master
-Restart=always
-RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
-WantedBy=origin-node.service