From c39b5492796a88dcc6061593f5a723c8614e4b75 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Thu, 7 Oct 2021 10:39:57 +1100
Subject: [PATCH] clean up the munge install to use the same process as
slumr/ucx etc
---
roles/mysql/vars/Ubuntu_20.yml | 4 +--
.../tasks/installMungeFromSource.yml | 35 +++++++++++++------
2 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/roles/mysql/vars/Ubuntu_20.yml b/roles/mysql/vars/Ubuntu_20.yml
index 26aabeb9..20bb5476 100644
--- a/roles/mysql/vars/Ubuntu_20.yml
+++ b/roles/mysql/vars/Ubuntu_20.yml
@@ -1,6 +1,6 @@
server_packages:
- - python
- - python-dev
+ - python3
+ - python3-dev
- libmariadb-dev
- python3-pip
- libapache2-mod-wsgi
diff --git a/roles/slurm-common/tasks/installMungeFromSource.yml b/roles/slurm-common/tasks/installMungeFromSource.yml
index 4978c4dd..69603178 100644
--- a/roles/slurm-common/tasks/installMungeFromSource.yml
+++ b/roles/slurm-common/tasks/installMungeFromSource.yml
@@ -2,29 +2,44 @@
stat: path="{{ munge_dir }}/bin/munge"
register: munge_binary
+- name: define munge_src_url
+ set_fact:
+ munge_src_url: "http://consistency0/src/munge-{{ munge_version }}.tar.bz2"
+ when: munge_src_url is not defined
+
+- name: download munge
+ get_url:
+ url: "{{ munge_src_url }}"
+ checksum: "{{ munge_src_checksum }}"
+ dest: "{{ src_base }}/munge_src"
+ when: munge_src_checksum is defined
+- name: download munge
+ get_url:
+ url: "{{ munge_src_url }}"
+ dest: "{{ src_base }}/munge_src"
+ when: munge_src_checksum is not defined
+
+
- name: unarchive munge
unarchive:
- args:
- #src: "http://consistency0/src/munge-{{ munge_version }}.tar.bz2"
- src: "https://github.com/dun/munge/releases/download/munge-{{ munge_version }}/munge-{{ munge_version }}.tar.xz"
- copy: no
- dest: /tmp
- creates: /tmp/munge-{{ munge_version }}/configure
- when: not munge_binary.stat.exists
+ src: "{{ src_base }}/munge_src"
+ dest: "{{ src_base }}"
+ remote_src: yes
+ creates: "{{ munge_src_dir }}"
- name: build munge
shell: ./configure --prefix={{ munge_dir }} && make
args:
- chdir: /tmp/munge-{{ munge_version }}
- creates: /tmp/munge-{{ munge_version }}/src/munge/munge
+ chdir: "{{ munge_src_dir }}"
+ creates: "{{ munge_src_dir }}/src/munge/munge"
when: not munge_binary.stat.exists
- name: install munge
shell: make install
become: true
args:
- chdir: /tmp/munge-{{ munge_version }}
+ chdir: "{{ munge_src_dir }}"
creates: "{{ munge_dir }}/bin/munge"
when: not munge_binary.stat.exists
--
GitLab