play updates

playbooks/edx-east/deployer.yml

@@ -6,7 +6,7 @@
   sudo: True
   gather_facts: False
   roles:
-  - gh_users
+  - user
 # Configure an admin instance with jenkins and asgard.
 - name: Configure instance(s)
   hosts: tag_role_admin
@@ -14,6 +14,5 @@
   gather_facts: True
   roles:
   - common
-  - gh_users
   - jenkins_master
   - hotg

playbooks/edx-east/edx_vpc.yml

@@ -5,7 +5,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - gh_users
+    - user
     - role: 'mongo'
       mongo_create_users: yes
 #- hosts: tag_role_mongo:!first_in_tag_role_mongo
@@ -14,7 +14,7 @@
 #    - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
 #    - "{{ secure_dir }}/vars/common/common.yml"
 #  roles:
-#    - gh_users
+#    - user
 #    - mongo
 - hosts: first_in_tag_role_edxapp
   sudo: True
@@ -23,7 +23,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - gh_users
+    - user
     - datadog
     - role: nginx
       nginx_sites:
@@ -44,7 +44,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - gh_users
+    - user
     - datadog
     - role: nginx
       nginx_sites:
@@ -62,7 +62,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - gh_users
+    - user
     - datadog
     - role: nginx
       nginx_sites:
@@ -81,7 +81,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - gh_users
+    - user
     - role: nginx
       nginx_sites:
       - xserver
@@ -94,7 +94,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - gh_users
+    - user
     - rabbitmq
     - splunkforwarder
 - hosts: first_in_tag_role_xqueue
@@ -103,7 +103,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - gh_users
+    - user
     - role: nginx
       nginx_sites:
       - xqueue
@@ -116,7 +116,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - gh_users
+    - user
     - role: nginx
       nginx_sites:
       - xqueue
@@ -128,7 +128,7 @@
     - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
   roles:
-    - gh_users
+    - user
     - oraclejdk
     - elasticsearch
     - forum

playbooks/edx-east/elasticsearch.yml

@@ -5,6 +5,5 @@
     - "{{ secure_dir }}/vars/stage/stage-edx.yml"
   roles:
     - common
-    - gh_users
     - oraclejdk
     - elasticsearch

playbooks/edx-east/jenkins_master.yml

@@ -10,5 +10,4 @@
     COMMON_DATA_DIR: "/mnt"
   roles:
     - common
-    - gh_users
     - jenkins_master

playbooks/edx-west/prod-jumpbox.yml

@@ -8,18 +8,35 @@
   roles:
     - common
     - supervisor
-    - role: gh_users
-      gh_users:
-        - sefk
-        - jbau
-        - jrbl
-        - ali123
-        - caesar2164
-        - dcadams
-        - nparlante
-      gh_users_no_sudo:
-        - jinpa
-        - gbruhns
-        - paepcke
-        - akshayak
+    - role: user
+      user_data:
+        - name: sefk
+          github: true
+          admin: true
+        - name: jbau
+          github: true
+          admin: true
+        - name: jrbl
+          github: true
+          admin: true
+        - name: ali123
+          github: true
+          admin: true
+        - name: caesar2164
+          github: true
+          admin: true
+        - name: dcadams
+          github: true
+          admin: true
+        - name: nparlante
+          github: true
+          admin: true
+        - name: jinpa
+          github: true
+        - name: gbruhns
+          github: true
+        - name: paepcke
+          github: true
+        - name: akshayak
+          github: true
       tags: users

playbooks/roles/common/meta/main.yml

 ---
 dependencies:
-  - gh_users
+  - user
   - automated

playbooks/vagrant-fullstack.yml

@@ -11,7 +11,7 @@
     - "group_vars/all"
   roles:
     - edx_ansible
-    - gh_users
+    - user
     - role: nginx
       nginx_sites:
       - cms

util/jenkins/ansible-provision.sh

@@ -172,8 +172,10 @@ instance_tags:
     owner: $BUILD_USER
 root_ebs_size: $root_ebs_size
 name_tag: $name_tag
-gh_users:
-  - ${github_username}
+user_data:
+  - name: ${github_username}
+    github: true
+    admin: true
 dns_zone: $dns_zone
 rabbitmq_refresh: True
 USER_CMD_PROMPT: '[$name_tag] '