Kill edx-east (#4596)

* Remove edx-east folder, replace with symlink.
openedx-unsupported · Jun 6, 2018 · 3e51c86 · 3e51c86
1 parent 5629ea5
commit 3e51c86
Show file tree

Hide file tree

Showing 123 changed files with 25 additions and 55 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,7 +23,7 @@ vagrant_ansible_inventory_default
 
 ## Make artifacts
 .build
-playbooks/edx-east/travis-test.yml
+playbooks/travis-test.yml
 
 ## Local virtualenv
 /venv

diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ install:
 
 env:
   - MAKE_TARGET=test.syntax SHARD=0 SHARDS=1
-  - MAKE_TARGET=test.edx_east_roles SHARD=0 SHARDS=1
+  - MAKE_TARGET=test.playbooks SHARD=0 SHARDS=1
   - MAKE_TARGET=docker.test.shard SHARD=0 SHARDS=3
   - MAKE_TARGET=docker.test.shard SHARD=1 SHARDS=3
   - MAKE_TARGET=docker.test.shard SHARD=2 SHARDS=3

diff --git a/playbooks/edx-east/add-ubuntu-key.yml → playbooks/add-ubuntu-key.yml b/playbooks/edx-east/add-ubuntu-key.yml → playbooks/add-ubuntu-key.yml
diff --git a/playbooks/edx-east/aide.yml → playbooks/aide.yml b/playbooks/edx-east/aide.yml → playbooks/aide.yml
diff --git a/playbooks/edx-east/alton.yml → playbooks/alton.yml b/playbooks/edx-east/alton.yml → playbooks/alton.yml
diff --git a/playbooks/edx-east/analytics_single.yml → playbooks/analytics_single.yml b/playbooks/edx-east/analytics_single.yml → playbooks/analytics_single.yml
diff --git a/playbooks/edx-east/analyticsapi.yml → playbooks/analyticsapi.yml b/playbooks/edx-east/analyticsapi.yml → playbooks/analyticsapi.yml
diff --git a/playbooks/ansible.cfg b/playbooks/ansible.cfg
@@ -7,6 +7,7 @@
 jinja2_extensions=jinja2.ext.do
 host_key_checking = False
 roles_path=../../ansible-roles/roles:../../ansible-private/roles:../../ansible-roles/
+retries=5
 ansible_managed=This file is created and updated by ansible, edit at your peril
 
 [ssh_connection]

diff --git a/playbooks/edx-east/antivirus.yml → playbooks/antivirus.yml b/playbooks/edx-east/antivirus.yml → playbooks/antivirus.yml
diff --git a/playbooks/edx-east/apply-security.yml → playbooks/apply-security.yml b/playbooks/edx-east/apply-security.yml → playbooks/apply-security.yml
diff --git a/playbooks/edx-east/automated.yml → playbooks/automated.yml b/playbooks/edx-east/automated.yml → playbooks/automated.yml
diff --git a/playbooks/edx-east/aws.yml → playbooks/aws.yml b/playbooks/edx-east/aws.yml → playbooks/aws.yml
diff --git a/playbooks/edx-east/bootstrap_python.yml → playbooks/bootstrap_python.yml b/playbooks/edx-east/bootstrap_python.yml → playbooks/bootstrap_python.yml
diff --git a/playbooks/edx-east/certs.yml → playbooks/certs.yml b/playbooks/edx-east/certs.yml → playbooks/certs.yml
diff --git a/playbooks/edx-east/cluster_rabbitmq.yml → playbooks/cluster_rabbitmq.yml b/playbooks/edx-east/cluster_rabbitmq.yml → playbooks/cluster_rabbitmq.yml
diff --git a/playbooks/edx-east/common.yml → playbooks/common.yml b/playbooks/edx-east/common.yml → playbooks/common.yml
diff --git a/playbooks/edx-east/common_edx_base.yml → playbooks/common_edx_base.yml b/playbooks/edx-east/common_edx_base.yml → playbooks/common_edx_base.yml
diff --git a/playbooks/edx-east/commoncluster.yml → playbooks/commoncluster.yml b/playbooks/edx-east/commoncluster.yml → playbooks/commoncluster.yml
diff --git a/playbooks/edx-east/connect_sandbox.yml → playbooks/connect_sandbox.yml b/playbooks/edx-east/connect_sandbox.yml → playbooks/connect_sandbox.yml
diff --git a/playbooks/edx-east/create_all_user_types.yml → playbooks/create_all_user_types.yml b/playbooks/edx-east/create_all_user_types.yml → playbooks/create_all_user_types.yml
diff --git a/playbooks/edx-east/create_cname.yml → playbooks/create_cname.yml b/playbooks/edx-east/create_cname.yml → playbooks/create_cname.yml
diff --git a/playbooks/edx-east/create_db_and_users.yml → playbooks/create_db_and_users.yml b/playbooks/edx-east/create_db_and_users.yml → playbooks/create_db_and_users.yml
diff --git a/playbooks/edx-east/create_mongo_users.yml → playbooks/create_mongo_users.yml b/playbooks/edx-east/create_mongo_users.yml → playbooks/create_mongo_users.yml
diff --git a/playbooks/edx-east/create_rds_secondary.yml → playbooks/create_rds_secondary.yml b/playbooks/edx-east/create_rds_secondary.yml → playbooks/create_rds_secondary.yml
diff --git a/playbooks/edx-east/create_user.yml → playbooks/create_user.yml b/playbooks/edx-east/create_user.yml → playbooks/create_user.yml
diff --git a/playbooks/edx-east/credentials.yml → playbooks/credentials.yml b/playbooks/edx-east/credentials.yml → playbooks/credentials.yml
diff --git a/playbooks/edx-east/demo.yml → playbooks/demo.yml b/playbooks/edx-east/demo.yml → playbooks/demo.yml
diff --git a/...books/edx-east/deploy_nginx_all_roles.yml → playbooks/deploy_nginx_all_roles.yml b/...books/edx-east/deploy_nginx_all_roles.yml → playbooks/deploy_nginx_all_roles.yml
diff --git a/playbooks/edx-east/discovery.yml → playbooks/discovery.yml b/playbooks/edx-east/discovery.yml → playbooks/discovery.yml
diff --git a/playbooks/edx-east/ecommerce.yml → playbooks/ecommerce.yml b/playbooks/edx-east/ecommerce.yml → playbooks/ecommerce.yml
diff --git a/playbooks/edx-east/ecomworker.yml → playbooks/ecomworker.yml b/playbooks/edx-east/ecomworker.yml → playbooks/ecomworker.yml
diff --git a/playbooks/edx-east b/playbooks/edx-east
@@ -0,0 +1 @@
+.
diff --git a/playbooks/edx-east/README.rst b/playbooks/edx-east/README.rst
diff --git a/playbooks/edx-east/ansible.cfg b/playbooks/edx-east/ansible.cfg
diff --git a/playbooks/edx-east/callback_plugins b/playbooks/edx-east/callback_plugins
diff --git a/playbooks/edx-east/ec2.py b/playbooks/edx-east/ec2.py
diff --git a/playbooks/edx-east/group_vars b/playbooks/edx-east/group_vars
diff --git a/playbooks/edx-east/inventory.ini b/playbooks/edx-east/inventory.ini
diff --git a/playbooks/edx-east/library b/playbooks/edx-east/library
diff --git a/playbooks/edx-east/roles b/playbooks/edx-east/roles
diff --git a/playbooks/edx-east/edx_ansible.yml → playbooks/edx_ansible.yml b/playbooks/edx-east/edx_ansible.yml → playbooks/edx_ansible.yml
diff --git a/...s/edx-east/edx_continuous_integration.yml → playbooks/edx_continuous_integration.yml b/...s/edx-east/edx_continuous_integration.yml → playbooks/edx_continuous_integration.yml
diff --git a/playbooks/edx-east/edx_jenkins_tests.yml → playbooks/edx_jenkins_tests.yml b/playbooks/edx-east/edx_jenkins_tests.yml → playbooks/edx_jenkins_tests.yml
diff --git a/playbooks/edx-east/edx_mirror.yml → playbooks/edx_mirror.yml b/playbooks/edx-east/edx_mirror.yml → playbooks/edx_mirror.yml
diff --git a/playbooks/edx-east/edx_provision.yml → playbooks/edx_provision.yml b/playbooks/edx-east/edx_provision.yml → playbooks/edx_provision.yml
diff --git a/playbooks/edx-east/edxapp.yml → playbooks/edxapp.yml b/playbooks/edx-east/edxapp.yml → playbooks/edxapp.yml
diff --git a/playbooks/edx-east/elasticsearch.yml → playbooks/elasticsearch.yml b/playbooks/edx-east/elasticsearch.yml → playbooks/elasticsearch.yml
diff --git a/playbooks/edx-east/flower.yml → playbooks/flower.yml b/playbooks/edx-east/flower.yml → playbooks/flower.yml
diff --git a/playbooks/edx-east/forum.yml → playbooks/forum.yml b/playbooks/edx-east/forum.yml → playbooks/forum.yml
diff --git a/playbooks/group_vars/tag_environment_prod b/playbooks/group_vars/tag_environment_prod
@@ -1,5 +1,3 @@
 ---
 secure_dir: '../../configuration-secure/ansible'
-# this indicates the path to site-specific (with precedence)
-# things like nginx template files
 local_dir:  '../../configuration-secure/ansible/local'
diff --git a/playbooks/edx-east/insights.yml → playbooks/insights.yml b/playbooks/edx-east/insights.yml → playbooks/insights.yml
diff --git a/playbooks/edx-east/jenkins_admin.yml → playbooks/jenkins_admin.yml b/playbooks/edx-east/jenkins_admin.yml → playbooks/jenkins_admin.yml
diff --git a/playbooks/edx-east/jenkins_build.yml → playbooks/jenkins_build.yml b/playbooks/edx-east/jenkins_build.yml → playbooks/jenkins_build.yml
diff --git a/playbooks/edx-east/jenkins_de.yml → playbooks/jenkins_de.yml b/playbooks/edx-east/jenkins_de.yml → playbooks/jenkins_de.yml
diff --git a/...books/edx-east/jenkins_testeng_master.yml → playbooks/jenkins_testeng_master.yml b/...books/edx-east/jenkins_testeng_master.yml → playbooks/jenkins_testeng_master.yml
diff --git a/playbooks/edx-east/jenkins_worker.yml → playbooks/jenkins_worker.yml b/playbooks/edx-east/jenkins_worker.yml → playbooks/jenkins_worker.yml
diff --git a/...books/edx-east/jenkins_worker_android.yml → playbooks/jenkins_worker_android.yml b/...books/edx-east/jenkins_worker_android.yml → playbooks/jenkins_worker_android.yml
diff --git a/...x-east/jenkins_worker_loadtest_driver.yml → playbooks/jenkins_worker_loadtest_driver.yml b/...x-east/jenkins_worker_loadtest_driver.yml → playbooks/jenkins_worker_loadtest_driver.yml
diff --git a/playbooks/edx-east/legacy_certificates.yml → playbooks/legacy_certificates.yml b/playbooks/edx-east/legacy_certificates.yml → playbooks/legacy_certificates.yml
diff --git a/playbooks/edx-east/lifecycle_inventory.py → playbooks/lifecycle_inventory.py b/playbooks/edx-east/lifecycle_inventory.py → playbooks/lifecycle_inventory.py
diff --git a/playbooks/edx-east/locust.yml → playbooks/locust.yml b/playbooks/edx-east/locust.yml → playbooks/locust.yml
diff --git a/...x-east/manage_edxapp_users_and_groups.yml → playbooks/manage_edxapp_users_and_groups.yml b/...x-east/manage_edxapp_users_and_groups.yml → playbooks/manage_edxapp_users_and_groups.yml
diff --git a/playbooks/edx-east/minos.yml → playbooks/minos.yml b/playbooks/edx-east/minos.yml → playbooks/minos.yml
diff --git a/playbooks/edx-east/mongo.yml → playbooks/mongo.yml b/playbooks/edx-east/mongo.yml → playbooks/mongo.yml
diff --git a/playbooks/edx-east/mongo_3_0.yml → playbooks/mongo_3_0.yml b/playbooks/edx-east/mongo_3_0.yml → playbooks/mongo_3_0.yml
diff --git a/playbooks/edx-east/mongo_3_2.yml → playbooks/mongo_3_2.yml b/playbooks/edx-east/mongo_3_2.yml → playbooks/mongo_3_2.yml
diff --git a/playbooks/edx-east/mongo_mms.yml → playbooks/mongo_mms.yml b/playbooks/edx-east/mongo_mms.yml → playbooks/mongo_mms.yml
diff --git a/playbooks/edx-east/mongo_rolling_upgrade.yml → playbooks/mongo_rolling_upgrade.yml b/playbooks/edx-east/mongo_rolling_upgrade.yml → playbooks/mongo_rolling_upgrade.yml
diff --git a/...east/mongo_upgrade_hidden_secondaries.yml → ...ooks/mongo_upgrade_hidden_secondaries.yml b/...east/mongo_upgrade_hidden_secondaries.yml → ...ooks/mongo_upgrade_hidden_secondaries.yml
diff --git a/playbooks/edx-east/mysql.yml → playbooks/mysql.yml b/playbooks/edx-east/mysql.yml → playbooks/mysql.yml
diff --git a/playbooks/edx-east/neo4j.yml → playbooks/neo4j.yml b/playbooks/edx-east/neo4j.yml → playbooks/neo4j.yml
diff --git a/playbooks/edx-east/newrelic.yml → playbooks/newrelic.yml b/playbooks/edx-east/newrelic.yml → playbooks/newrelic.yml
diff --git a/playbooks/edx-east/notes.yml → playbooks/notes.yml b/playbooks/edx-east/notes.yml → playbooks/notes.yml
diff --git a/playbooks/edx-east/notifier.yml → playbooks/notifier.yml b/playbooks/edx-east/notifier.yml → playbooks/notifier.yml
diff --git a/playbooks/edx-east/oauth_client_setup.yml → playbooks/oauth_client_setup.yml b/playbooks/edx-east/oauth_client_setup.yml → playbooks/oauth_client_setup.yml
diff --git a/playbooks/edx-east/ora2.yml → playbooks/ora2.yml b/playbooks/edx-east/ora2.yml → playbooks/ora2.yml
diff --git a/...edx-east/populate_configuration_model.yml → playbooks/populate_configuration_model.yml b/...edx-east/populate_configuration_model.yml → playbooks/populate_configuration_model.yml
diff --git a/playbooks/edx-east/promote_rds_secondary.yml → playbooks/promote_rds_secondary.yml b/playbooks/edx-east/promote_rds_secondary.yml → playbooks/promote_rds_secondary.yml
diff --git a/playbooks/edx-east/rabbitmq.yml → playbooks/rabbitmq.yml b/playbooks/edx-east/rabbitmq.yml → playbooks/rabbitmq.yml
diff --git a/playbooks/edx-east/redirector.yml → playbooks/redirector.yml b/playbooks/edx-east/redirector.yml → playbooks/redirector.yml
diff --git a/playbooks/edx-east/redis.yml → playbooks/redis.yml b/playbooks/edx-east/redis.yml → playbooks/redis.yml
diff --git a/playbooks/edx-east/remove-ubuntu-key.yml → playbooks/remove-ubuntu-key.yml b/playbooks/edx-east/remove-ubuntu-key.yml → playbooks/remove-ubuntu-key.yml
diff --git a/playbooks/edx-east/restart_supervisor.yml → playbooks/restart_supervisor.yml b/playbooks/edx-east/restart_supervisor.yml → playbooks/restart_supervisor.yml
diff --git a/playbooks/edx-east/retire_host.yml → playbooks/retire_host.yml b/playbooks/edx-east/retire_host.yml → playbooks/retire_host.yml
diff --git a/playbooks/roles/edx_ansible/templates/update.j2 b/playbooks/roles/edx_ansible/templates/update.j2
@@ -91,5 +91,5 @@ if [[ -z ${repos_to_cmd[$1]} ]]; then
     exit 1
 fi
 
-cd {{ edx_ansible_code_dir }}/playbooks/edx-east
+cd {{ edx_ansible_code_dir }}/playbooks
 eval "sudo ${repos_to_cmd["$1"]} $verbose"
diff --git a/playbooks/roles/edx_notes_api/tasks/main.yml b/playbooks/roles/edx_notes_api/tasks/main.yml
@@ -19,7 +19,7 @@
 # For a complete picture of dependencies, see:
 #
 #  configuration/playbooks/role/edx-notes-api/meta/main.yml
-#  configuration/playbooks/edx-east/notes.yml
+#  configuration/notes.yml
 #
 # Example play:
 #

diff --git a/playbooks/sample_vars/test-mongo.yml b/playbooks/sample_vars/test-mongo.yml
@@ -1,8 +1,8 @@
 # Example ansible commands
 # Three node replica set
-# ansible-playbook -i '203.0.113.12,203.0.113.20,203.0.113.68' -u ubuntu edx-east/mongo_3_2.yml -e@sample_vars/test-mongo.yml
+# ansible-playbook -i '203.0.113.12,203.0.113.20,203.0.113.68' -u ubuntu mongo_3_2.yml -e@sample_vars/test-mongo.yml
 # Single node
-# ansible-playbook -i '203.0.113.12' -u ubuntu edx-east/mongo_3_2.yml -e@sample_vars/test-mongo.yml
+# ansible-playbook -i '203.0.113.12' -u ubuntu mongo_3_2.yml -e@sample_vars/test-mongo.yml
 
 # Passwords and relication keys in this file are examples and must be changed.
 # You must change any variable with the string "CHANGEME" in it

diff --git a/playbooks/edx-east/set_hostname.yml → playbooks/set_hostname.yml b/playbooks/edx-east/set_hostname.yml → playbooks/set_hostname.yml
diff --git a/playbooks/edx-east/snort.yml → playbooks/snort.yml b/playbooks/edx-east/snort.yml → playbooks/snort.yml
diff --git a/playbooks/edx-east/splunk.yml → playbooks/splunk.yml b/playbooks/edx-east/splunk.yml → playbooks/splunk.yml
diff --git a/playbooks/edx-east/splunk_config_backup.yml → playbooks/splunk_config_backup.yml b/playbooks/edx-east/splunk_config_backup.yml → playbooks/splunk_config_backup.yml
diff --git a/playbooks/edx-east/splunkforwarder.yml → playbooks/splunkforwarder.yml b/playbooks/edx-east/splunkforwarder.yml → playbooks/splunkforwarder.yml
diff --git a/playbooks/edx-east/stop_all_edx_services.yml → playbooks/stop_all_edx_services.yml b/playbooks/edx-east/stop_all_edx_services.yml → playbooks/stop_all_edx_services.yml
diff --git a/playbooks/edx-east/tanaguru.yml → playbooks/tanaguru.yml b/playbooks/edx-east/tanaguru.yml → playbooks/tanaguru.yml
diff --git a/playbooks/edx-east/test-rolling.yml → playbooks/test-rolling.yml b/playbooks/edx-east/test-rolling.yml → playbooks/test-rolling.yml
diff --git a/playbooks/edx-east/testcourses.yml → playbooks/testcourses.yml b/playbooks/edx-east/testcourses.yml → playbooks/testcourses.yml
diff --git a/playbooks/edx-east/tools-gp.yml → playbooks/tools-gp.yml b/playbooks/edx-east/tools-gp.yml → playbooks/tools-gp.yml
diff --git a/playbooks/edx-east/tools_jenkins.yml → playbooks/tools_jenkins.yml b/playbooks/edx-east/tools_jenkins.yml → playbooks/tools_jenkins.yml
diff --git a/playbooks/edx-east/veda_delivery_worker.yml → playbooks/veda_delivery_worker.yml b/playbooks/edx-east/veda_delivery_worker.yml → playbooks/veda_delivery_worker.yml
diff --git a/playbooks/edx-east/veda_encode_worker.yml → playbooks/veda_encode_worker.yml b/playbooks/edx-east/veda_encode_worker.yml → playbooks/veda_encode_worker.yml
diff --git a/playbooks/edx-east/veda_intake_worker.yml → playbooks/veda_intake_worker.yml b/playbooks/edx-east/veda_intake_worker.yml → playbooks/veda_intake_worker.yml
diff --git a/playbooks/edx-east/veda_pipeline_worker.yml → playbooks/veda_pipeline_worker.yml b/playbooks/edx-east/veda_pipeline_worker.yml → playbooks/veda_pipeline_worker.yml
diff --git a/playbooks/edx-east/veda_web_frontend.yml → playbooks/veda_web_frontend.yml b/playbooks/edx-east/veda_web_frontend.yml → playbooks/veda_web_frontend.yml
diff --git a/...s/edx-east/video_pipeline_integration.yml → playbooks/video_pipeline_integration.yml b/...s/edx-east/video_pipeline_integration.yml → playbooks/video_pipeline_integration.yml
diff --git a/playbooks/edx-east/vpc_admin.yml → playbooks/vpc_admin.yml b/playbooks/edx-east/vpc_admin.yml → playbooks/vpc_admin.yml
diff --git a/playbooks/edx-east/whitelabel.yml → playbooks/whitelabel.yml b/playbooks/edx-east/whitelabel.yml → playbooks/whitelabel.yml
diff --git a/playbooks/edx-east/worker.yml → playbooks/worker.yml b/playbooks/edx-east/worker.yml → playbooks/worker.yml
diff --git a/playbooks/edx-east/xqueue.yml → playbooks/xqueue.yml b/playbooks/edx-east/xqueue.yml → playbooks/xqueue.yml
diff --git a/playbooks/edx-east/xqwatcher.yml → playbooks/xqwatcher.yml b/playbooks/edx-east/xqwatcher.yml → playbooks/xqwatcher.yml
diff --git a/playbooks/edx-east/xserver.yml → playbooks/xserver.yml b/playbooks/edx-east/xserver.yml → playbooks/xserver.yml
diff --git a/test.mk b/test.mk
@@ -10,10 +10,10 @@ test.help:
 	@echo '        test.syntax.json           Run syntax tests on .json files'
 	@echo '        test.syntax.yml            Run syntax tests on .yml files'
 	@echo '        test.syntax.jinja          Run syntax tests on .j2 files'
-	@echo '        test.edx_east_roles        Run validation on edx-east roles'
+	@echo '        test.playbooks        Run validation on playbooks'
 	@echo ''
 
-test: test.syntax test.edx_east_roles
+test: test.syntax test.playbooks
 
 test.syntax: test.syntax.yml test.syntax.json test.syntax.dockerfiles
 
@@ -30,10 +30,10 @@ test.syntax.json/%:
 test.syntax.dockerfiles:
 	python util/check_dockerfile_coverage.py "$(images)"
 
-test.edx_east_roles:
-	tests/test_edx_east_roles.sh
+test.playbooks:
+	tests/test_playbooks.sh
 
 clean: test.clean
 
 test.clean:
-	rm -rf playbooks/edx-east/test_output
+	rm -rf playbooks/test_output
diff --git a/tests/test_edx_east_roles.sh → tests/test_playbooks.sh b/tests/test_edx_east_roles.sh → tests/test_playbooks.sh
@@ -1,7 +1,7 @@
 set -e
 
 ROOT_DIR=$PWD
-cd playbooks/edx-east
+cd playbooks
 ROLE_DIRS=$(/bin/ls -d roles/*)
 cat <<EOF >travis-test.yml
 - name: Play to test all roles

diff --git a/util/baked_config.sh b/util/baked_config.sh
@@ -23,5 +23,5 @@ fi
 
 mkdir -p $WORKSPACE/baked-config-secure/${E_D}
 
-cd ../playbooks/edx-east/
+cd ../playbooks/
 ansible-playbook -vvv -c local -i 'localhost,' --tags edxapp_cfg ./edxapp.yml ${VARS} -e edxapp_user=$(whoami) -e common_web_group=$(whoami) -e edxapp_app_dir=$WORKSPACE/baked-config-secure/${E_D} -e edxapp_code_dir=$WORKSPACE/edx-platform -s --ask-sudo-pass --diff
diff --git a/util/install/ansible-bootstrap.sh b/util/install/ansible-bootstrap.sh
@@ -136,7 +136,7 @@ if [[ "true" == "${RUN_ANSIBLE}" ]]; then
     git checkout ${CONFIGURATION_VERSION}
     make requirements
 
-    cd "${CONFIGURATION_DIR}"/playbooks/edx-east
+    cd "${CONFIGURATION_DIR}"/playbooks
     "${PYTHON_BIN}"/ansible-playbook edx_ansible.yml -i '127.0.0.1,' -c local -e "configuration_version=${CONFIGURATION_VERSION}"
 
     # cleanup

diff --git a/util/jenkins/ansible-provision.sh b/util/jenkins/ansible-provision.sh
@@ -179,7 +179,7 @@ dns_name="${dns_name,,}"
 deploy_host="${dns_name}.${dns_zone}"
 ssh-keygen -f "/var/lib/jenkins/.ssh/known_hosts" -R "$deploy_host"
 
-cd playbooks/edx-east
+cd playbooks
 
 cat << EOF > $extra_vars_file
 edx_platform_version: $edxapp_version

diff --git a/util/jenkins/build-ami.sh b/util/jenkins/build-ami.sh
@@ -74,8 +74,8 @@ if [[ "$use_blessed" == "true" ]]; then
   blessed_params="--blessed"
 fi
 
-if [[ -e "configuration/playbooks/edx-east/${play}.yml" ]]; then
-  playbookdir_params="--playbook-dir configuration/playbooks/edx-east"
+if [[ -e "configuration/playbooks/${play}.yml" ]]; then
+  playbookdir_params="--playbook-dir configuration/playbooks"
 else
   playbookdir_params="--playbook-dir ansible-private"
 fi

diff --git a/util/jenkins/run-ansible.sh b/util/jenkins/run-ansible.sh
@@ -19,7 +19,7 @@ if [[
     exit 1
 fi
 
-cd $WORKSPACE/configuration/playbooks/edx-east
+cd $WORKSPACE/configuration/playbooks
 
 ansible_extra_vars+=" -e serial_count=$serial_count -e elb_pre_post=$elb_pre_post"
 

diff --git a/util/packer/jenkins_worker.json b/util/packer/jenkins_worker.json
@@ -54,7 +54,7 @@
       "sudo bash ./ansible-bootstrap.sh" ]
   }, {
     "type": "ansible-local",
-    "playbook_file": "../../playbooks/edx-east/jenkins_worker.yml",
+    "playbook_file": "../../playbooks/jenkins_worker.yml",
     "playbook_dir": "../../playbooks",
     "command": ". {{user `venv_dir`}}/bin/activate && ansible-playbook",
     "inventory_groups": "jenkins_worker",

diff --git a/util/packer/jenkins_worker_android.json b/util/packer/jenkins_worker_android.json
@@ -53,7 +53,7 @@
       "sudo bash ./ansible-bootstrap.sh" ]
   }, {
     "type": "ansible-local",
-    "playbook_file": "../../playbooks/edx-east/jenkins_worker_android.yml",
+    "playbook_file": "../../playbooks/jenkins_worker_android.yml",
     "playbook_dir": "../../playbooks",
     "command": ". {{user `venv_dir`}}/bin/activate && ansible-playbook",
     "inventory_groups": "jenkins_worker",

diff --git a/util/packer/jenkins_worker_loadtest.json b/util/packer/jenkins_worker_loadtest.json
@@ -53,7 +53,7 @@
       "sudo bash ./ansible-bootstrap.sh" ]
   }, {
     "type": "ansible-local",
-    "playbook_file": "../../playbooks/edx-east/jenkins_worker_loadtest_driver.yml",
+    "playbook_file": "../../playbooks/jenkins_worker_loadtest_driver.yml",
     "playbook_dir": "../../playbooks",
     "command": ". {{user `venv_dir`}}/bin/activate && ansible-playbook",
     "inventory_groups": "jenkins_worker",

diff --git a/util/packer/jenkins_worker_simple.json b/util/packer/jenkins_worker_simple.json
@@ -54,7 +54,7 @@
       "sudo bash ./ansible-bootstrap.sh" ]
   }, {
     "type": "ansible-local",
-    "playbook_file": "../../playbooks/edx-east/jenkins_worker.yml",
+    "playbook_file": "../../playbooks/jenkins_worker.yml",
     "playbook_dir": "../../playbooks",
     "command": ". {{user `venv_dir`}}/bin/activate && ansible-playbook",
     "inventory_groups": "jenkins_worker",

diff --git a/util/parsefiles_config.yml b/util/parsefiles_config.yml
@@ -2,7 +2,6 @@ roles_paths:
   - playbooks/roles
 aws_plays_paths:
   - playbooks
-  - playbooks/edx-east
 docker_plays_paths:
   - docker/plays
 weights:

diff --git a/util/vpc-tools/abbey.py b/util/vpc-tools/abbey.py
@@ -65,7 +65,7 @@ def parse_args():
                         metavar="PLAY", required=True)
     parser.add_argument('--playbook-dir',
                         help='directory to find playbooks in',
-                        default='configuration/playbooks/edx-east',
+                        default='configuration/playbooks',
                         metavar="PLAYBOOKDIR", required=False)
     parser.add_argument('-d', '--deployment', metavar="DEPLOYMENT",
                         required=True)
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ if [[ @@
         exit 1
     fi
-    cd $WORKSPACE/configuration/playbooks/edx-east
+    cd $WORKSPACE/configuration/playbooks
     ansible_extra_vars+=" -e serial_count=$serial_count -e elb_pre_post=$elb_pre_post"
@@ Expand Down @@