Merge pull request #740 from edx/sef/gh_user_no_sudo

Turn off hash merge, add gh_user_no_sudo

playbooks/edx-west/prod-jumpbox.yml

@@ -17,7 +17,10 @@
         - ali123
         - caesar2164
         - dcadams
+        - nparlante
+      gh_users_no_sudo:
         - jinpa
         - gbruhns
-        - nparlante
+        - paepcke
+        - akshayak
       tags: users

playbooks/edx-west/stage-ansible.cfg

@@ -3,7 +3,6 @@
 [defaults]
 # Always have these for using the configuration repo
 jinja2_extensions=jinja2.ext.do
-hash_behaviour=merge
 
 # These are environment-specific defaults
 forks=10

playbooks/roles/gh_users/defaults/main.yml

@@ -3,3 +3,4 @@
 # update the system bashrc default
 GH_USERS_PROMPT: ""
 gh_users: []
+gh_users_no_sudo: []

playbooks/roles/gh_users/tasks/main.yml

@@ -10,6 +10,8 @@
 #     gh_users:
 #      - joe
 #      - mark
+#     gh_users_no_sudo:
+#      - tourist_dave
 
 
 - name: gh_users | creating default .bashrc
@@ -27,22 +29,28 @@
     dest=/etc/sudoers.d/gh owner=root group=root
     mode=0440 validate='visudo -cf %s'
 
-- name: gh_users | create github users
+- name: gh_users | create sudo github users
   user:
     name={{ item }} groups=gh
     shell=/bin/bash
   with_items: gh_users
 
+- name: gh_users | create non-sudo github users
+  user:
+    name={{ item }}
+    shell=/bin/bash
+  with_items: gh_users_no_sudo
+
 - name: gh_users | create .ssh directory
   file:
     path=/home/{{ item }}/.ssh state=directory mode=0700
     owner={{ item }}
-  with_items: gh_users
+  with_items: gh_users + gh_users_no_sudo
 
 - name: gh_users | copy github key[s] to .ssh/authorized_keys
   get_url:
     url=https://github.com/{{ item }}.keys
     dest=/home/{{ item }}/.ssh/authorized_keys mode=0600
     owner={{ item }}
-  with_items: gh_users
+  with_items: gh_users + gh_users_no_sudo