From: Peter Amstutz <peter.amstutz@curii.com>
Date: Mon, 31 Aug 2020 21:37:56 +0000 (-0400)
Subject: Fix redundant entry in cluster config, arvbox tells you to use adduser
X-Git-Tag: 2.1.0~94
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/db13716484018404860275de75d278e0aaa08d8a

Fix redundant entry in cluster config, arvbox tells you to use adduser

refs #16749

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/tools/arvbox/bin/arvbox b/tools/arvbox/bin/arvbox
index 1bd0f3a66c..2d930c5e6d 100755
--- a/tools/arvbox/bin/arvbox
+++ b/tools/arvbox/bin/arvbox
@@ -95,6 +95,10 @@ EOF
     fi
 }
 
+listusers() {
+    docker exec -ti $ARVBOX_CONTAINER /usr/local/lib/arvbox/edit_users.py /var/lib/arvados/cluster_config.yml $(getclusterid) list
+}
+
 wait_for_arvbox() {
     FF=/tmp/arvbox-fifo-$$
     mkfifo $FF
@@ -314,6 +318,11 @@ run() {
             wait_for_arvbox
             echo "The Arvados source code is checked out at: $ARVADOS_ROOT"
 	    echo "The Arvados testing root certificate is $VAR_DATA/root-cert.pem"
+	    if [[ "$(listusers)" =~ ^\{\} ]] ; then
+		echo "No users defined, use 'arvbox adduser' to add user logins"
+	    else
+		echo "Use 'arvbox listusers' to see user logins"
+	    fi
         else
             echo "Unknown configuration '$CONFIG'"
         fi
@@ -630,7 +639,7 @@ EOF
 	;;
 
     listusers)
-	exec docker exec -ti $ARVBOX_CONTAINER /usr/local/lib/arvbox/edit_users.py /var/lib/arvados/cluster_config.yml $(getclusterid) list
+	listusers
 	;;
 
     *)
diff --git a/tools/arvbox/lib/arvbox/docker/cluster-config.sh b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
index 28af50613d..db17780925 100755
--- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh
+++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh
@@ -110,9 +110,6 @@ Clusters:
         ExternalURL: "https://$localip:${services[controller-ssl]}"
         InternalURLs:
           "http://localhost:${services[controller]}": {}
-      RailsAPI:
-        InternalURLs:
-          "http://localhost:${services[api]}/": {}
     PostgreSQL:
       ConnectionPool: 32 # max concurrent connections per arvados server daemon
       Connection: