Add environment var and gh_users.

Replace 'dev' with a variable so that we can start using the playbook with other environments.

Use the gh_users role instead of creating users in the common role.

playbooks/edx-east/edx_vpc.yml

@@ -2,29 +2,31 @@
 - hosts: first_in_tag_role_mongo
   sudo: True
   vars_files:
-    - "{{ secure_dir }}/vars/dev/{{CLOUDFORMATION_STACK_NAME}}.yml"
-    - "{{ secure_dir }}/vars/users.yml"
+    - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
+    - "{{ secure_dir }}/vars/common/common.yml"
   roles:
     - common
+    - gh_users
     - role: 'mongo'
       mongo_create_users: yes
 #- hosts: tag_role_mongo:!first_in_tag_role_mongo
 #  sudo: True
 #  vars_files:
-#    - "{{ secure_dir }}/vars/dev/feanilsandbox.yml"
-#    - "{{ secure_dir }}/vars/users.yml"
+#    - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
+#    - "{{ secure_dir }}/vars/common/common.yml"
 #  roles:
 #    - common
+#    - gh_users
 #    - mongo
 - hosts: first_in_tag_role_edxapp
   sudo: True
   serial: 1
   vars_files:
-    - "{{ secure_dir }}/vars/dev/{{CLOUDFORMATION_STACK_NAME}}.yml"
+    - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
-    - "{{ secure_dir }}/vars/users.yml"
   roles:
     - common
+    - gh_users
     - datadog
     - supervisor
     - role: nginx
@@ -42,11 +44,11 @@
   sudo: True
   serial: 1
   vars_files:
-    - "{{ secure_dir }}/vars/dev/{{CLOUDFORMATION_STACK_NAME}}.yml"
+    - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
-    - "{{ secure_dir }}/vars/users.yml"
   roles:
     - common
+    - gh_users
     - datadog
     - supervisor
     - role: nginx
@@ -61,11 +63,11 @@
 - hosts: tag_role_worker
   sudo: True
   vars_files:
-    - "{{ secure_dir }}/vars/dev/{{CLOUDFORMATION_STACK_NAME}}.yml"
+    - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
-    - "{{ secure_dir }}/vars/users.yml"
   roles:
     - common
+    - gh_users
     - datadog
     - supervisor
     - role: nginx
@@ -81,11 +83,11 @@
 - hosts: tag_role_xserver
   sudo: True
   vars_files:
-    - "{{ secure_dir }}/vars/dev/{{CLOUDFORMATION_STACK_NAME}}.yml"
+    - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
-    - "{{ secure_dir }}/vars/users.yml"
   roles:
     - common
+    - gh_users
     - supervisor
     - role: nginx
       nginx_sites:
@@ -96,22 +98,22 @@
   serial: 1
   sudo: True
   vars_files:
-    - "{{ secure_dir }}/vars/dev/{{CLOUDFORMATION_STACK_NAME}}.yml"
+    - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
-    - "{{ secure_dir }}/vars/users.yml"
   roles:
     - common
+    - gh_users
     - supervisor
     - rabbitmq
     - splunkforwarder
 - hosts: first_in_tag_role_xqueue
   sudo: True
   vars_files:
-    - "{{ secure_dir }}/vars/dev/{{CLOUDFORMATION_STACK_NAME}}.yml"
+    - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
-    - "{{ secure_dir }}/vars/users.yml"
   roles:
     - common
+    - gh_users
     - supervisor
     - role: nginx
       nginx_sites:
@@ -122,11 +124,11 @@
 - hosts: tag_role_xqueue:!first_in_tag_role_xqueue
   sudo: True
   vars_files:
-    - "{{ secure_dir }}/vars/dev/{{CLOUDFORMATION_STACK_NAME}}.yml"
+    - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
-    - "{{ secure_dir }}/vars/users.yml"
   roles:
     - common
+    - gh_users
     - supervisor
     - role: nginx
       nginx_sites:
@@ -136,11 +138,11 @@
 - hosts: tag_role_forum
   sudo: True
   vars_files:
-    - "{{ secure_dir }}/vars/dev/{{CLOUDFORMATION_STACK_NAME}}.yml"
+    - "{{ secure_dir }}/vars/{{ENVIRONMENT}}/{{CLOUDFORMATION_STACK_NAME}}.yml"
     - "{{ secure_dir }}/vars/common/common.yml"
-    - "{{ secure_dir }}/vars/users.yml"
   roles:
     - common
+    - gh_users
     - supervisor
     - oraclejdk
     - elasticsearch