Merge remote-tracking branch 'origin' into jarv/ansible-1.4

util/jenkins/ansible-provision.sh

@@ -78,15 +78,55 @@ fi
 deploy_host="${dns_name}.${dns_zone}"
 ssh-keygen -f "/var/lib/jenkins/.ssh/known_hosts" -R "$deploy_host"
 
-if [[ -z $WORKSPACE ]]; then
-    dir=$(dirname $0)
-    source "$dir/create-var-file.sh"
-else
-    source "$WORKSPACE/util/jenkins/create-var-file.sh"
-fi
-
 cd playbooks/edx-east
 
+cat << EOF > $extra_vars
+---
+start_services: $start_services
+ansible_ssh_private_key_file: /var/lib/jenkins/${keypair}.pem
+NGINX_ENABLE_SSL: True
+NGINX_SSL_CERTIFICATE: '/var/lib/jenkins/star.sandbox.edx.org.crt'
+NGINX_SSL_KEY: '/var/lib/jenkins/star.sandbox.edx.org.key'
+EDXAPP_LMS_SSL_NGINX_PORT: 443
+EDXAPP_CMS_SSL_NGINX_PORT: 443
+EDXAPP_PREVIEW_LMS_BASE: preview.${deploy_host}
+EDXAPP_LMS_BASE: ${deploy_host}
+EDXAPP_CMS_BASE: studio.${deploy_host}
+EDXAPP_LMS_NGINX_PORT: 80
+EDXAPP_LMS_PREVIEW_NGINX_PORT: 80
+EDXAPP_CMS_NGINX_PORT: 80
+EDXAPP_SITE_NAME: ${deploy_host}
+COMMON_PYPI_MIRROR_URL: 'https://pypi.edx.org/root/pypi/+simple/'
+XSERVER_GRADER_DIR: "/edx/var/xserver/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
+CERTS_LOCAL_GIT_IDENTITY: /var/lib/jenkins/git-identity-edx-pull
+CERTS_AWS_KEY: $(cat /var/lib/jenkins/certs-aws-key)
+CERTS_AWS_ID: $(cat /var/lib/jenkins/certs-aws-id) 
+CERTS_BUCKET: "verify-test.edx.org"
+migrate_db: "yes"
+openid_workaround: True
+edx_platform_version: $edxapp_version
+forum_version: $forum_version
+xqueue_version: $xqueue_version
+xserver_version: $xserver_version
+ora_version: $ora_version
+ease_version: $ease_version
+certs_version: $certs_version
+discern_version: $discern_version
+
+rabbitmq_ip: "127.0.0.1"
+rabbitmq_refresh: True
+COMMON_HOSTNAME: edx-server
+EDXAPP_STATIC_URL_BASE: $static_url_base
+
+# Settings for Grade downloads
+EDXAPP_GRADE_STORAGE_TYPE: 's3'
+EDXAPP_GRADE_BUCKET: 'edx-grades'
+EDXAPP_GRADE_ROOT_PATH: 'sandbox'
+
+EOF
+
 if [[ $basic_auth == "true" ]]; then
     # vars specific to provisioning added to $extra-vars
     cat << EOF_AUTH >> $extra_vars
@@ -140,8 +180,9 @@ deploy[discern]=$discern
 deploy[certs]=$certs
 
 
-# If reconfigure was selected run non-deploy tasks for all roles
-if [[ $reconfigure == "true" ]]; then
+# If reconfigure was selected or if starting from an ubuntu 12.04 AMI
+# run non-deploy tasks for all roles
+if [[ $reconfigure == "true" || $server_type == "ubuntu_12.04" ]]; then
     cat $extra_vars
     ansible-playbook edx_continuous_integration.yml -i "${deploy_host}," -e "@${extra_vars}" --user ubuntu --skip-tags deploy
 fi

util/jenkins/create-var-file.sh

-# creates a var file with common values for
-# both deployment and provisioning
-cat << EOF > $extra_vars
----
-ansible_ssh_private_key_file: /var/lib/jenkins/${keypair}.pem
-NGINX_ENABLE_SSL: True
-NGINX_SSL_CERTIFICATE: '/var/lib/jenkins/star.sandbox.edx.org.crt'
-NGINX_SSL_KEY: '/var/lib/jenkins/star.sandbox.edx.org.key'
-EDXAPP_LMS_SSL_NGINX_PORT: 443
-EDXAPP_CMS_SSL_NGINX_PORT: 443
-EDXAPP_PREVIEW_LMS_BASE: preview.${deploy_host}
-EDXAPP_LMS_BASE: ${deploy_host}
-EDXAPP_CMS_BASE: studio.${deploy_host}
-EDXAPP_LMS_NGINX_PORT: 80
-EDXAPP_LMS_PREVIEW_NGINX_PORT: 80
-EDXAPP_CMS_NGINX_PORT: 80
-EDXAPP_SITE_NAME: ${deploy_host}
-COMMON_PYPI_MIRROR_URL: 'https://pypi.edx.org/root/pypi/+simple/'
-XSERVER_GRADER_DIR: "/edx/var/xserver/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
-CERTS_LOCAL_GIT_IDENTITY: /var/lib/jenkins/git-identity-edx-pull
-CERTS_AWS_KEY: $(cat /var/lib/jenkins/certs-aws-key)
-CERTS_AWS_ID: $(cat /var/lib/jenkins/certs-aws-id) 
-CERTS_BUCKET: "verify-test.edx.org"
-migrate_db: "yes"
-openid_workaround: True
-edx_platform_version: $edxapp_version
-forum_version: $forum_version
-xqueue_version: $xqueue_version
-xserver_version: $xserver_version
-ora_version: $ora_version
-ease_version: $ease_version
-certs_version: $certs_version
-discern_version: $discern_version
-
-rabbitmq_ip: "127.0.0.1"
-rabbitmq_refresh: True
-COMMON_HOSTNAME: edx-server
-EDXAPP_STATIC_URL_BASE: $static_url_base
-
-# Settings for Grade downloads
-EDXAPP_GRADE_STORAGE_TYPE: 's3'
-EDXAPP_GRADE_BUCKET: 'edx-grades'
-EDXAPP_GRADE_ROOT_PATH: 'sandbox'
-
-EOF