Kill edx-east (#4596)

* Remove edx-east folder, replace with symlink.

.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

.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

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]

playbooks/edx-east

+.
\ No newline at end of file

playbooks/edx-east/README.rst

-This directory contains playbooks used by edx-east for provisioning
-
-::
-
-    ansible-playbook -c ssh -vvv --user=ubuntu <playbook> -i ./ec2.py  -e 'secure_dir=path/to/configuration-secure/ansible'
-
-Historical note: "edx-east" represents the edX organization in Cambridge, MA.
-At one point, an "edx-west" notion existed - a name which represented Stanford
-edX developers.

playbooks/edx-east/ansible.cfg

-# config file for ansible -- http://ansible.github.com
-# nearly all parameters can be overridden in ansible-playbook or with command line flags
-# ansible will read ~/.ansible.cfg or /etc/ansible/ansible.cfg, whichever it finds first
-
-[defaults]
-
-jinja2_extensions=jinja2.ext.do
-host_key_checking=False
-roles_path=../../../ansible-roles/roles:../../../ansible-private/roles:../../../ansible-roles/
-ansible_managed=This file is created and updated by ansible, edit at your peril
-
-[ssh_connection]
-ssh_args=-o ControlMaster=auto -o ControlPersist=60s -o ControlPath="~/.ansible/tmp/ansible-ssh-%h-%p-%r" -o ServerAliveInterval=30
-retries=5

playbooks/edx-east/callback_plugins

-../callback_plugins
\ No newline at end of file

playbooks/edx-east/ec2.py

-../ec2.py
\ No newline at end of file

playbooks/edx-east/group_vars

-../group_vars
\ No newline at end of file

playbooks/edx-east/inventory.ini

-../inventory.ini
\ No newline at end of file

playbooks/edx-east/library

-../library
\ No newline at end of file

playbooks/edx-east/roles

-../roles
\ No newline at end of file

playbooks/group_vars/tag_environment_prod

 ---
 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'

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"

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:
 #

playbooks/sample_vars/test-mongo.yml

 # 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

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

tests/test_edx_east_roles.sh → tests/test_playbooks.sh

 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

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

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

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

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

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"
 

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",

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",

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",

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",

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:

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)