Merge pull request #105 from l1ll1/master

rearrange/rename slurm roles

roles/etcHosts/files/makehosts.py

-#!/bin/env python
+#!/usr/bin/python
 import sys
 import json
 import socket

roles/etcHosts/tasks/main.yml

@@ -9,7 +9,7 @@
   run_once: True
 
 - name: make hosts data
-  shell: source /root/.bash_profile; /tmp/makehosts.py /tmp/groups {{ domain }}
+  command: /tmp/makehosts.py /tmp/groups {{ domain }}
   delegate_to: 127.0.0.1
   run_once: True
   sudo: true

roles/slurm-from-source/tasks/installSlurmFromSource.yml → roles/slurm-common/tasks/installSlurmFromSource.yml

+- name: remove all install
+  shell: rm -rf /tmp/slurm-{{ slurm_version }}
+  sudo: true 
+  when: force_slurm_recompile is defined
+
+- name: remove all install
+  shell: rm -rf {{ slurm_dir }}
+  sudo: true 
+  when: force_slurm_recompile is defined
+
 - name: get slurm
   shell: wget https://cvl.massive.org.au/slurm-{{ slurm_version }}.tar.bz2
 #  shell: wget http://www.schedmd.com/download/archive/slurm-{{ slurm_version }}.tar.bz2

roles/slurm-from-source/tasks/main.yml → roles/slurm-common/tasks/main.yml

@@ -54,8 +54,6 @@
     - perl
     - perl-DBI
     - openssl-devel
-    - mysql
-    - mysql-devel
     - gcc
     - rpm-build
     - wget
@@ -83,11 +81,9 @@
     - make
     - perl
     - libdbi-perl
-    - mysql-server
-    - mysql-client
-    - python-mysqldb
-    - libmysqlclient-dev
     - lua5.2
+    - hwloc
+    - libhwloc-dev
   when: ansible_os_family == "Debian"
 
 - include: installMungeFromSource.yml