remove SANDBOX_CREATE_ADMIN_USER var

playbooks/roles/common_vars/defaults/main.yml

@@ -221,5 +221,3 @@ COMMON_JWT_AUDIENCE: 'SET-ME-PLEASE'
 COMMON_JWT_ISSUER: '{{ COMMON_OIDC_ISSUER }}'
 COMMON_JWT_SECRET_KEY: 'SET-ME-PLEASE'
 
-# Set sandbox admin default
-SANDBOX_CREATE_ADMIN_USER: True

playbooks/roles/demo/defaults/main.yml

@@ -41,6 +41,7 @@ demo_staff_user:
   hashed_password: "{{ demo_hashed_password }}"
   is_staff: true
   is_superuser: false
+SANDBOX_EDXAPP_USERS: []
 demo_edxapp_user: 'edxapp'
 demo_edxapp_settings: '{{ COMMON_EDXAPP_SETTINGS }}'
 demo_edxapp_venv_bin: '{{ COMMON_APP_DIR }}/{{ demo_edxapp_user }}/venvs/{{demo_edxapp_user}}/bin'

playbooks/roles/demo/tasks/deploy.yml

@@ -28,13 +28,7 @@
 
 - name: build staff, admin, and test user list
   set_fact:
-    demo_test_admin_and_staff_users: "{{ demo_test_and_staff_users + [SANDBOX_EDXAPP_USERS] }}"
-  when: SANDBOX_CREATE_ADMIN_USER
-
-- name: build staff, admin, and test user list
-  set_fact:
-    demo_test_admin_and_staff_users: "{{ demo_test_and_staff_users }}"
-  when: not SANDBOX_CREATE_ADMIN_USER
+    demo_test_admin_and_staff_users: "{{ demo_test_and_staff_users + SANDBOX_EDXAPP_USERS }}"
 
 - name: create some test users
   shell: "{{ demo_edxapp_venv_bin }}/python ./manage.py lms --settings={{ demo_edxapp_settings }} --service-variant lms manage_user {{ item.username}} {{ item.email }} --initial-password-hash {{ item.hashed_password | quote }}{% if item.is_staff %} --staff{% endif %}{% if item.is_superuser %} --superuser{% endif %}"