4 files changed, 51 insertions, 1 deletions
diff --git a/pillar/openbook/ansible.sls b/pillar/openbook/ansible.sls
index 4769452..01fee63 100644
--- a/pillar/openbook/ansible.sls
+++ b/pillar/openbook/ansible.sls
@@ -39,6 +39,12 @@ ansible:
       mode: "0644"
       relative_to_buildroot: True
       is_template: False
+    playbooks_stop_start_openbook_yaml:
+      name: playbooks/stop_start_openbook.yaml
+      source: stop_start_openbook.yaml
+      mode: "0644"
+      relative_to_buildroot: True
+      is_template: False
     playbooks_salt_yaml:
       name: playbooks/salt.yaml
       source: salt.yaml
@@ -237,6 +243,12 @@ ansible:
       mode: "0644"
       relative_to_buildroot: True
       is_template: False
+    openbook_stop_start_yaml:
+      name: openbook_stop_start.yaml
+      source: openbook_stop_start.yaml
+      mode: "0644"
+      relative_to_buildroot: True
+      is_template: False
     find_next_tag_sh:
       name: /var/lib/jenkins/find_next_tag.sh
       source: find_next_tag.sh
diff --git a/salt/openbook/ansible/files/openbook.yaml b/salt/openbook/ansible/files/openbook.yaml
index 81addbd..b6f4c21 100644
--- a/salt/openbook/ansible/files/openbook.yaml
+++ b/salt/openbook/ansible/files/openbook.yaml
@@ -162,7 +162,7 @@
       shell: |
         /etc/init.d/openbook stop
         for cont in $(docker ps | grep -v 'COMMAND' | awk '{print $1}'); do
-            docker stop $cont
+            docker stop ${cont}
         done
         docker container prune -f
 
diff --git a/salt/openbook/ansible/files/openbook_stop_start.yaml b/salt/openbook/ansible/files/openbook_stop_start.yaml
new file mode 100644
index 0000000..045f7a9
--- /dev/null
+++ b/salt/openbook/ansible/files/openbook_stop_start.yaml
@@ -0,0 +1,10 @@
+---
+###
+# Use this paybook to stop, start and restart openbook cleanly.
+#
+# Required variables to be passed in the command line via -e:
+#   action=[stop|start|restart]
+###
+
+- name: "Stop/Start Openbook"
+  include: playbooks/stop_start_openbook.yaml
diff --git a/salt/openbook/ansible/files/stop_start_openbook.yaml b/salt/openbook/ansible/files/stop_start_openbook.yaml
new file mode 100644
index 0000000..83c1d57
--- /dev/null
+++ b/salt/openbook/ansible/files/stop_start_openbook.yaml
@@ -0,0 +1,28 @@
+---
+- 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: "Stop Openbook"
+  hosts: "{{ groups['target']|sort(reverse=True) }}"
+  serial: 1
+  tasks:
+    - name: "Stop Openbook"
+      shell: |
+        /etc/init.d/openbook stop
+        for cont in $(docker ps | grep -v 'COMMAND' | awk '{print $1}'); do
+            docker stop ${cont}
+        done
+        docker container prune -f
+      when: action == "stop"
+
+- name: "Start Openbook"
+  hosts: "{{ groups['target']|sort }}"
+  serial: 1
+  tasks:
+    - name: "Start Openbook"
+      shell: /etc/init.d/openbook start
+      when: action == "start"