more changes to support user_info

playbooks/edx-east/create_all_user_types.yml

@@ -15,7 +15,7 @@
       when: user is not defined
     - name: give access with no sudo
       set_fact:
-        USER_INFO:
+        CUSTOM_USER_INFO:
           - name: "{{ user }}"
             github: true
           - name: test-admin-user
@@ -28,4 +28,5 @@
             type: restricted
             sudoers_template: 99-analytics-manage-cmds.j2
   roles:
-    - user
+    - role: user
+      user_info: "{{ CUSTOM_USER_INFO }}"

playbooks/edx-east/create_user.yml

@@ -12,16 +12,17 @@
       when: user is not defined
     - name: give access with no sudo
       set_fact:
-        USER_INFO:
+        CUSTOM_USER_INFO:
           - name: "{{ user }}"
             github: true
       when: give_sudo is not defined
     - name: give access with sudo
       set_fact:
-        USER_INFO:
+        CUSTOM_USER_INFO:
           - name: "{{ user }}"
             type: admin
             github: true
       when: give_sudo is defined
   roles:
-    - user
+    - role: user
+      user_info: "{{ CUSTOM_USER_INFO }}"

util/jenkins/ansible-provision.sh

@@ -172,7 +172,7 @@ instance_tags:
     owner: $BUILD_USER
 root_ebs_size: $root_ebs_size
 name_tag: $name_tag
-USER_INFO:
+COMMON_USER_INFO:
   - name: ${github_username}
     github: true
     type: admin