diff options
| -rw-r--r-- | bootstrap/config.yaml.example | 4 | ||||
| -rw-r--r-- | salt/openbook/admin_api_server/files/run.sh | 2 | ||||
| -rw-r--r-- | salt/openbook/admin_web_ui/files/run.sh | 2 | ||||
| -rw-r--r-- | salt/openbook/ci/files/openbookctl | 7 | ||||
| -rw-r--r-- | salt/openbook/customer_api_server/files/run.sh | 2 | ||||
| -rw-r--r-- | salt/openbook/customer_web_ui/files/run.sh | 2 | ||||
| -rw-r--r-- | salt/openbook/database/files/Dockerfile | 2 | ||||
| -rw-r--r-- | salt/openbook/database/files/run.sh | 2 | ||||
| -rw-r--r-- | salt/openbook/job_scheduler_server/files/run.sh | 2 | ||||
| -rw-r--r-- | salt/openbook/workflow_server/files/run.sh | 2 |
10 files changed, 12 insertions, 15 deletions
diff --git a/bootstrap/config.yaml.example b/bootstrap/config.yaml.example index c68d232..ffadfd0 100644 --- a/bootstrap/config.yaml.example +++ b/bootstrap/config.yaml.example @@ -6,7 +6,3 @@ jars: url: ~ username: ~ password: ~ -admin_api_server: - port: 8081 -customer_api_server: - port: 8083 diff --git a/salt/openbook/admin_api_server/files/run.sh b/salt/openbook/admin_api_server/files/run.sh index 1f5df60..09f3c76 100644 --- a/salt/openbook/admin_api_server/files/run.sh +++ b/salt/openbook/admin_api_server/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --net=host -v {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} -v {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} --name {{ pillar["admin_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }} +docker run -d --net=host -p {% raw %}{{ openbook_admin_api_server_port }}{% endraw %}:8083 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["etc_openbook_admin_api_server"]["name"] }} -v {{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }}:{{ pillar["admin_api_server"]["dirs"]["var_log_openbook_admin_api_server"]["name"] }} --name {{ pillar["admin_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_api_server"]["image_name"] }} exit 0 diff --git a/salt/openbook/admin_web_ui/files/run.sh b/salt/openbook/admin_web_ui/files/run.sh index 9669172..1782f0f 100644 --- a/salt/openbook/admin_web_ui/files/run.sh +++ b/salt/openbook/admin_web_ui/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --net=host -v {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} -v {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} --name {{ pillar["admin_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }} +docker run -d --net=host -p {% raw %}{{ openbook_admin_web_ui_port }}{% endraw %}:8082 -p 5701:5701 -p 5702:5702 -v {{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["etc_openbook_admin_web_ui"]["name"] }} -v {{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }}:{{ pillar["admin_web_ui"]["dirs"]["var_log_openbook_admin_web_ui"]["name"] }} --name {{ pillar["admin_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["admin_web_ui"]["image_name"] }} exit 0 diff --git a/salt/openbook/ci/files/openbookctl b/salt/openbook/ci/files/openbookctl index cc014ff..0a6aac8 100644 --- a/salt/openbook/ci/files/openbookctl +++ b/salt/openbook/ci/files/openbookctl @@ -49,9 +49,10 @@ do_start() { echo "When the output looks like the following, the node is fully initialized:" echo "(Your PIDs will vary)" echo - echo "java 27424 root 73u IPv6 65463 0t0 TCP *:8080 (LISTEN)" - echo "java 27264 root 73u IPv6 65430 0t0 TCP *:8081 (LISTEN)" - echo "java 27349 root 73u IPv6 65430 0t0 TCP *:8082 (LISTEN)" + echo "java 10349 root 98u IPv6 1128362 0t0 TCP *:8083 (LISTEN)" + echo "java 10413 root 98u IPv6 1129955 0t0 TCP *:8081 (LISTEN)" + echo "java 10472 root 88u IPv6 1129171 0t0 TCP *:8082 (LISTEN)" + echo "java 10542 root 88u IPv6 1129173 0t0 TCP *:8080 (LISTEN)" } do_stop() { diff --git a/salt/openbook/customer_api_server/files/run.sh b/salt/openbook/customer_api_server/files/run.sh index 11156c5..cbdcd03 100644 --- a/salt/openbook/customer_api_server/files/run.sh +++ b/salt/openbook/customer_api_server/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --net=host -v {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} -v {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} --name {{ pillar["customer_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }} +docker run -d --net=host -p {% raw %}{{ openbook_customer_api_server_port }}{% endraw %}:8081 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["etc_openbook_customer_api_server"]["name"] }} -v {{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }}:{{ pillar["customer_api_server"]["dirs"]["var_log_openbook_customer_api_server"]["name"] }} --name {{ pillar["customer_api_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_api_server"]["image_name"] }} exit 0 diff --git a/salt/openbook/customer_web_ui/files/run.sh b/salt/openbook/customer_web_ui/files/run.sh index ce6b485..c1f1f06 100644 --- a/salt/openbook/customer_web_ui/files/run.sh +++ b/salt/openbook/customer_web_ui/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --net=host -v {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} -v {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} --name {{ pillar["customer_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }} +docker run -d --net=host -p {% raw %}{{ openbook_customer_web_ui_port }}{% endraw %}:8080 -p 5701:5701 -p 5702:5702 -v {{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["etc_openbook_customer_web_ui"]["name"] }} -v {{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }}:{{ pillar["customer_web_ui"]["dirs"]["var_log_openbook_customer_web_ui"]["name"] }} --name {{ pillar["customer_web_ui"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["customer_web_ui"]["image_name"] }} exit 0 diff --git a/salt/openbook/database/files/Dockerfile b/salt/openbook/database/files/Dockerfile index 3e7848e..d674c68 100644 --- a/salt/openbook/database/files/Dockerfile +++ b/salt/openbook/database/files/Dockerfile @@ -1,7 +1,7 @@ FROM {{ pillar["baseimage"]["image_name"] }} MAINTAINER Carlos Konstanski <carlos@talligent.com> ADD docker-start.tar.xz / -EXPOSE 3306 4444 4567 4567/udp 4568 +EXPOSE 3306 4444 4567 4567/udp 4568 9200 VOLUME /etc/mysql VOLUME /var/lib/mysql VOLUME /var/log/mysql diff --git a/salt/openbook/database/files/run.sh b/salt/openbook/database/files/run.sh index a956c28..f9966ca 100644 --- a/salt/openbook/database/files/run.sh +++ b/salt/openbook/database/files/run.sh @@ -18,6 +18,6 @@ else mysql_args="--wsrep-new-cluster" fi -docker run -d --net=host -v {{ pillar["database"]["dirs"]["etc_openbook_database"]["name"] }}:/etc/mysql -v {{ pillar["database"]["dirs"]["var_lib_mysql"]["name"] }}:/var/lib/mysql -v {{ pillar["database"]["dirs"]["var_log_mysql"]["name"] }}:/var/log/mysql --name {{ pillar["database"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["database"]["image_name"] }} ${mysql_args} +docker run -d --net=host -p 3306:3306 -p 4444:4444 -p 4567:4567 -p 4567:4567/udp -p 4568:4568 -p 9200:9200 -v {{ pillar["database"]["dirs"]["etc_openbook_database"]["name"] }}:/etc/mysql -v {{ pillar["database"]["dirs"]["var_lib_mysql"]["name"] }}:/var/lib/mysql -v {{ pillar["database"]["dirs"]["var_log_mysql"]["name"] }}:/var/log/mysql --name {{ pillar["database"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["database"]["image_name"] }} ${mysql_args} exit 0 diff --git a/salt/openbook/job_scheduler_server/files/run.sh b/salt/openbook/job_scheduler_server/files/run.sh index 284bb15..a0fa7e6 100644 --- a/salt/openbook/job_scheduler_server/files/run.sh +++ b/salt/openbook/job_scheduler_server/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --net=host -v {{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }} -v {{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }} --name {{ pillar["job_scheduler_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }} +docker run -d --net=host -p 5701:5701 -p 5702:5702 -v {{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["etc_openbook_job_scheduler_server"]["name"] }} -v {{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }}:{{ pillar["job_scheduler_server"]["dirs"]["var_log_openbook_job_scheduler_server"]["name"] }} --name {{ pillar["job_scheduler_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["job_scheduler_server"]["image_name"] }} exit 0 diff --git a/salt/openbook/workflow_server/files/run.sh b/salt/openbook/workflow_server/files/run.sh index 427a3da..8074abb 100644 --- a/salt/openbook/workflow_server/files/run.sh +++ b/salt/openbook/workflow_server/files/run.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker run -d --net=host -v {{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }} -v {{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }} --name {{ pillar["workflow_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }} +docker run -d --net=host -p 5701:5701 -p 5702:5702 -v {{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["etc_openbook_workflow_server"]["name"] }} -v {{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }}:{{ pillar["workflow_server"]["dirs"]["var_log_openbook_workflow_server"]["name"] }} --name {{ pillar["workflow_server"]["container_name"] }} {{ pillar["registry"]["url"] }}/{{ pillar["workflow_server"]["image_name"] }} exit 0 |