diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-09-29 12:52:42 -0600 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-09-29 12:52:42 -0600 |
| commit | c0b7e710633b7466d59d3dc3910142034efbaf68 (patch) | |
| tree | 5837e189a5ffcc687d4350b8846ed4cd523cee83 /salt | |
| parent | 813d80163e4c1be168a5777bdeca70e6f9a61cf0 (diff) | |
making database container optional
Diffstat (limited to 'salt')
| -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 96eb30a..4d87c3d 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 openbook_install_database == "True" %}{% endraw %} +{% raw %}{% if openbook_install_database is True %}{% 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 openbook_install_database == "True" %}{% endraw %} +{% raw %}{% if openbook_install_database is True %}{% 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 openbook_install_database == "True" %}{% endraw %} +{% raw %}{% if openbook_install_database is True %}{% 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 openbook_install_database == "True" %}{% endraw %} +{% raw %}{% if openbook_install_database is True %}{% endraw %} echo " $0 test_database" {% raw %}{% endif %}{% endraw %} } @@ -88,7 +88,7 @@ case $1 in stop*) do_stop ;; -{% raw %}{% if openbook_install_database == "True" %}{% endraw %} +{% raw %}{% if openbook_install_database is True %}{% endraw %} test_database*) wait_for_database echo "Database is up." |