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

Merge branch 'modifyextrapackages' into 'master'

Modifyextrapackages

See merge request !317
parents bc3c27a3 c59ab4d6
No related branches found
No related tags found
1 merge request!317Modifyextrapackages
- hosts: 'DesktopNodes,ComputeNodes,LoginNodes,VisNodes' - hosts: 'DesktopNodes,ComputeNodes,LoginNodes,VisNodes'
gather_facts: True gather_facts: True
vars_files: vars_files:
- vars/passwords.yml - vars/passwords.yml
- vars/names.yml - vars/names.yml
- vars/ldapConfig.yml - vars/ldapConfig.yml
- vars/filesystems.yml - vars/filesystems.yml
- vars/slurm.yml - vars/slurm.yml
- vars/vars.yml - vars/vars.yml
tasks: tasks:
- include_vars: vars/passwords.yml - include_vars: vars/passwords.yml
- include_vars: vars/names.yml - include_vars: vars/names.yml
- include_vars: vars/ldapConfig.yml - include_vars: vars/ldapConfig.yml
- include_vars: vars/filesystems.yml - include_vars: vars/filesystems.yml
- include_vars: vars/slurm.yml - include_vars: vars/slurm.yml
- include_vars: vars/vars.yml - include_vars: vars/vars.yml
#- include_vars: vars/c7packages.yml
- { name: set use shared state, set_fact: usesharedstatedir=False } - { name: set use shared state, set_fact: usesharedstatedir=False }
tags: [ always ] tags: [ always ]
- hosts: 'DesktopNodes,ComputeNodes,LoginNodes' - hosts: 'DesktopNodes,ComputeNodes,LoginNodes'
gather_facts: False gather_facts: False
vars_files: vars_files:
- vars/passwords.yml - vars/passwords.yml
- vars/names.yml - vars/names.yml
- vars/ldapConfig.yml - vars/ldapConfig.yml
- vars/filesystems.yml - vars/filesystems.yml
- vars/slurm.yml - vars/slurm.yml
- vars/vars.yml - vars/vars.yml
strategy: free strategy: free
roles: roles:
- { role: move_homedir, tags: [ authentication, filesystems ] } - { role: move_homedir, tags: [ authentication, filesystems ] }
...@@ -99,4 +100,4 @@ ...@@ -99,4 +100,4 @@
- hosts: 'VisNodes' - hosts: 'VisNodes'
roles: roles:
- { role: deploy-xorg, tags: [ deploy-xorg ] } - { role: deploy-xorg, tags: [ deploy-xorg ] }
\ No newline at end of file
This diff is collapsed.
...@@ -19,16 +19,19 @@ ...@@ -19,16 +19,19 @@
when: ansible_os_family == 'RedHat' when: ansible_os_family == 'RedHat'
changed_when: '"No unfinished transactions left." not in yumCompleteTransactioncall.stdout' changed_when: '"No unfinished transactions left." not in yumCompleteTransactioncall.stdout'
- name: "Install extra packages" - name: "Install extra packages Centos"
yum: "name={{ item }} exclude={{ excludes|join(',') }} update_cache=yes state=present" yum:
with_items: "{{ extra_packages }}" name: "{{ extra_packages }}"
exclude: "{{ excludes|join(',') }}"
update_cache: yes
state: present
become: true become: true
become_user: root become_user: root
when: when:
- '"CentOS" in ansible_distribution' - '"CentOS" in ansible_distribution'
register: result register: result
- name: "Install extra packages" - name: "Install extra packages Redhat"
yum: "name={{ item }} exclude={{ excludes|join(',') }} update_cache=yes state=present enablerepo='Monash_University_EPEL7_EPEL_7_-_x86_64'" yum: "name={{ item }} exclude={{ excludes|join(',') }} update_cache=yes state=present enablerepo='Monash_University_EPEL7_EPEL_7_-_x86_64'"
with_items: "{{ extra_packages }}" with_items: "{{ extra_packages }}"
become: true become: true
...@@ -38,18 +41,12 @@ ...@@ -38,18 +41,12 @@
- '"RedHat" in ansible_distribution' - '"RedHat" in ansible_distribution'
register: result register: result
- name: "Install extra packages with the epel repo enabled"
yum: "name={{ item }} exclude={{ excludes|join(',') }} update_cache=yes state=present enablerepo=epel"
with_items: "{{ extra_packages }}"
become: true
become_user: root
when:
- '"CentOS" in ansible_distribution'
register: result
- name: "Install extra packages from epel only" - name: "Install extra packages from epel only"
yum: "name={{ item }} update_cache=yes state=present enablerepo=epel" # exclude={{ excludes|join(',') }} yum:
with_items: "{{ extra_packages_epel }}" name: "{{ extra_packages_epel }}"
update_cache: yes
state: present
enablerepo: epel # exclude={{ excludes|join(',') }}
become: true become: true
become_user: root become_user: root
when: when:
......
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