diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-09-29 12:55:55 -0600 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-09-29 12:55:55 -0600 |
| commit | 9434ea788095233294092243393d348a22905aff (patch) | |
| tree | 1fa584b2201a01e938f6dd6e68b10c16816407d3 | |
| parent | c0b7e710633b7466d59d3dc3910142034efbaf68 (diff) | |
making database container optional
| -rw-r--r-- | salt/openbook/ci/files/openbookctl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/salt/openbook/ci/files/openbookctl b/salt/openbook/ci/files/openbookctl index 4d87c3d..a12fa80 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 is True %}{% endraw %} +{% raw %}{% if openbook_install_database is defined %}{% 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 is True %}{% endraw %} +{% raw %}{% if openbook_install_database is defined %}{% 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 @@ -76,7 +76,7 @@ do_help() { echo "Usage:" echo " $0 start" echo " $0 stop" -{% raw %}{% if openbook_install_database is True %}{% endraw %} +{% raw %}{% if openbook_install_database is defined %}{% endraw %} echo " $0 test_database" {% raw %}{% endif %}{% endraw %} } @@ -88,7 +88,7 @@ case $1 in stop*) do_stop ;; -{% raw %}{% if openbook_install_database is True %}{% endraw %} +{% raw %}{% if openbook_install_database is defined %}{% endraw %} test_database*) wait_for_database echo "Database is up." |