From dcd418c2fcfb23f9b538f2b7ddcbc2840e524565 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Fri, 22 Sep 2017 08:44:49 -0600 Subject: new microservices --- salt/openbook/ci/files/build.sh | 5 ++++- salt/openbook/ci/files/openbookctl | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'salt/openbook/ci') diff --git a/salt/openbook/ci/files/build.sh b/salt/openbook/ci/files/build.sh index b225c85..fe59a02 100644 --- a/salt/openbook/ci/files/build.sh +++ b/salt/openbook/ci/files/build.sh @@ -18,9 +18,12 @@ docker login --username {{ pillar["registry"]["username"] }} --password {{ pilla {{ pillar["baseimage"]["build_dir"] }}/build.sh {{ pillar["database"]["build_dir"] }}/build.sh -{{ pillar["api_server"]["build_dir"] }}/build.sh +{{ pillar["admin_api_server"]["build_dir"] }}/build.sh +{{ pillar["customer_api_server"]["build_dir"] }}/build.sh {{ pillar["admin_web_ui"]["build_dir"] }}/build.sh {{ pillar["customer_web_ui"]["build_dir"] }}/build.sh +{{ pillar["job_scheduler_server"]["build_dir"] }}/build.sh +{{ pillar["workflow_server"]["build_dir"] }}/build.sh popd 2>/dev/null exit 0 diff --git a/salt/openbook/ci/files/openbookctl b/salt/openbook/ci/files/openbookctl index 894368d..cc014ff 100644 --- a/salt/openbook/ci/files/openbookctl +++ b/salt/openbook/ci/files/openbookctl @@ -33,7 +33,10 @@ do_start() { {{ pillar["ansible"]["dirs"]["output"]["name"] }}/database/run.sh wait_for_database ensure_openbook_databases_created - {{ pillar["ansible"]["dirs"]["output"]["name"] }}/api_server/run.sh + {{ pillar["ansible"]["dirs"]["output"]["name"] }}/job_scheduler_server/run.sh + {{ pillar["ansible"]["dirs"]["output"]["name"] }}/workflow_server/run.sh + {{ pillar["ansible"]["dirs"]["output"]["name"] }}/admin_api_server/run.sh + {{ pillar["ansible"]["dirs"]["output"]["name"] }}/customer_api_server/run.sh {{ pillar["ansible"]["dirs"]["output"]["name"] }}/admin_web_ui/run.sh {{ pillar["ansible"]["dirs"]["output"]["name"] }}/customer_web_ui/run.sh echo @@ -54,7 +57,10 @@ do_start() { do_stop() { docker stop {{ pillar["customer_web_ui"]["container_name"] }} docker stop {{ pillar["admin_web_ui"]["container_name"] }} - docker stop {{ pillar["api_server"]["container_name"] }} + docker stop {{ pillar["customer_api_server"]["container_name"] }} + docker stop {{ pillar["admin_api_server"]["container_name"] }} + docker stop {{ pillar["workflow_server"]["container_name"] }} + docker stop {{ pillar["job_scheduler_server"]["container_name"] }} docker stop {{ pillar["database"]["container_name"] }} docker container prune -f } -- cgit v1.3