Make the admin files more coherent.

playbooks/edx-east/jenkins_admin.yml

-# Configure an admin instance with jenkins and asgard.
+# Configure an instance with the admin jenkins.
 - name: Configure instance(s)
   hosts: all
   sudo: True
   gather_facts: True
   roles:
-    - aws
-    - edx_ansible
-    - user
     - jenkins_admin
-    - hotg
-    - alton
-    - role: datadog
-      when: COMMON_ENABLE_DATADOG
-    - role: splunkforwarder
-      when: COMMON_ENABLE_SPLUNKFORWARDER
-    - role: newrelic
-      when: COMMON_ENABLE_NEWRELIC

playbooks/edx-east/vpc_admin.yml

-# ansible-playbook -c ssh -vvvv --user=ubuntu -i ec2.py deployer.yml -e "@/path/to/secure/ansible/vars/edx_admin.yml" --limit="tag_aws_cloudformation_stack-name_<admin_stack_name>"
-# You will need to create a gh_users.yml that contains the github names of users that should have login access to the machines.
-# Setup user login on the bastion
-- name: Configure Bastion
-  hosts: tag_play_bastion
-  sudo: True
-  gather_facts: False
-  roles:
-  - aws
+# ansible-playbook -vvv -c ssh -i admin_url, vpc_admin.yml -e "@path_to_common_overrides" -e "@path_to_deployment_specific_overrides"
 # Configure an admin instance with jenkins and asgard.
 - name: Configure instance(s)
-  hosts: tag_play_admin
+  hosts: all
   sudo: True
   gather_facts: True
   roles:
-  - aws
-  - edx_ansible
-  - jenkins_admin
-  - hotg
-  - newrelic
+    - aws
+    - edx_ansible
+    - user
+    - jenkins_admin
+    - hotg
+    - alton
+    - role: datadog
+      when: COMMON_ENABLE_DATADOG
+    - role: splunkforwarder
+      when: COMMON_ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: COMMON_ENABLE_NEWRELIC