Skip to content
Snippets Groups Projects
Commit 167a9ead authored by Chris Hines's avatar Chris Hines
Browse files

changes to slurm-from-source to make them work on ubuntu with some variables undefined

parent 584786ab
No related branches found
No related tags found
No related merge requests found
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
- cgmanager-utils - cgmanager-utils
- libcgmanager0 - libcgmanager0
when: ansible_os_family == "Debian" when: ansible_os_family == "Debian"
sudo: true
- name: config cgroup.conf file - name: config cgroup.conf file
template: dest={{ slurm_dir }}/etc/cgroup.conf src=cgroup.conf.j2 mode=644 template: dest={{ slurm_dir }}/etc/cgroup.conf src=cgroup.conf.j2 mode=644
......
...@@ -21,6 +21,10 @@ ...@@ -21,6 +21,10 @@
args: args:
chdir: /tmp/warewulf-nhc-{{ nhc_version }} chdir: /tmp/warewulf-nhc-{{ nhc_version }}
- name: ensure sysconfig dir exists
file: dest=/etc/sysconfig state=directory owner=root group=root mode=755
sudo: true
- name: copy nhc sysconfig script - name: copy nhc sysconfig script
template: dest=/etc/sysconfig/nhc src=nhc.sysconfig.j2 mode=644 template: dest=/etc/sysconfig/nhc src=nhc.sysconfig.j2 mode=644
sudo: true sudo: true
......
...@@ -87,6 +87,7 @@ ...@@ -87,6 +87,7 @@
- mysql-client - mysql-client
- python-mysqldb - python-mysqldb
- libmysqlclient-dev - libmysqlclient-dev
- lua5.2
when: ansible_os_family == "Debian" when: ansible_os_family == "Debian"
- include: installMungeFromSource.yml - include: installMungeFromSource.yml
...@@ -151,7 +152,7 @@ ...@@ -151,7 +152,7 @@
delegate_to: "{{ slurmctrl }}" delegate_to: "{{ slurmctrl }}"
run_once: true run_once: true
sudo: true sudo: true
when: slurm_lua when: slurm_lua is defined
- include: installCgroup.yml - include: installCgroup.yml
- include: installNhc.yml - include: installNhc.yml
......
...@@ -46,7 +46,7 @@ ReturnToService=1 ...@@ -46,7 +46,7 @@ ReturnToService=1
TaskPlugin=task/cgroup TaskPlugin=task/cgroup
#TaskPlugin=task/affinity #TaskPlugin=task/affinity
#TaskPlugin=task/affinity,task/cgroup #TaskPlugin=task/affinity,task/cgroup
{% if slurm_lua %} {% if slurm_lua is defined %}
JobSubmitPlugins=lua JobSubmitPlugins=lua
{% endif %} {% endif %}
OverTimeLimit=1 OverTimeLimit=1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment