summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/files
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2015-09-22 16:42:36 -0400
committerAndrew Butcher <abutcher@redhat.com>2015-11-05 11:38:27 -0500
commitca9f4f08fbf14f9edfa7331e327cf92a25cd4401 (patch)
tree1be3bf26a63c9b20012717e0da8bf6fea2720ae7 /roles/openshift_master/files
parent6571fd9d220b7cc67ae5738149164104d5662902 (diff)
downloadopenshift-ca9f4f08fbf14f9edfa7331e327cf92a25cd4401.tar.gz
openshift-ca9f4f08fbf14f9edfa7331e327cf92a25cd4401.tar.bz2
openshift-ca9f4f08fbf14f9edfa7331e327cf92a25cd4401.tar.xz
openshift-ca9f4f08fbf14f9edfa7331e327cf92a25cd4401.zip
Various HA changes for pacemaker and native methods.
Diffstat (limited to 'roles/openshift_master/files')
-rw-r--r--roles/openshift_master/files/atomic-openshift-master-api9
-rw-r--r--roles/openshift_master/files/atomic-openshift-master-api.service21
-rw-r--r--roles/openshift_master/files/atomic-openshift-master-controllers9
-rw-r--r--roles/openshift_master/files/atomic-openshift-master-controllers.service22
4 files changed, 0 insertions, 61 deletions
diff --git a/roles/openshift_master/files/atomic-openshift-master-api b/roles/openshift_master/files/atomic-openshift-master-api
deleted file mode 100644
index ea82468a0..000000000
--- a/roles/openshift_master/files/atomic-openshift-master-api
+++ /dev/null
@@ -1,9 +0,0 @@
-OPTIONS=
-CONFIG_FILE=/etc/origin/master/master-config.yaml
-
-# Proxy configuration
-# Origin uses standard HTTP_PROXY environment variables. Be sure to set
-# NO_PROXY for your master
-#NO_PROXY=master.example.com
-#HTTP_PROXY=http://USER:PASSWORD@IPADDR:PORT
-#HTTPS_PROXY=https://USER:PASSWORD@IPADDR:PORT
diff --git a/roles/openshift_master/files/atomic-openshift-master-api.service b/roles/openshift_master/files/atomic-openshift-master-api.service
deleted file mode 100644
index 4663b77f2..000000000
--- a/roles/openshift_master/files/atomic-openshift-master-api.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=Atomic OpenShift Master API
-Documentation=https://github.com/openshift/origin
-After=network.target
-After=etcd.service
-Before=atomic-openshift-node.service
-Requires=network.target
-
-[Service]
-Type=notify
-EnvironmentFile=/etc/sysconfig/atomic-openshift-master-api
-Environment=GOTRACEBACK=crash
-ExecStart=/usr/bin/openshift start master api --config=${CONFIG_FILE} $OPTIONS
-LimitNOFILE=131072
-LimitCORE=infinity
-WorkingDirectory=/var/lib/origin/
-SyslogIdentifier=atomic-openshift-master-api
-
-[Install]
-WantedBy=multi-user.target
-WantedBy=atomic-openshift-node.service
diff --git a/roles/openshift_master/files/atomic-openshift-master-controllers b/roles/openshift_master/files/atomic-openshift-master-controllers
deleted file mode 100644
index ea82468a0..000000000
--- a/roles/openshift_master/files/atomic-openshift-master-controllers
+++ /dev/null
@@ -1,9 +0,0 @@
-OPTIONS=
-CONFIG_FILE=/etc/origin/master/master-config.yaml
-
-# Proxy configuration
-# Origin uses standard HTTP_PROXY environment variables. Be sure to set
-# NO_PROXY for your master
-#NO_PROXY=master.example.com
-#HTTP_PROXY=http://USER:PASSWORD@IPADDR:PORT
-#HTTPS_PROXY=https://USER:PASSWORD@IPADDR:PORT
diff --git a/roles/openshift_master/files/atomic-openshift-master-controllers.service b/roles/openshift_master/files/atomic-openshift-master-controllers.service
deleted file mode 100644
index 517f9c908..000000000
--- a/roles/openshift_master/files/atomic-openshift-master-controllers.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Atomic OpenShift Master Controllers
-Documentation=https://github.com/openshift/origin
-After=network.target
-After=atomic-openshift-master-api.service
-Before=atomic-openshift-node.service
-Requires=network.target
-
-[Service]
-Type=notify
-EnvironmentFile=/etc/sysconfig/atomic-openshift-master-controllers
-Environment=GOTRACEBACK=crash
-ExecStart=/usr/bin/openshift start master controllers --config=${CONFIG_FILE} $OPTIONS
-LimitNOFILE=131072
-LimitCORE=infinity
-WorkingDirectory=/var/lib/origin/
-SyslogIdentifier=atomic-openshift-master-controllers
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-WantedBy=atomic-openshift-node.service