Fix systemctl compatibility

Makefile

@@ -8,12 +8,25 @@ ifeq ($(PYTHON_SITELIB), /usr/lib/python2.7/dist-packages)
   EXTRA_SETUP_OPTS="--install-layout=deb"
 endif
 
+IS_SYSTEMCTL=false
+ifeq ("$(wildcard /usr/bin/systemctl)","/usr/bin/systemctl")
+  IS_SYSTEMCTL=true
+else
+  ifeq ("$(wildcard /bin/systemctl)","/usr/bin/systemctl")
+    IS_SYSTEMCTL=true
+  endif
+endif
+
 MANDIR=/usr/share/man
 
 ifndef PREFIX
   PREFIX=$(shell prefix=`python -c "import sys; print(sys.prefix)"` || prefix="/usr"; echo $$prefix)
 endif
 
+ifndef initdir
+  initdir=/etc/init.d
+endif
+
 install: bash_completion
 	python setup.py install --prefix ${DESTDIR}${PREFIX} ${EXTRA_SETUP_OPTS}
 	mkdir -p ${DESTDIR}${PREFIX}/sbin/
@@ -28,13 +41,16 @@ install_pcsd:
 	mkdir -p ${DESTDIR}${PREFIX}/lib/
 	cp -r pcsd ${DESTDIR}${PREFIX}/lib/
 	install -m 644 -D pcsd/pcsd.conf ${DESTDIR}/etc/sysconfig/pcsd
-	install -d ${DESTDIR}/usr/lib/systemd/system/
-	install -m 644 pcsd/pcsd.service ${DESTDIR}/usr/lib/systemd/system/
 	install -d ${DESTDIR}/etc/pam.d
 	install  pcsd/pcsd.pam ${DESTDIR}/etc/pam.d/pcsd
 	install -m 700 -d ${DESTDIR}/var/lib/pcsd
 	install -m 644 -D pcsd/pcsd.logrotate ${DESTDIR}/etc/logrotate.d/pcsd
-#	install -m 755 -D pcsd/pcsd ${DESTDIR}/${initdir}/pcsd
+ifeq ($(IS_SYSTEMCTL),true)
+	install -d ${DESTDIR}/usr/lib/systemd/system/
+	install -m 644 pcsd/pcsd.service ${DESTDIR}/usr/lib/systemd/system/
+else
+	install -m 755 -D pcsd/pcsd ${DESTDIR}/${initdir}/pcsd
+endif
 
 uninstall:
 	rm -f ${DESTDIR}${PREFIX}/sbin/pcs

pcs/resource.py

@@ -227,7 +227,7 @@ def resource_list_available(argv):
         if os.access(lsb_dir + agent, os.X_OK):
             ret += "lsb:" + agent + "\n"
 # systemd agents
-    if not utils.is_rhel6():
+    if utils.is_systemctl():
         agents, retval = utils.run(["systemctl", "list-unit-files", "--full"])
         agents = agents.split("\n")
 

pcsd/pcs.rb

@@ -584,7 +584,7 @@ def disable_cluster()
 end
 
 def corosync_running?()
-  if not ISRHEL6
+  if ISSYSTEMCTL
     `systemctl status corosync.service`
   else
     `service corosync status`
@@ -593,7 +593,7 @@ def corosync_running?()
 end
 
 def corosync_enabled?()
-  if not ISRHEL6
+  if ISSYSTEMCTL
     `systemctl is-enabled corosync.service`
   else
     `chkconfig corosync`
@@ -602,7 +602,7 @@ def corosync_enabled?()
 end
 
 def pacemaker_running?()
-  if not ISRHEL6
+  if ISSYSTEMCTL
     `systemctl status pacemaker.service`
   else
     `service pacemaker status`
@@ -611,7 +611,7 @@ def pacemaker_running?()
 end
 
 def pacemaker_enabled?()
-  if not ISRHEL6
+  if ISSYSTEMCTL
     `systemctl is-enabled pacemaker.service`
   else
     `chkconfig pacemaker`
@@ -620,7 +620,7 @@ def pacemaker_enabled?()
 end
 
 def cman_running?()
-  if not ISRHEL6
+  if ISSYSTEMCTL
     `systemctl status cman.service`
   else
     `service cman status`
@@ -629,7 +629,7 @@ def cman_running?()
 end
 
 def pcsd_enabled?()
-  if not ISRHEL6
+  if ISSYSTEMCTL
     `systemctl is-enabled pcsd.service`
   else
     `chkconfig pcsd`

pcsd/pcsd.rb

@@ -62,6 +62,7 @@
 
 configure do
   ISRHEL6 = is_rhel6
+  ISSYSTEMCTL = is_systemctl
   DISABLE_GUI = false
 
   OCF_ROOT = "/usr/lib/ocf"

pcsd/ssl.rb

@@ -13,6 +13,13 @@ def is_rhel6()
   end
 end
 
+def is_systemctl()
+  if File.exist?('/usr/bin/systemctl')
+    return true
+  else
+    return false
+  end
+end
 
 CRT_FILE = "/var/lib/pcsd/pcsd.crt"
 KEY_FILE = "/var/lib/pcsd/pcsd.key"
@@ -45,11 +52,14 @@ def is_rhel6()
   :SSLPrivateKey      => OpenSSL::PKey::RSA.new(File.open(KEY_FILE).read()),
   :SSLCertName        => [[ "CN", server_name ]],
   :SSLOptions         => OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3,
-  :StartCallback => Proc.new {
-  	`python /usr/lib/pcsd/systemd-notify-fix.py`
-  }
 }
 
+if is_systemctl
+  webrick_options[:StartCallback] = Proc.new {
+    `python /usr/lib/pcsd/systemd-notify-fix.py`
+  }
+end
+
 server = ::Rack::Handler::WEBrick
 trap(:INT) do
   puts "Shutting down (INT)"