From 64ac8d6d1564a142bf51ea27f5f2659051d9227f Mon Sep 17 00:00:00 2001
From: Jupiter Hu <jupiter.hu@monash.edu>
Date: Tue, 3 May 2016 11:44:27 +1000
Subject: [PATCH] Fixed dependency version issues
---
roles/karaage3.1.17/tasks/karaage.yml | 21 +++++++------------
.../tasks/prerequisitesDebian.yml | 12 -----------
2 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/roles/karaage3.1.17/tasks/karaage.yml b/roles/karaage3.1.17/tasks/karaage.yml
index c9356769..aae0d0b9 100644
--- a/roles/karaage3.1.17/tasks/karaage.yml
+++ b/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
diff --git a/roles/karaage3.1.17/tasks/prerequisitesDebian.yml b/roles/karaage3.1.17/tasks/prerequisitesDebian.yml
index c0517a92..2b21c1c8 100644
--- a/roles/karaage3.1.17/tasks/prerequisitesDebian.yml
+++ b/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..."
--
GitLab