factoring out common vars into a separate file

util/jenkins/ansible-deploy.sh

@@ -26,47 +26,23 @@ fi
 
 extra_vars="/var/tmp/extra-vars-$$.yml"
 
+
 if [[ -z $deploy_host ]]; then
   deploy_host="${github_username}.m.sandbox.edx.org"
 fi
 
+source "$dir/create-var-file.sh"
 
-cat << EOF > $extra_vars
----
-
-EDXAPP_PREVIEW_LMS_BASE: preview.${deploy_host}
-EDXAPP_LMS_BASE: ${deploy_host}
-EDXAPP_LMS_NGINX_PORT: 80
-EDXAPP_LMS_PREVIEW_NGINX_PORT: 80
-EDXAPP_CMS_NGINX_PORT: 80
-
+# vars specific to deploy added to $extra-vars
+cat << EOF >> $extra_vars
 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
-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
-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
-
 EOF
 
-cat $extra_vars
 
 echo "Deploying to $deploy_host"
 

util/jenkins/ansible-provision.sh

@@ -63,13 +63,13 @@ if [[ -z $instance_type ]]; then
 
 fi
 
-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
-ansible_ssh_private_key_file: /var/lib/jenkins/${keypair}.pem
+deploy_host="${dns_name}.${dns_zone}"
+
+# creates a var file 
+source "$dir/create-var-file.sh"
+
+# vars specific to provisioning added to $extra-vars
+cat << EOF >> $extra_vars
 dns_name: $dns_name
 keypair: $keypair
 instance_type: $instance_type
@@ -79,8 +79,6 @@ region: $region
 instance_tags: '{"environment": "$environment", "github_username": "$github_username", "Name": "$name_tag", "source": "jenkins", "owner": "$BUILD_USER"}'
 root_ebs_size: $root_ebs_size
 name_tag: $name_tag
-COMMON_PYPI_MIRROR_URL: 'https://pypi.edx.org/root/pypi/+simple/'
-COMMON_GIT_MIRROR: 'git.edx.org'
 gh_users:
   - jarv
   - feanil

util/jenkins/create-var-file.sh

+cat << EOF > $extra_vars
+---
+ansible_ssh_private_key_file: /var/lib/jenkins/${keypair}.pem
+EDXAPP_PREVIEW_LMS_BASE: preview.${deploy_host}
+EDXAPP_LMS_BASE: ${deploy_host}
+EDXAPP_LMS_NGINX_PORT: 80
+EDXAPP_LMS_PREVIEW_NGINX_PORT: 80
+EDXAPP_CMS_NGINX_PORT: 80
+COMMON_PYPI_MIRROR_URL: 'https://pypi.edx.org/root/pypi/+simple/'
+COMMON_GIT_MIRROR: 'git.edx.org'
+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
+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
+EOF
+
+cat $extra_vars
+
+