diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-09-29 14:08:50 -0600 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-09-29 14:08:50 -0600 |
| commit | ca5e30661204a2da2c6fc017ea2359df4b15af4b (patch) | |
| tree | 45bf78105ad1fa484be28b018f1f44fe5bb27050 | |
| parent | b0318621f703215fb8d05067832c1c4615d7bb66 (diff) | |
making database containers optional
| -rwxr-xr-x | build-docker-containers.sh | 32 | ||||
| -rw-r--r-- | salt/openbook/ansible/files/env.yaml.openbook.example | 9 |
2 files changed, 25 insertions, 16 deletions
diff --git a/build-docker-containers.sh b/build-docker-containers.sh index 50df7e0..5627f32 100755 --- a/build-docker-containers.sh +++ b/build-docker-containers.sh @@ -2,20 +2,20 @@ buildroot="$(pwd)" -# # clean docker containers -# if [ -x ${buildroot}/docker_build/ci/openbookctl ]; then -# sudo ${buildroot}/docker_build/ci/openbookctl stop -# fi -# for i in $(sudo docker ps | grep -v 'COMMAND' | grep -v 'database' | awk '{print $1}'); do -# sudo docker stop $i -# done -# for i in $(sudo docker ps | grep -v 'COMMAND' | grep -F 'database' | awk '{print $1}'); do -# sudo docker stop $i -# done -# sudo docker container prune -f -# for i in $(sudo docker images | grep -v 'REPOSITORY' | awk '{print $3}'); do -# sudo docker rmi --force $i -# done +# clean docker containers +if [ -x ${buildroot}/docker_build/ci/openbookctl ]; then + sudo ${buildroot}/docker_build/ci/openbookctl stop +fi +for i in $(sudo docker ps | grep -v 'COMMAND' | grep -v 'database' | awk '{print $1}'); do + sudo docker stop $i +done +for i in $(sudo docker ps | grep -v 'COMMAND' | grep -F 'database' | awk '{print $1}'); do + sudo docker stop $i +done +sudo docker container prune -f +for i in $(sudo docker images | grep -v 'REPOSITORY' | awk '{print $3}'); do + sudo docker rmi --force $i +done # clean the build files rm -rf ${HOME}/openbook-v4-installer @@ -27,8 +27,8 @@ cp ${HOME}/config.yaml /srv/bootstrap/ # run salt to create build scripts sudo /srv/bootstrap/run_salt.sh -# # build new docker containers -# sudo /root/openbook_build/ci/build.sh +# build new docker containers +sudo /root/openbook_build/ci/build.sh # refresh openbook-v4-installer repo (ansible playbook) pushd ${HOME} diff --git a/salt/openbook/ansible/files/env.yaml.openbook.example b/salt/openbook/ansible/files/env.yaml.openbook.example index b8971e3..9a3bde5 100644 --- a/salt/openbook/ansible/files/env.yaml.openbook.example +++ b/salt/openbook/ansible/files/env.yaml.openbook.example @@ -3,9 +3,18 @@ globals: ansible_ssh_user: root ansible_python_interpreter: /usr/bin/python2 openbook_gcomm_addresses: ~ + openbook_install_database: True|False hosts: - host1: openbook_database_password: ~ + openbook_customer_web_ui_port: 8080 + openbook_customer_api_server_port: 8081 + openbook_admin_web_ui_port: 8082 + openbook_admin_api_server_port: 8083 - host2: openbook_database_password: ~ + openbook_customer_web_ui_port: 8080 + openbook_customer_api_server_port: 8081 + openbook_admin_web_ui_port: 8082 + openbook_admin_api_server_port: 8083 |