Make vars more readable, parameterize out rbenv vars

playbooks/jenkins.yml

@@ -3,10 +3,10 @@
   sudo: True
   gather_facts: True
   roles:
-    - role: rbenv
-      rbenv_user: jenkins
-      rbenv_user_home: /home/jenkins
-      rbenv_ruby_version: 1.9.3-p374
     - common
     - edxlocal
+    - role: rbenv
+      rbenv_user: "{{ jenkins_user }}"
+      rbenv_user_home: "{{ jenkins_user_home }}"
+      rbenv_ruby_version: "{{ jenkins_ruby_version }}"
     - jenkins

playbooks/roles/jenkins/vars/main.yml

@@ -3,7 +3,27 @@ jenkins_home: /var/lib/jenkins
 phantomjs_url: https://phantomjs.googlecode.com/files/phantomjs-1.9.1-linux-x86_64.tar.bz2
 phantomjs_archive: phantomjs-1.9.1-linux-x86_64.tar.bz2
 phantomjs_folder: phantomjs-1.9.1-linux-x86_64
-edxlocal_debian_pkgs: ["memcached", "ruby-bundler","rubygems","rbenv","npm","libgraphviz-dev","gfortran","libopenblas-dev","liblapack-dev","libxml2-dev","libgeos-dev","python-dev","libmysqlclient-dev","build-essential","pkg-config","libxslt1-dev","rake"]
+jenkins_user: "jenkins"
+jenkins_user_home: /home/jenkins
+jenkins_ruby_version: "1.9.3-p374"
+edxlocal_debian_pkgs:
+    ["memcached",
+    "ruby-bundler",
+    "rubygems",
+    "rbenv",
+    "npm",
+    "libgraphviz-dev",
+    "gfortran",
+    "libopenblas-dev",
+    "liblapack-dev",
+    "libxml2-dev",
+    "libgeos-dev",
+    "python-dev",
+    "libmysqlclient-dev",
+    "build-essential",
+    "pkg-config",
+    "libxslt1-dev",
+    "rake"]
 ruby_version: 1.9.3-p374
 jenkins_plugins:
     - ant.hpi