From 3876e49211f0bf9b83615d2859063eb541d4d92d Mon Sep 17 00:00:00 2001 From: Matthew Erispe Date: Tue, 10 Sep 2024 12:03:23 +0200 Subject: [PATCH] revert deploy placements added during testing --- client-registry-jempi/docker-compose.api-cluster.yml | 8 -------- .../docker-compose.combined-cluster.yml | 12 ------------ client-registry-jempi/swarm.sh | 4 +--- 3 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 client-registry-jempi/docker-compose.api-cluster.yml diff --git a/client-registry-jempi/docker-compose.api-cluster.yml b/client-registry-jempi/docker-compose.api-cluster.yml deleted file mode 100644 index 094dabb8..00000000 --- a/client-registry-jempi/docker-compose.api-cluster.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: "3.9" - -services: - jempi-api-kc: - deploy: - placement: - constraints: - - "node.labels.name==node-2" diff --git a/client-registry-jempi/docker-compose.combined-cluster.yml b/client-registry-jempi/docker-compose.combined-cluster.yml index 2168fa88..9bb46f17 100644 --- a/client-registry-jempi/docker-compose.combined-cluster.yml +++ b/client-registry-jempi/docker-compose.combined-cluster.yml @@ -6,15 +6,3 @@ services: placement: constraints: - "node.labels.name==node-1" - - jempi-em-scala: - deploy: - placement: - constraints: - - "node.labels.name==node-1" - - jempi-async-receiver: - deploy: - placement: - constraints: - - "node.labels.name==node-2" diff --git a/client-registry-jempi/swarm.sh b/client-registry-jempi/swarm.sh index 320236d0..808bdd51 100644 --- a/client-registry-jempi/swarm.sh +++ b/client-registry-jempi/swarm.sh @@ -37,7 +37,6 @@ function initialize_package() { local combined_dev_compose_param="" local combined_cluster_compose_param="" local api_dev_compose_param="" - local api_cluster_compose_param="" local web_dev_compose_param="" local dgraph_cluster_compose_param="" local dgraph_zero_cluster_compose_param="" @@ -57,7 +56,6 @@ function initialize_package() { dgraph_cluster_compose_param="docker-compose.dgraph-cluster.yml" dgraph_zero_cluster_compose_param="docker-compose.dgraph-zero-cluster.yml" combined_cluster_compose_param="docker-compose.combined-cluster.yml" - api_cluster_compose_param="docker-compose.api-cluster.yml" fi ( @@ -79,7 +77,7 @@ function initialize_package() { docker::deploy_service $STACK "${COMPOSE_FILE_PATH}" "docker-compose.combined.yml" "$combined_dev_compose_param" "$combined_cluster_compose_param" log info "Deploy JeMPI API" - docker::deploy_service $STACK "${COMPOSE_FILE_PATH}" "docker-compose.api.yml" "$api_dev_compose_param" "$api_cluster_compose_param" + docker::deploy_service $STACK "${COMPOSE_FILE_PATH}" "docker-compose.api.yml" "$api_dev_compose_param" log info "Deploy JeMPI WEB" docker::deploy_service $STACK "${COMPOSE_FILE_PATH}" "docker-compose.web.yml" "$web_dev_compose_param"