From 4d09cc94201d51076d53b671564598ef96580fdd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Wed, 9 Mar 2022 20:20:47 -0300 Subject: [PATCH] 18663: add keepbalance support MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- .../multi_host/aws/pillars/arvados.sls | 3 +++ .../multiple_hostnames/pillars/arvados.sls | 2 +- .../single_host/single_hostname/pillars/arvados.sls | 3 +++ tools/salt-install/provision.sh | 11 +++-------- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls index f27aa40ac4..06a60ae957 100644 --- a/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls +++ b/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls @@ -157,6 +157,9 @@ arvados: DispatchCloud: InternalURLs: 'http://__CONTROLLER_INT_IP__:9006': {} + Keepbalance: + InternalURLs: + 'http://keep.__CLUSTER__.__DOMAIN__:9005': {} Keepproxy: ExternalURL: 'https://keep.__CLUSTER__.__DOMAIN__:__KEEP_EXT_SSL_PORT__' InternalURLs: diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls index 81d324fcbd..fabbd0a71f 100644 --- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls +++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/arvados.sls @@ -142,7 +142,7 @@ arvados: 'http://__CLUSTER__.__DOMAIN__:9006': {} Keepbalance: InternalURLs: - 'http://__CLUSTER__.__DOMAIN__:9005': {} + 'http://keep.__CLUSTER__.__DOMAIN__:9005': {} Keepproxy: ExternalURL: 'https://keep.__CLUSTER__.__DOMAIN__:__CONTROLLER_EXT_SSL_PORT__' InternalURLs: diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls b/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls index 8b8e4f7f9e..8e4d66caf5 100644 --- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls +++ b/tools/salt-install/config_examples/single_host/single_hostname/pillars/arvados.sls @@ -136,6 +136,9 @@ arvados: ExternalURL: 'https://__HOSTNAME_EXT__:__CONTROLLER_EXT_SSL_PORT__' InternalURLs: 'http://__IP_INT__:8003': {} + Keepbalance: + InternalURLs: + 'http://__IP_INT__:9005': {} Keepproxy: ExternalURL: 'https://__HOSTNAME_EXT__:__KEEP_EXT_SSL_PORT__' InternalURLs: diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index 27dada1eab..7b1d14828a 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -29,6 +29,7 @@ usage() { echo >&2 " controller" echo >&2 " dispatcher" echo >&2 " keepproxy" + echo >&2 " keepbalance" echo >&2 " keepstore" echo >&2 " keepweb" echo >&2 " shell" @@ -107,7 +108,7 @@ arguments() { for i in ${2//,/ } do # Verify the role exists - if [[ ! "database,api,controller,keepstore,websocket,keepweb,workbench2,webshell,keepproxy,shell,workbench,dispatcher" == *"$i"* ]]; then + if [[ ! "database,api,controller,keepstore,websocket,keepweb,workbench2,webshell,keepbalance,keepproxy,shell,workbench,dispatcher" == *"$i"* ]]; then echo "The role '${i}' is not a valid role" usage exit 1 @@ -734,13 +735,7 @@ else # Pillars grep -q "docker" ${P_DIR}/top.sls || echo " - docker" >> ${P_DIR}/top.sls ;; - "dispatcher") - # States - grep -q "arvados.${R}" ${S_DIR}/top.sls || echo " - arvados.${R}" >> ${S_DIR}/top.sls - # Pillars - # ATM, no specific pillar needed - ;; - "keepstore") + "dispatcher" | "keepbalance" | "keepstore") # States grep -q "arvados.${R}" ${S_DIR}/top.sls || echo " - arvados.${R}" >> ${S_DIR}/top.sls # Pillars -- 2.30.2