fix conflits

.travis.yml

@@ -26,4 +26,5 @@ script:
   - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
 
 notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
+

README.md

@@ -140,8 +140,11 @@ Apache v2
 Author Information
 ------------------
 
-Mario David: [email protected]
-LIP and Indigo-DataCloud project
+Mario David: <[email protected]>
+
+LIP Lisbon: http://www.lip.pt
+
+Indigo DataCloud: https://www.indigo-datacloud.eu/
 
 Acknowledgments
 ---------------

defaults/main.yml

@@ -3,7 +3,7 @@
 nvidia_driver_version: 352.93
 
 # Haddocking application: disvis or powerfit
-haddock_app: disvis
+haddock_app: powerfit
 
 # Variables related to NVIDIA url and executable
 base_url: http://us.download.nvidia.com/XFree86/Linux-x86_64

docker-powerfit/Dockerfile

@@ -1,7 +1,8 @@
-# docker build -t powerfit .
+# docker build --rm -t powerfit .
 
 FROM indigodatacloud/ubuntu-sshd:14.04
 MAINTAINER Mario David <[email protected]>
+LABEL description="Run Powerfit application"
 
 RUN ansible-galaxy install indigo-dc.disvis-powerfit && \
     ansible-playbook /etc/ansible/roles/indigo-dc.disvis-powerfit/tests/powerfit.yml

docker-powerfit/README.md

@@ -1,3 +1,5 @@
+[![License](http://img.shields.io/:license-apache-blue.svg?style=flat-square)](http://www.apache.org/licenses/LICENSE-2.0.html)
+
 docker-powerfit
 ===============
 
@@ -68,8 +70,11 @@ Apache v2
 Author Information
 ------------------
 
-Mario David: [email protected]
-LIP and Indigo-DataCloud project
+Mario David: <[email protected]>
+
+LIP Lisbon: http://www.lip.pt
+
+Indigo DataCloud: https://www.indigo-datacloud.eu/
 
 Acknowledgments
 ---------------

tasks/main.yml

@@ -22,9 +22,19 @@
 - name: clone git repositories
   git: repo={{ item.repo }} dest={{ item.dest }} clone=yes
   with_items:
-    - { repo: "https://github.com/haddocking/{{ haddock_app }}.git", dest: "/usr/local/{{ haddock_app }}" }
     - { repo: "https://github.com/clMathLibraries/clFFT.git", dest: "/usr/local/clFFT" }
-    - { repo: "https://github.com/geggo/gpyfft.git", dest: "/usr/local/gpyfft" }
+
+- name: clone git repositories powerfit
+  git: repo={{ item.repo }} dest={{ item.dest }} version="redo-rotation" clone=yes
+  with_items:
+    - { repo: "https://github.com/haddocking/{{ haddock_app }}.git", dest: "/usr/local/{{ haddock_app }}" }
+  when: haddock_app == "powerfit"
+
+- name: clone git repositories disvis
+  git: repo={{ item.repo }} dest={{ item.dest }} clone=yes
+  with_items:
+    - { repo: "https://github.com/haddocking/{{ haddock_app }}.git", dest: "/usr/local/{{ haddock_app }}" }
+  when: haddock_app == "disvis"
 
 - name: wget nvidia driver
   get_url: url={{ nvidia_url }} dest=/usr/local mode=700
@@ -37,12 +47,12 @@
 
 - name: install clFFT - configure
   command: cmake CMakeLists.txt chdir=/usr/local/clFFT/src
-  environment:
+  env:
     LD_LIBRARY_PATH: /usr/lib/x86_64-linux-gnu
 
 - name: make install clFFT
   command: make install chdir=/usr/local/clFFT/src
-  environment:
+  env:
     LD_LIBRARY_PATH: /usr/lib/x86_64-linux-gnu
 
 - name: pip install python modules
@@ -64,11 +74,14 @@
   pip: name=pyopencl
   when: haddock_app == "powerfit"
 
+- name: pip install gpyfft
+  pip: name="git+https://github.com/geggo/gpyfft.git" editable=false state=present
+
 - name: pip install gpyfft and {{ haddock_app }}
   pip: name={{ item }} state=present
   with_items:
-    - "file:///usr/local/gpyfft"
     - "file:///usr/local/{{ haddock_app }}"
 
 - name: unarchive powerfit examples
   unarchive: src=http://www.lip.pt/~david/powerfit-example.tgz dest=/home copy=no
+  when: haddock_app == "powerfit"

tests/test.yml

@@ -1,4 +1,5 @@
 ---
 - hosts: localhost
   roles:
-    - { role: ansible-role-disvis-powerfit, nvidia_driver_version: 352.93, haddock_app: powerfit }
+    - ansible-role-disvis-powerfit
+