From b37e172a44261cca9e3b44b3b23fbd134aaab34e Mon Sep 17 00:00:00 2001
From: Carlos Konstanski <ckonstanski@pippiandcarlos.com>
Date: Tue, 6 Mar 2018 19:50:01 -0700
Subject: Support pure systemd hosts

Issue: IS-75
---
 salt/openbook/ci/files/openbook.gentoo             | 31 ---------------------
 .../openbook/ci/files/openbook.gentoo.openrc.debug | 17 ++++++++++++
 .../openbook/ci/files/openbook.gentoo.openrc.start | 16 +++++++++++
 .../ci/files/openbook.gentoo.systemd.debug         | 10 +++++++
 .../ci/files/openbook.gentoo.systemd.start         | 10 +++++++
 salt/openbook/ci/files/openbook.redhat             | 32 ----------------------
 salt/openbook/ci/files/openbook.redhat.debug       | 26 ++++++++++++++++++
 salt/openbook/ci/files/openbook.redhat.start       | 26 ++++++++++++++++++
 salt/openbook/ci/files/openbook.ubuntu             | 28 -------------------
 salt/openbook/ci/files/openbook.ubuntu.debug       | 22 +++++++++++++++
 salt/openbook/ci/files/openbook.ubuntu.start       | 22 +++++++++++++++
 11 files changed, 149 insertions(+), 91 deletions(-)
 delete mode 100644 salt/openbook/ci/files/openbook.gentoo
 create mode 100644 salt/openbook/ci/files/openbook.gentoo.openrc.debug
 create mode 100644 salt/openbook/ci/files/openbook.gentoo.openrc.start
 create mode 100644 salt/openbook/ci/files/openbook.gentoo.systemd.debug
 create mode 100644 salt/openbook/ci/files/openbook.gentoo.systemd.start
 delete mode 100644 salt/openbook/ci/files/openbook.redhat
 create mode 100644 salt/openbook/ci/files/openbook.redhat.debug
 create mode 100644 salt/openbook/ci/files/openbook.redhat.start
 delete mode 100644 salt/openbook/ci/files/openbook.ubuntu
 create mode 100644 salt/openbook/ci/files/openbook.ubuntu.debug
 create mode 100644 salt/openbook/ci/files/openbook.ubuntu.start

(limited to 'salt/openbook/ci')

diff --git a/salt/openbook/ci/files/openbook.gentoo b/salt/openbook/ci/files/openbook.gentoo
deleted file mode 100644
index 62dd27a..0000000
--- a/salt/openbook/ci/files/openbook.gentoo
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-
-extra_commands="debug test_database"
-
-depend() {
-    need docker
-}
-
-start() {
-    ebegin "Starting Openbook"
-    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} start
-    eend $?
-}
-
-debug() {
-    ebegin "Starting Openbook in debug mode"
-    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} debug
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping Openbook"
-    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} stop
-    eend $?
-}
-
-test_database() {
-    ebegin "Testing database"
-    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} test_database
-    eend $?
-}
diff --git a/salt/openbook/ci/files/openbook.gentoo.openrc.debug b/salt/openbook/ci/files/openbook.gentoo.openrc.debug
new file mode 100644
index 0000000..75d7bc9
--- /dev/null
+++ b/salt/openbook/ci/files/openbook.gentoo.openrc.debug
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+
+depend() {
+    need docker
+}
+
+start() {
+    ebegin "Starting Openbook"
+    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} debug
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping Openbook"
+    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} stop
+    eend $?
+}
diff --git a/salt/openbook/ci/files/openbook.gentoo.openrc.start b/salt/openbook/ci/files/openbook.gentoo.openrc.start
new file mode 100644
index 0000000..e2ee244
--- /dev/null
+++ b/salt/openbook/ci/files/openbook.gentoo.openrc.start
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+
+depend() {
+    need docker
+}
+
+start() {
+    ebegin "Starting Openbook"
+    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} start
+    eend $?
+}
+stop() {
+    ebegin "Stopping Openbook"
+    {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} stop
+    eend $?
+}
diff --git a/salt/openbook/ci/files/openbook.gentoo.systemd.debug b/salt/openbook/ci/files/openbook.gentoo.systemd.debug
new file mode 100644
index 0000000..69642b7
--- /dev/null
+++ b/salt/openbook/ci/files/openbook.gentoo.systemd.debug
@@ -0,0 +1,10 @@
+[Unit]
+Description=Openbook
+After=network.target nss-lookup.target docker.target
+
+[Service]
+Type=forking
+ExecStart={{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} debug
+
+[Install]
+WantedBy=multi-user.target
diff --git a/salt/openbook/ci/files/openbook.gentoo.systemd.start b/salt/openbook/ci/files/openbook.gentoo.systemd.start
new file mode 100644
index 0000000..35f067a
--- /dev/null
+++ b/salt/openbook/ci/files/openbook.gentoo.systemd.start
@@ -0,0 +1,10 @@
+[Unit]
+Description=Openbook
+After=network.target nss-lookup.target docker.target
+
+[Service]
+Type=forking
+ExecStart={{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} start
+
+[Install]
+WantedBy=multi-user.target
diff --git a/salt/openbook/ci/files/openbook.redhat b/salt/openbook/ci/files/openbook.redhat
deleted file mode 100644
index 5f3f934..0000000
--- a/salt/openbook/ci/files/openbook.redhat
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# openbook
-#
-# chkconfig: 2345 10 90
-# description: Manage the Openbook application
-#
-### BEGIN INIT INFO
-# Provides: openbook
-# Required-Start: docker
-# Required-Stop: docker
-# Short-Description: Bring up/down networking
-# Description: Manage the Openbook application
-### END INIT INFO
-
-case $1 in
-    start*)
-        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} start
-        ;;
-    debug*)
-        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} debug
-        ;;
-    stop*)
-        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} stop
-        ;;
-    test_database*)
-        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} test_database
-        ;;
-    *)
-        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} help
-        ;;
-esac
diff --git a/salt/openbook/ci/files/openbook.redhat.debug b/salt/openbook/ci/files/openbook.redhat.debug
new file mode 100644
index 0000000..b91bd94
--- /dev/null
+++ b/salt/openbook/ci/files/openbook.redhat.debug
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# openbook
+#
+# chkconfig: 2345 10 90
+# description: Manage the Openbook application
+#
+### BEGIN INIT INFO
+# Provides: openbook
+# Required-Start: docker
+# Required-Stop: docker
+# Short-Description: Bring up/down networking
+# Description: Manage the Openbook application
+### END INIT INFO
+
+case $1 in
+    start*)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} debug
+        ;;
+    stop*)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} stop
+        ;;
+    *)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} help
+        ;;
+esac
diff --git a/salt/openbook/ci/files/openbook.redhat.start b/salt/openbook/ci/files/openbook.redhat.start
new file mode 100644
index 0000000..d4e4937
--- /dev/null
+++ b/salt/openbook/ci/files/openbook.redhat.start
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# openbook
+#
+# chkconfig: 2345 10 90
+# description: Manage the Openbook application
+#
+### BEGIN INIT INFO
+# Provides: openbook
+# Required-Start: docker
+# Required-Stop: docker
+# Short-Description: Bring up/down networking
+# Description: Manage the Openbook application
+### END INIT INFO
+
+case $1 in
+    start*)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} start
+        ;;
+    stop*)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} stop
+        ;;
+    *)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} help
+        ;;
+esac
diff --git a/salt/openbook/ci/files/openbook.ubuntu b/salt/openbook/ci/files/openbook.ubuntu
deleted file mode 100644
index 6c50c76..0000000
--- a/salt/openbook/ci/files/openbook.ubuntu
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          openbook
-# Required-Start:    docker
-# Required-Stop:     docker
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Manage the Openbook application
-### END INIT INFO
-
-case $1 in
-    start*)
-        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} start
-        ;;
-    debug*)
-        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} debug
-        ;;
-    stop*)
-        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} stop
-        ;;
-    test_database*)
-        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} test_database
-        ;;
-    *)
-        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} help
-        ;;
-esac
diff --git a/salt/openbook/ci/files/openbook.ubuntu.debug b/salt/openbook/ci/files/openbook.ubuntu.debug
new file mode 100644
index 0000000..b99726f
--- /dev/null
+++ b/salt/openbook/ci/files/openbook.ubuntu.debug
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          openbook
+# Required-Start:    docker
+# Required-Stop:     docker
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Manage the Openbook application
+### END INIT INFO
+
+case $1 in
+    start*)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} debug
+        ;;
+    stop*)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} stop
+        ;;
+    *)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} help
+        ;;
+esac
diff --git a/salt/openbook/ci/files/openbook.ubuntu.start b/salt/openbook/ci/files/openbook.ubuntu.start
new file mode 100644
index 0000000..51141e5
--- /dev/null
+++ b/salt/openbook/ci/files/openbook.ubuntu.start
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          openbook
+# Required-Start:    docker
+# Required-Stop:     docker
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Manage the Openbook application
+### END INIT INFO
+
+case $1 in
+    start*)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} start
+        ;;
+    stop*)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} stop
+        ;;
+    *)
+        {{ pillar["ansible"]["dirs"]["output"]["name"] }}/{{ pillar["ci"]["files"]["openbookctl"]["name"] }} help
+        ;;
+esac
-- 
cgit v1.3