From: Peter Amstutz <peter.amstutz@curii.com>
Date: Fri, 9 Oct 2020 22:52:14 +0000 (-0400)
Subject: Setup default VM from AutoSetupNewUsersWithVmUUID refs #16989
X-Git-Tag: 2.1.0~3
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6440951d141dbb7ec953a90f0bd5d7f47035707d

Setup default VM from AutoSetupNewUsersWithVmUUID refs #16989

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

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index 57fe4f055d..f8cc78c1d7 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -221,6 +221,11 @@ SELECT target_uuid, perm_level
 
     group_perm = create_user_group_link
     repo_perm = create_user_repo_link repo_name
+
+    if vm_uuid.nil? and !Rails.configuration.Users.AutoSetupNewUsersWithVmUUID.empty?
+      vm_uuid = Rails.configuration.Users.AutoSetupNewUsersWithVmUUID
+    end
+
     vm_login_perm = create_vm_login_permission_link(vm_uuid, username) if vm_uuid
 
     if send_notification_email.nil?