From 72ef38179b671424e65327825103f9159b1107cb Mon Sep 17 00:00:00 2001
From: Carlos Konstanski <ckonstanski@pippiandcarlos.com>
Date: Fri, 29 Sep 2017 13:52:18 -0600
Subject: making database container optional

---
 salt/openbook/ci/files/openbookctl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/salt/openbook/ci/files/openbookctl b/salt/openbook/ci/files/openbookctl
index 632b342..1ba56b2 100644
--- a/salt/openbook/ci/files/openbookctl
+++ b/salt/openbook/ci/files/openbookctl
@@ -4,7 +4,7 @@ echo 'mysql root password: {% raw %}{{ openbook_database_password }}{% endraw %}
 echo 'wsrep_node_address: {% raw %}{{ ansible_default_ipv4.address }}{% endraw %}'
 echo 'wsrep_cluster_address: gcomm://{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}'
 
-{% raw %}{% if "True" in openbook_install_database %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_database %}{% endraw %}
 wait_for_database() {
     echo "Waiting for database to start..."
     started=1
@@ -30,7 +30,7 @@ ensure_openbook_databases_created() {
 {% raw %}{% endif %}{% endraw %}
 
 do_start() {
-{% raw %}{% if "True" in openbook_install_database %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_database %}{% endraw %}
     chmod 777 {{ pillar["database"]["dirs"]["var_lib_mysql"]["name"] }}
     chmod 777 {{ pillar["database"]["dirs"]["var_log_mysql"]["name"] }}
     {{ pillar["ansible"]["dirs"]["output"]["name"] }}/database/run.sh
@@ -66,7 +66,7 @@ do_stop() {
     docker stop {{ pillar["admin_api_server"]["container_name"] }}
     docker stop {{ pillar["workflow_server"]["container_name"] }}
     docker stop {{ pillar["job_scheduler_server"]["container_name"] }}
-{% raw %}{% if "True" in openbook_install_database %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_database %}{% endraw %}
     docker stop {{ pillar["database"]["container_name"] }}
 {% raw %}{% endif %}{% endraw %}
     docker container prune -f
@@ -76,7 +76,7 @@ do_help() {
     echo "Usage:"
     echo "    $0 start"
     echo "    $0 stop"
-{% raw %}{% if "True" in openbook_install_database %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_database %}{% endraw %}
     echo "    $0 test_database"
 {% raw %}{% endif %}{% endraw %}
 }
@@ -88,7 +88,7 @@ case $1 in
     stop*)
         do_stop
         ;;
-{% raw %}{% if "True" in openbook_install_database %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_database %}{% endraw %}
     test_database*)
         wait_for_database
         echo "Database is up."
-- 
cgit v1.3