Merge pull request #384 from edx/jarv/reconfigure-from-jenkins

adding reconfigure option for

util/jenkins/ansible-configure.sh

-#!/usr/bin/env bash
-
-# Ansible configuration/deploy wrapper script that
-# assumes the following parameters set
-# as environment variables
-#
-# - dns_name - REQUIRED
-# - dns_zone 
-# - edxapp_version
-# - forum_version
-# - xqueue_version
-# - xserver_version
-# - ora_version
-# - ease_version
-# - deploy
-# - keypair
-
-
-export BOTO_CONFIG=/var/lib/jenkins/${aws_account}.boto
-
-if [[ -z $WORKSPACE ]]; then
-    dir=$(dirname $0)
-    source "$dir/ascii-convert.sh"
-else
-    source "$WORKSPACE/util/jenkins/ascii-convert.sh"
-fi
-
-if [[ -z $dns_name ]]; then
-  echo "The hostname is required to know what machine to configure"
-  exit 1
-fi
-
-if [[ ! -f $BOTO_CONFIG ]]; then
-  echo "AWS credentials not found for $aws_account"
-  exit 1
-fi
-
-extra_vars="/var/tmp/extra-vars-$$.yml"
-
-cat << EOF > $extra_vars
----
-EDXAPP_PREVIEW_LMS_BASE: preview.${dns_name}.${dns_zone}
-EDXAPP_LMS_BASE: ${dns_name}.${dns_zone}
-EDXAPP_LMS_PREVIEW_NGINX_PORT: 80
-EDXAPP_CMS_NGINX_PORT: 80
-XSERVER_GRADER_CHECKOUT: False
-c_skip_grader_checkout: True
-
-edx_platform_commit: $edxapp_version
-forum_version: $forum_version
-xqueue_version: $xqueue_version
-xserver_version: $xserver_version
-ora_version: $ora_version
-ease_version: $ease_version
-
-ansible_ssh_private_key_file: /var/lib/jenkins/${keypair}.pem
-
-EOF
-
-
-cat $extra_vars
-
-
-cd playbooks/edx-east
-./ec2.py --refresh
-ansible-playbook -vvv $playbook  -i ./ec2.py -e "@$extra_vars"  --user ubuntu --tags deploy

util/jenkins/ansible-deploy.sh

@@ -52,6 +52,11 @@ COMMON_PYPI_MIRROR_URL: 'https://pypi.edx.org/root/pypi/+simple/'
 COMMON_GIT_MIRROR: 'git.edx.org'
 
 migrate_only: '$run_migration'
+
+XSERVER_GRADER_DIR: "{{ xserver_data_dir }}/data/content-mit-600x~2012_Fall"
+XSERVER_GRADER_SOURCE: "git@github.com:/MITx/6.00x.git"
+XSERVER_LOCAL_GIT_IDENTITY: /var/lib/jenkins/git-identity-edx-pull
+
 EOF
 
 cat $extra_vars
@@ -69,6 +74,13 @@ deploy[ora]=$ora
 ssh-keygen -f "/var/lib/jenkins/.ssh/known_hosts" -R "$deploy_host"
 
 cd playbooks/edx-east
+
+# If reconfigure was selected run non-deploy tasks for all roles
+if [[ $reconfigure == "true" ]]; then
+    ansible-playbook -vvvv edx_continuous_integration.yml -i "${deploy_host}," -e "@${extra_vars}" --user ubuntu --skip-tags deploy
+fi
+
+# Run deploy tasks for the roles selected
 for i in "${!deploy[@]}"; do
     if [[ ${deploy[$i]} == "true" ]]; then
         ansible-playbook -vvvv deploy_${i}.yml -i "${deploy_host}," -e "@${extra_vars}" --user ubuntu --tags deploy