From c56daeee32cec631e449351782c35697de47a627 Mon Sep 17 00:00:00 2001
From: CVL-GitHub <jupiter.hu@monash.edu>
Date: Wed, 18 Feb 2015 00:58:41 +0000
Subject: [PATCH] fix scp
---
roles/slurm-build/tasks/main.yml | 9 +--------
roles/slurmdb/tasks/main.yml | 14 +++-----------
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/roles/slurm-build/tasks/main.yml b/roles/slurm-build/tasks/main.yml
index 56a82878..98d5a14c 100644
--- a/roles/slurm-build/tasks/main.yml
+++ b/roles/slurm-build/tasks/main.yml
@@ -12,14 +12,7 @@
- perl-ExtUtils-MakeMaker
- bzip2-devel
- mysql
-
-- name: install deps in control node
- yum: name={{ item }} state=installed
- sudo: true
- with_items:
- - mysql
- mysql-devel
- when: ansible_hostname == slurmctrl
- name: get munge
shell: wget https://munge.googlecode.com/files/munge-{{ munge_version }}.tar.bz2
@@ -63,7 +56,7 @@
creates: /tmp/rpmbuild/RPMS/x86_64/slurm-{{ slurm_version }}-1.el6.x86_64.rpm
- name: retrieve rpms 1
- shell: scp -r {{ hostvars[ansible_hostname]['ansible_user_id'] }}@{{ ansible_ssh_host }}:/tmp/rpmbuild/ /tmp
+ shell: scp -o StrictHostKeyChecking=no -r {{ hostvars[ansible_hostname]['ansible_user_id'] }}@{{ ansible_ssh_host }}:/tmp/rpmbuild/ /tmp
delegate_to: 127.0.0.1
when: ansible_ssh_host is defined
diff --git a/roles/slurmdb/tasks/main.yml b/roles/slurmdb/tasks/main.yml
index 20efae17..d3fe3097 100644
--- a/roles/slurmdb/tasks/main.yml
+++ b/roles/slurmdb/tasks/main.yml
@@ -13,15 +13,7 @@
sudo: true
- name: install mysql local root password
- mysql_user: check_implicit_admin=True login_user=root login_password="{{ slurmDbRootPassword }}" name=root password="{{ slurmDbRootPassword }}" state=present
- sudo: true
-
-- name: create slurmdb group
- group: name=slurmdb system=yes
- sudo: true
-
-- name: create slurmdb user
- user: name=slurmdb group=slurmdb system=yes createhome=no
+ mysql_user: check_implicit_admin=True login_user=root login_password="{{ sqlrootPassword }}" name=root password="{{ sqlrootPassword }}" state=present
sudo: true
- name: install slurmdbd.conf
@@ -29,10 +21,10 @@
sudo: true
- name: configure database slurmdb localhost
- mysql_user: login_user=root login_password="{{ slurmDbRootPassword }}" name=slurmdb password="{{ slurmDbPassword }}" host=localhost priv=*.*:ALL,GRANT state=present
+ mysql_user: login_user=root login_password="{{ sqlrootPassword }}" name=slurmdb password="{{ slurmDbPassword }}" host=localhost priv=*.*:ALL,GRANT state=present
sudo: true
- name: configure database slurmdb domain
- mysql_user: login_user=root login_password="{{ slurmDbRootPassword }}" name=slurmdb password="{{ slurmDbPassword }}" host="{{ ansible_hostname }}"."{{ ansible_domain }}" priv=*.*:ALL,GRANT state=present
+ mysql_user: login_user=root login_password="{{ sqlrootPassword }}" name=slurmdb password="{{ slurmDbPassword }}" host="{{ ansible_hostname }}"."{{ ansible_domain }}" priv=*.*:ALL,GRANT state=present
sudo: true
--
GitLab