Merge pull request #2183 from edx/feanil/no_m

Remove the 'm' from all DNS names and examples.

playbooks/edx-east/create_user.yml

 # Creates a single user on a server
 # By default no super-user privileges
-# Example: ansible-playbook -i "jarv.m.sandbox.edx.org,"  ./create_user.yml -e "user=jarv"
+# Example: ansible-playbook -i "jarv.sandbox.edx.org,"  ./create_user.yml -e "user=jarv"
 # Create a user with sudo privileges
-# Example: ansible-playbook -i "jarv.m.sandbox.edx.org,"  ./create_user.yml -e "user=jarv" -e "give_sudo=true"
+# Example: ansible-playbook -i "jarv.sandbox.edx.org,"  ./create_user.yml -e "user=jarv" -e "give_sudo=true"
 - name: Create a single user
   hosts: all
   sudo: True

playbooks/edx-east/edx_provision.yml

@@ -18,7 +18,7 @@
       owner: temp
     root_ebs_size: 50
     dns_name: temp
-    dns_zone: m.sandbox.edx.org
+    dns_zone: sandbox.edx.org
     name_tag: sandbox-temp
     elb: false
     vpc_subnet_id: subnet-cd867aba

playbooks/roles/locust/tasks/main.yml

@@ -22,7 +22,7 @@
 # 
 # Example play:
 #
-#   # To run: ansible-playbook locust.yml -i "locustmaster.m.sandbox.edx.org," -e "LOCUST_LOADTEST_DIR='locust/lms'" -e "LOCUST_TARGET_HOST='https://courses-loadtest.edx.org'" -e "@/Users/derf/workspace/sandbox-secure/ansible/vars/developer-sandbox.yml"
+#   # To run: ansible-playbook locust.yml -i "locustmaster.sandbox.edx.org," -e "LOCUST_LOADTEST_DIR='locust/lms'" -e "LOCUST_TARGET_HOST='https://courses-loadtest.edx.org'" -e "@/Users/derf/workspace/sandbox-secure/ansible/vars/developer-sandbox.yml"
 #   - name: Deploy Locust
 #     hosts: all
 #     sudo: True

util/jenkins/connect-sandbox-to-prod-clone.sh

@@ -34,7 +34,7 @@ if [[ ! -f $BOTO_CONFIG ]]; then
 fi
 
 if [[ -z $sandbox_to_update ]]; then
-  sandbox_to_update="${BUILD_USER_ID}.m.sandbox.edx.org"
+  sandbox_to_update="${BUILD_USER_ID}.sandbox.edx.org"
 fi
 
 cd $WORKSPACE/configuration/playbooks/edx-east