diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-09-29 13:58:05 -0600 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-09-29 13:58:05 -0600 |
| commit | b0318621f703215fb8d05067832c1c4615d7bb66 (patch) | |
| tree | f72d17b6d4c681b0c3e346f86b14aeb6a2ec2f60 | |
| parent | 72ef38179b671424e65327825103f9159b1107cb (diff) | |
making database container optional
| -rw-r--r-- | salt/openbook/ci/files/openbookctl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/salt/openbook/ci/files/openbookctl b/salt/openbook/ci/files/openbookctl index 1ba56b2..6a6770d 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" == openbook_install_database %}{% endraw %} +{% raw %}{% if "True" == openbook_install_database|string() %}{% 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" == openbook_install_database %}{% endraw %} +{% raw %}{% if "True" == openbook_install_database|string() %}{% 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" == openbook_install_database %}{% endraw %} +{% raw %}{% if "True" == openbook_install_database|string() %}{% 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" == openbook_install_database %}{% endraw %} +{% raw %}{% if "True" == openbook_install_database|string() %}{% endraw %} echo " $0 test_database" {% raw %}{% endif %}{% endraw %} } @@ -88,7 +88,7 @@ case $1 in stop*) do_stop ;; -{% raw %}{% if "True" == openbook_install_database %}{% endraw %} +{% raw %}{% if "True" == openbook_install_database|string() %}{% endraw %} test_database*) wait_for_database echo "Database is up." |