Deploy containers on specific nodes

8 files changed, 70 insertions, 28 deletions

diff --git a/salt/openbook/admin_api_server/files/admin_api_server.json b/salt/openbook/admin_api_server/files/admin_api_server.json
index 666272a..ccdb6ef 100644
--- a/salt/openbook/admin_api_server/files/admin_api_server.json
+++ b/salt/openbook/admin_api_server/files/admin_api_server.json
@@ -8,9 +8,13 @@
 {% endraw %}
 
 {
-    "log.path": "{{ pillar["admin_api_server"]["log"] }}",
-    "entityDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook",
-    "workflowDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook_workflow",
-    "jobsDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook_jobs",
-    "application.port": 8083
+    "log.path": "{{ pillar["admin_api_server"]["log"] }}"
+{% raw %}
+{% if "True" == openbook_install_admin_api_server|string() %}
+    ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook"
+    ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow"
+    ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs"
+    ,"application.port": {{ openbook_admin_api_server_port }}
+{% endif %}
+{% endraw %}
 }
diff --git a/salt/openbook/admin_web_ui/files/admin_web_ui.json b/salt/openbook/admin_web_ui/files/admin_web_ui.json
index 6008b92..a1c1632 100644
--- a/salt/openbook/admin_web_ui/files/admin_web_ui.json
+++ b/salt/openbook/admin_web_ui/files/admin_web_ui.json
@@ -1,3 +1,8 @@
 {
     "log.path": "{{ pillar["admin_web_ui"]["log"] }}"
+{% raw %}
+{% if "True" == openbook_install_admin_web_ui|string() %}
+    ,"application.port": {{ openbook_admin_web_ui_port }}
+{% endif %}
+{% endraw %}
 }
diff --git a/salt/openbook/ansible/files/env.yaml.openbook.example b/salt/openbook/ansible/files/env.yaml.openbook.example
index a82bf04..9fd4894 100644
--- a/salt/openbook/ansible/files/env.yaml.openbook.example
+++ b/salt/openbook/ansible/files/env.yaml.openbook.example
@@ -13,9 +13,13 @@ hosts:
       openbook_customer_api_server_port: 8081
       openbook_admin_web_ui_port: 8082
       openbook_admin_api_server_port: 8083
+      openbook_job_server: True|False
+      openbook_workflow_server: True|False
   - 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
+      openbook_job_server: True|False
+      openbook_workflow_server: True|False
diff --git a/salt/openbook/ci/files/openbookctl b/salt/openbook/ci/files/openbookctl
index 6a6770d..57aefb4 100644
--- a/salt/openbook/ci/files/openbookctl
+++ b/salt/openbook/ci/files/openbookctl
@@ -37,35 +37,47 @@ do_start() {
     wait_for_database
     ensure_openbook_databases_created
 {% raw %}{% endif %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_job_scheduler_server|string() %}{% endraw %}
     {{ pillar["ansible"]["dirs"]["output"]["name"] }}/job_scheduler_server/run.sh
+{% raw %}{% endif %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_workflow_server|string() %}{% endraw %}
     {{ pillar["ansible"]["dirs"]["output"]["name"] }}/workflow_server/run.sh
+{% raw %}{% endif %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_admin_api_server|string() %}{% endraw %}
     {{ pillar["ansible"]["dirs"]["output"]["name"] }}/admin_api_server/run.sh
+{% raw %}{% endif %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_customer_api_server|string() %}{% endraw %}
     {{ pillar["ansible"]["dirs"]["output"]["name"] }}/customer_api_server/run.sh
+{% raw %}{% endif %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_admin_web_ui|string() %}{% endraw %}
     {{ pillar["ansible"]["dirs"]["output"]["name"] }}/admin_web_ui/run.sh
+{% raw %}{% endif %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_customer_web_ui|string() %}{% endraw %}
     {{ pillar["ansible"]["dirs"]["output"]["name"] }}/customer_web_ui/run.sh
+{% raw %}{% endif %}{% endraw %}
     echo
     echo "Openbook started. All components may not be fully initialized and available."
-    echo "It is highly recommended to wait until initialization is complete before"
-    echo "starting the next node in the cluster. To monitor the state, run:"
-    echo
-    echo "watch -n 5 \"lsof -i -n -P 2>/dev/null | fgrep '*:808'\""
-    echo
-    echo "When the output looks like the following, the node is fully initialized:"
-    echo "(Your PIDs will vary)"
-    echo
-    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() {
+{% raw %}{% if "True" == openbook_install_customer_web_ui|string() %}{% endraw %}
     docker stop {{ pillar["customer_web_ui"]["container_name"] }}
+{% raw %}{% endif %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_admin_web_ui|string() %}{% endraw %}
     docker stop {{ pillar["admin_web_ui"]["container_name"] }}
+{% raw %}{% endif %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_customer_api_server|string() %}{% endraw %}
     docker stop {{ pillar["customer_api_server"]["container_name"] }}
+{% raw %}{% endif %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_admin_api_server|string() %}{% endraw %}
     docker stop {{ pillar["admin_api_server"]["container_name"] }}
+{% raw %}{% endif %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_workflow_server|string() %}{% endraw %}
     docker stop {{ pillar["workflow_server"]["container_name"] }}
+{% raw %}{% endif %}{% endraw %}
+{% raw %}{% if "True" == openbook_install_job_scheduler_server|string() %}{% endraw %}
     docker stop {{ pillar["job_scheduler_server"]["container_name"] }}
+{% raw %}{% endif %}{% endraw %}
 {% raw %}{% if "True" == openbook_install_database|string() %}{% endraw %}
     docker stop {{ pillar["database"]["container_name"] }}
 {% raw %}{% endif %}{% endraw %}
diff --git a/salt/openbook/customer_api_server/files/customer_api_server.json b/salt/openbook/customer_api_server/files/customer_api_server.json
index cb5f1f4..e471e81 100644
--- a/salt/openbook/customer_api_server/files/customer_api_server.json
+++ b/salt/openbook/customer_api_server/files/customer_api_server.json
@@ -8,9 +8,13 @@
 {% endraw %}
 
 {
-    "log.path": "{{ pillar["customer_api_server"]["log"] }}",
-    "entityDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook",
-    "workflowDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook_workflow",
-    "jobsDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook_jobs",
-    "application.port": 8081
+    "log.path": "{{ pillar["customer_api_server"]["log"] }}"
+{% raw %}
+{% if "True" == openbook_install_customer_api_server|string() %}
+    ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook"
+    ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow"
+    ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs"
+    ,"application.port": {{ openbook_customer_api_server_port }}
+{% endif %}
+{% endraw %}
 }
diff --git a/salt/openbook/customer_web_ui/files/customer_web_ui.json b/salt/openbook/customer_web_ui/files/customer_web_ui.json
index db06bc4..94e7c19 100644
--- a/salt/openbook/customer_web_ui/files/customer_web_ui.json
+++ b/salt/openbook/customer_web_ui/files/customer_web_ui.json
@@ -1,3 +1,8 @@
 {
     "log.path": "{{ pillar["customer_web_ui"]["log"] }}"
+{% raw %}
+{% if "True" == openbook_install_customer_web_ui|string() %}
+    ,"application.port": {{ openbook_customer_web_ui_port }}
+{% endif %}
+{% endraw %}
 }
diff --git a/salt/openbook/job_scheduler_server/files/job_scheduler_server.json b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json
index cd64da9..2e9c251 100644
--- a/salt/openbook/job_scheduler_server/files/job_scheduler_server.json
+++ b/salt/openbook/job_scheduler_server/files/job_scheduler_server.json
@@ -8,7 +8,11 @@
 {% endraw %}
 
 {
-    "log.path": "{{ pillar["job_scheduler_server"]["log"] }}",
-    "entityDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook",
-    "jobsDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook_jobs"
+    "log.path": "{{ pillar["job_scheduler_server"]["log"] }}"
+{% raw %}
+{% if "True" == openbook_install_job_scheduler_server|string() %}
+    ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook"
+    ,"jobsDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_jobs"
+{% endif %}
+{% endraw %}
 }
diff --git a/salt/openbook/workflow_server/files/workflow_server.json b/salt/openbook/workflow_server/files/workflow_server.json
index b266fe7..604e8bf 100644
--- a/salt/openbook/workflow_server/files/workflow_server.json
+++ b/salt/openbook/workflow_server/files/workflow_server.json
@@ -8,7 +8,11 @@
 {% endraw %}
 
 {
-    "log.path": "{{ pillar["workflow_server"]["log"] }}",
-    "entityDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook",
-    "workflowDS.url": "jdbc:mariadb:{% raw %}{{ failover }}{% endraw %}//{% raw %}{{ openbook_gcomm_addresses }}{% endraw %}/openbook_workflow"
+    "log.path": "{{ pillar["workflow_server"]["log"] }}"
+{% raw %}
+{% if "True" == openbook_install_workflow_serverr|string() %}
+    ,"entityDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook"
+    ,"workflowDS.url": "jdbc:mariadb:{{ failover }}//{{ openbook_gcomm_addresses }}/openbook_workflow"
+{% endif %}
+{% endraw %}
 }