From fcf55f096f2d42e44b45a25d82f6a2ce0f0a3881 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Wed, 13 Jul 2016 04:35:11 +0000
Subject: [PATCH] download source code from a server under our control to speed
things up
---
roles/lmod/tasks/main.yml | 2 +-
roles/nhc/tasks/main.yml | 2 +-
.../tasks/installMungeFromSource.yml | 14 ++++++--------
.../tasks/installSlurmFromSource.yml | 17 +++++++----------
4 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/roles/lmod/tasks/main.yml b/roles/lmod/tasks/main.yml
index d62f9fad..b707be22 100644
--- a/roles/lmod/tasks/main.yml
+++ b/roles/lmod/tasks/main.yml
@@ -30,7 +30,7 @@
- name: Download LMOD
get_url:
- url=http://downloads.sourceforge.net/project/lmod/Lmod-{{ lmod_version }}.tar.bz2
+ url=http://consistency0/src/Lmod-{{ lmod_version }}.tar.bz2
dest={{source_dir}}/Lmod-{{ lmod_version }}.tar.bz2
mode=0444
diff --git a/roles/nhc/tasks/main.yml b/roles/nhc/tasks/main.yml
index e603ac97..0cc79dd8 100644
--- a/roles/nhc/tasks/main.yml
+++ b/roles/nhc/tasks/main.yml
@@ -14,7 +14,7 @@
- name: unarchive nhc
unarchive:
args:
- src: "https://github.com/mej/nhc/archive/{{ nhc_version }}.tar.gz"
+ src: "http://consistency0/src/{{ nhc_version }}.tar.gz"
copy: no
dest: /tmp
creates: /tmp/nhc-{{ nhc_version }}/autogen.sh
diff --git a/roles/slurm-common/tasks/installMungeFromSource.yml b/roles/slurm-common/tasks/installMungeFromSource.yml
index 8d27a453..39610951 100644
--- a/roles/slurm-common/tasks/installMungeFromSource.yml
+++ b/roles/slurm-common/tasks/installMungeFromSource.yml
@@ -1,15 +1,13 @@
-- name: get munge
- shell: wget https://munge.googlecode.com/files/munge-{{ munge_version }}.tar.bz2
- args:
- chdir: /tmp
- creates: /tmp/munge-{{ munge_version }}.tar.bz2
-- name: untar munge
- shell: tar jxf munge-{{ munge_version }}.tar.bz2
+- name: unarchive munge
+ unarchive:
args:
- chdir: /tmp
+ src: "http://consistency0/src/munge-{{ munge_version }}.tar.bz2"
+ copy: no
+ dest: /tmp
creates: /tmp/munge-{{ munge_version }}/configure
+
- name: build munge
shell: ./configure --prefix={{ munge_dir }} && make
args:
diff --git a/roles/slurm-common/tasks/installSlurmFromSource.yml b/roles/slurm-common/tasks/installSlurmFromSource.yml
index c551d239..be136da9 100644
--- a/roles/slurm-common/tasks/installSlurmFromSource.yml
+++ b/roles/slurm-common/tasks/installSlurmFromSource.yml
@@ -8,18 +8,15 @@
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
- args:
- chdir: /tmp
- creates: /tmp/slurm-{{ slurm_version }}.tar.bz2
-- name: untar slurm
- shell: tar jxf /tmp/slurm-{{ slurm_version }}.tar.bz2
+- name: unarchive slurm
+ unarchive:
args:
- chdir: /tmp
- creates: /tmp/slumr-{{ slurm_version }}
+ src: "http://consistency0/src/slurm-{{ slurm_version }}.tar.bz2"
+ copy: no
+ dest: /tmp
+ creates: /tmp/slurm-{{ slurm_version }}
+
- name: build slurm
shell: ./configure --prefix={{ slurm_dir }} --with-munge={{ munge_dir }} && make
--
GitLab