Move variables, rename variables.

playbooks/roles/edxlocal/tasks/main.yml

@@ -70,5 +70,5 @@
     password=password
     state=present
 
-- name: edxlocal | install edxlocal specific system packages
-  apt: pkg={{','.join(edxlocal_debian_pkgs)}} state=present
+- name: edxlocal | install memcached
+  apt: pkg=memcached state=present
\ No newline at end of file

playbooks/roles/jenkins/tasks/browsers.yml

@@ -3,15 +3,15 @@
   apt: pkg=firefox
 
 - name: Download PhantomJS
-  get_url: url={{ phantomjs_url }}
-           dest=/var/tmp/{{ phantomjs_archive }}
+  get_url: url={{ jenkins_phantomjs_url }}
+           dest=/var/tmp/{{ jenkins_phantomjs_archive }}
 
 - name: Untar PhantomJS
-  command: tar -xjf /var/tmp/{{ phantomjs_archive }} -C /var/tmp/
-           creates=/var/tmp/{{ phantomjs_folder }}
+  command: tar -xjf /var/tmp/{{ jenkins_phantomjs_archive }} -C /var/tmp/
+           creates=/var/tmp/{{ jenkins_phantomjs_folder }}
 
 - name: Install PhantomJS
-  command: mv /var/tmp/{{ phantomjs_folder }} /usr/local/bin/phantomjs
+  command: mv /var/tmp/{{ jenkins_phantomjs_folder }} /usr/local/bin/phantomjs
            creates=/usr/local/bin/phantomjs
 
 - name: Set PhantomJS permissions

playbooks/roles/jenkins/tasks/jenkins.yml

@@ -2,6 +2,9 @@
 - name: Add the jenkins user to the edx group
   user: name=jenkins append=yes groups="edx"
 
+- name: edxlocal | install jenkins specific system packages
+  apt: pkg={{','.join(jenkins_debian_pkgs)}} state=present
+
 - name: Install gcli
   sudo_user: jenkins
   shell: /home/jenkins/.rbenv/bin/rbenv exec gem install github_cli

playbooks/roles/jenkins/vars/main.yml

 ---
 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
+jenkins_phantomjs_url: https://phantomjs.googlecode.com/files/phantomjs-1.9.1-linux-x86_64.tar.bz2
+jenkins_phantomjs_archive: phantomjs-1.9.1-linux-x86_64.tar.bz2
+jenkins_phantomjs_folder: phantomjs-1.9.1-linux-x86_64
 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_ruby_version: "1.9.3-p448"
+jenkins_debian_pkgs:
+    - 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_plugins:
     - ant.hpi
     - backup.hpi