From 221e28da38628283baa13e6daba2e6d723f4836c Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Mon, 3 Aug 2015 01:36:48 +0000
Subject: [PATCH] fix up various incompatibilities
---
roles/etcHosts/files/makehosts.py | 2 +-
roles/etcHosts/tasks/main.yml | 2 +-
roles/ldapserver/tasks/main.yml | 1 +
roles/slurm-common/tasks/installSlurmFromSource.yml | 10 ++++++++++
roles/slurm-common/tasks/main.yml | 8 ++------
roles/slurm-sql/tasks/main.yml | 1 +
roles/slurmdb-config/tasks/main.yml | 5 +----
7 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/roles/etcHosts/files/makehosts.py b/roles/etcHosts/files/makehosts.py
index 9f68ef10..fa830d92 100755
--- a/roles/etcHosts/files/makehosts.py
+++ b/roles/etcHosts/files/makehosts.py
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/python
import sys
import json
import socket
diff --git a/roles/etcHosts/tasks/main.yml b/roles/etcHosts/tasks/main.yml
index a1029fa0..9d8e8fe8 100644
--- a/roles/etcHosts/tasks/main.yml
+++ b/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
register: hosts_data
diff --git a/roles/ldapserver/tasks/main.yml b/roles/ldapserver/tasks/main.yml
index 86c6b1f0..1a2ab0e0 100644
--- a/roles/ldapserver/tasks/main.yml
+++ b/roles/ldapserver/tasks/main.yml
@@ -145,6 +145,7 @@
with_items:
- ppolicy
- cosine
+ - nis
ignore_errors: true
when: ansible_os_family == 'RedHat' and ansible_distribution_major_version >= '7'
diff --git a/roles/slurm-common/tasks/installSlurmFromSource.yml b/roles/slurm-common/tasks/installSlurmFromSource.yml
index c01b5f80..a172b990 100644
--- a/roles/slurm-common/tasks/installSlurmFromSource.yml
+++ b/roles/slurm-common/tasks/installSlurmFromSource.yml
@@ -1,3 +1,13 @@
+- 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
diff --git a/roles/slurm-common/tasks/main.yml b/roles/slurm-common/tasks/main.yml
index 8a22cc68..e4c4629c 100644
--- a/roles/slurm-common/tasks/main.yml
+++ b/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
diff --git a/roles/slurm-sql/tasks/main.yml b/roles/slurm-sql/tasks/main.yml
index 954d5952..fb094809 100644
--- a/roles/slurm-sql/tasks/main.yml
+++ b/roles/slurm-sql/tasks/main.yml
@@ -11,6 +11,7 @@
sudo: true
with_items:
- mysql-server
+ - python-mysqldb
when: ansible_os_family == "Debian"
- name: "Start the Server"
diff --git a/roles/slurmdb-config/tasks/main.yml b/roles/slurmdb-config/tasks/main.yml
index 8d9fbd00..71c0b928 100644
--- a/roles/slurmdb-config/tasks/main.yml
+++ b/roles/slurmdb-config/tasks/main.yml
@@ -13,6 +13,7 @@
sudo: true
with_items:
- mysql-client
+ - libmysqlclient-dev
- python-mysqldb
when: ansible_os_family == "Debian"
@@ -31,7 +32,3 @@
sudo: true
when: slurm_dir is not defined
-- name: sanity check slurmdbd service
- service: "name=slurmdbd enabled=yes state=started"
- sudo: true
-
--
GitLab