fix task to include sandbox users

playbooks/roles/demo/defaults/main.yml

@@ -12,7 +12,6 @@
 #
 
 DEMO_CREATE_STAFF_USER: true
-DEMO_CREATE_ADMIN_USER: true
 
 demo_app_dir: "{{ COMMON_APP_DIR }}/demo"
 demo_code_dir: "{{ demo_app_dir }}/edx-demo-course"
@@ -38,12 +37,6 @@ demo_staff_user:
   username: staff
   hashed_password: "{{ demo_hashed_password }}"
   is_staff: true
-demo_admin_user:
-  email: 'admin@example.com'
-  username: admin
-  hashed_password: "{{ demo_hashed_password }}"
-  is_staff: true
-  is_superuser: true
 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,13 @@
 
 - name: build staff, admin, and test user list
   set_fact:
-    demo_test_admin_and_staff_users: "{{demo_test_and_staff_users + [demo_admin_user] }}"
-  when: DEMO_CREATE_ADMIN_USER
+    demo_test_admin_and_staff_users: "{{ demo_test_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 DEMO_CREATE_ADMIN_USER
+    demo_test_admin_and_staff_users: "{{ demo_test_users }}"
+  when: not SANDBOX_CREATE_ADMIN_USER
 
 - 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 %}"