syncing up with vzw

3 files changed, 29 insertions, 5 deletions

diff --git a/salt/openbook/ansible/files/ob-ctl.sh b/salt/openbook/ansible/files/ob-ctl.sh
new file mode 100644
index 0000000..6a2a108
--- /dev/null
+++ b/salt/openbook/ansible/files/ob-ctl.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+branch="${1}"
+action="${2}"
+buildroot="$(pwd)"
+
+pushd ${buildroot}/conf
+cp ${HOME}/env.yaml.openbook .
+rm -f env.yaml
+ln -s env.yaml.openbook env.yaml
+popd
+pushd ${buildroot}
+ansible-playbook -i inventory_json_${branch}.rb -e "action=${action}" openbook_stop_start.yaml
+popd
diff --git a/salt/openbook/ansible/files/openbook.yaml b/salt/openbook/ansible/files/openbook.yaml
index 15908c6..44a0081 100644
--- a/salt/openbook/ansible/files/openbook.yaml
+++ b/salt/openbook/ansible/files/openbook.yaml
@@ -153,6 +153,16 @@
         runlevel: "{% raw %}{{ item.runlevel }}{% endraw %}"
       with_items:
         - { name: openbook, runlevel: default }
+      when: openbook_install_database|string() == "False"
+
+    - name: "Disable openbook service"
+      service:
+        name: "{% raw %}{{ item.name }}{% endraw %}"
+        enabled: no
+        runlevel: "{% raw %}{{ item.runlevel }}{% endraw %}"
+      with_items:
+        - { name: openbook, runlevel: default }
+      when: openbook_install_database|string() == "True"
 
 - name: "Stop Openbook"
   hosts: "{% raw %}{{ groups['target']|sort(reverse=True) }}{% endraw %}"
diff --git a/salt/openbook/ansible/files/stop_start_openbook.yaml b/salt/openbook/ansible/files/stop_start_openbook.yaml
index 83c1d57..376d1f5 100644
--- a/salt/openbook/ansible/files/stop_start_openbook.yaml
+++ b/salt/openbook/ansible/files/stop_start_openbook.yaml
@@ -2,9 +2,9 @@
 - name: "Verify action to take"
   hosts: localhost
   tasks:
-    - name: "Check that -e 'action=[stop|start]' was passed in"
-      fail: msg="The variable 'action' was not passed in with a value of 'stop' or 'start' on the command line."
-      when: action not in ["stop", "start"]
+    - name: "Check that -e 'action=[stop|start|restart]' was passed in"
+      fail: msg="The variable 'action' was not passed in with a value of 'stop', 'start' or 'restart' on the command line."
+      when: action not in ["stop", "start", "restart"]
 
 - name: "Stop Openbook"
   hosts: "{{ groups['target']|sort(reverse=True) }}"
@@ -17,7 +17,7 @@
             docker stop ${cont}
         done
         docker container prune -f
-      when: action == "stop"
+      when: action in ["stop", "restart"] 
 
 - name: "Start Openbook"
   hosts: "{{ groups['target']|sort }}"
@@ -25,4 +25,4 @@
   tasks:
     - name: "Start Openbook"
       shell: /etc/init.d/openbook start
-      when: action == "start"
+      when: action in ["start", "restart"]