Merge pull request #913 from edx/derf/parameterize_ami_build_job

re-enable ansible parameterization for build-ami

playbooks/roles/jenkins_admin/templates/edx/var/jenkins/jobs/build-ami/config.xml.j2

@@ -152,39 +152,39 @@
       <command>
 #!/bin/bash -x
 
-if [[ "\$play" == "" ]]; then
+if [[ "$play" == "" ]]; then
     echo "No Play Specified. Nothing to Do."
     exit 0
 fi
 
 export PYTHONUNBUFFERED=1
-export PIP_DOWNLOAD_CACHE=\$WORKSPACE/pip-cache
+export PIP_DOWNLOAD_CACHE=$WORKSPACE/pip-cache
 
 cd configuration
 pip install -r requirements.txt
 
 cd util/vpc-tools/
 
-echo "\$refs" > /var/tmp/$BUILD_ID-refs.yml
+echo "$refs" > /var/tmp/$BUILD_ID-refs.yml
 cat /var/tmp/$BUILD_ID-refs.yml
 
-echo "\$vars" > /var/tmp/$BUILD_ID-extra-vars.yml
+echo "$vars" > /var/tmp/$BUILD_ID-extra-vars.yml
 cat /var/tmp/$BUILD_ID-extra-vars.yml
 
-python -u abbey.py -p \$play -t c1.medium  -d \$deployment -e \$environment -i /edx/var/jenkins/.ssh/id_rsa -b \$base_ami --vars /var/tmp/\$BUILD_ID-extra-vars.yml --refs /var/tmp/\$BUILD_ID-refs.yml -c \$BUILD_NUMBER --configuration-version \$configuration --configuration-secure-version \$configuration_secure -k deployment --configuration-secure-repo "git@github.com:edx-ops/prod-secure.git"
+python -u abbey.py -p $play -t c1.medium  -d $deployment -e $environment -i /edx/var/jenkins/.ssh/id_rsa -b $base_ami --vars /var/tmp/$BUILD_ID-extra-vars.yml --refs /var/tmp/$BUILD_ID-refs.yml -c $BUILD_NUMBER --configuration-version $configuration --configuration-secure-version $configuration_secure -k {{JENKINS_ADMIN_EC2_KEY}} --configuration-secure-repo &quot;{{JENKINS_ADMIN_CONFIGURATION_SECURE_REPO}}&quot;
       </command>
       <ignoreExitCode>false</ignoreExitCode>
     </jenkins.plugins.shiningpanda.builders.VirtualenvBuilder>
     <hudson.tasks.Shell>
       <command>#!/bin/bash -x
 
-if [[(&quot;\$play&quot; == &quot;&quot;)]]; then
+if [[(&quot;$play&quot; == &quot;&quot;)]]; then
     echo &quot;No Play Specified. Nothing to Do.&quot;
     exit 0
 fi
 
-rm /var/tmp/\$BUILD_ID-extra-vars.yml
-rm /var/tmp/\$BUILD_ID-refs.yml</command>
+rm /var/tmp/$BUILD_ID-extra-vars.yml
+rm /var/tmp/$BUILD_ID-refs.yml</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers/>