Merge branch 'hpciddebugfix3' into 'master'

Fixed dependency version issues

Fixed version issues, it should work now

See merge request !30

roles/karaage3.1.17/tasks/karaage.yml

@@ -51,22 +51,15 @@
 
 -
  name: "Getting Karaage from Github"
- git: repo="https://github.com/monash-merc/karaage.git" dest="/root/karaage3.1.7" {% if karaage_source_version is defined %}version="{{ karaage_source_version }}" {% endif %} force=yes
+ git: repo="https://github.com/monash-merc/karaage.git" dest="/root/karaage3.1.7" force=yes
  sudo: true
 
--
- name: "Installing Karaage Dependencies"
- pip: name={{ item }}
- sudo: true
- with_items:
-  - six
-  - slimit
-  - ply
-  - cython
-  - django-celery
-  - pyasn1
-  - ldap3
-#  - mod_wsgi
+- name: Copy dependence file
+  copy: src=files/requirements.txt dest=/tmp/requirements.txt mode=644
+
+- name: "Installing Karaage Dependencies"
+  pip: requirements=/tmp/requirements.txt
+  sudo: true
 -
  name: "Restrict Django version to 1.7.8"
  sudo: true

roles/karaage3.1.17/tasks/prerequisitesDebian.yml

@@ -5,18 +5,6 @@
   apt: name={{ item }} update_cache=yes
   with_items:
    - debian-keyring
-- 
-  apt_key: "url=http://code.vpac.org/debian/vpac-debian-key.gpg state=present"
-  name: "Installing the VPAC Debian Archive signing key"
-  sudo: true
-- 
-  apt_repository: "repo='deb     http://code.vpac.org/debian  jessie main' state=present"
-  name: "Adding VPAC repository in the source list"
-  sudo: true
-- 
-  apt_repository: "repo='deb-src http://code.vpac.org/debian  jessie main' state=present"
-  name: "Adding VPAC source repository"
-  sudo: true
 - 
   apt: update_cache=yes
   name: "Upgrading apt..."