Merge branch 'modifyextrapackages' into 'master'

Modifyextrapackages

See merge request !317

CICD/plays/computenodes.yml

 
 - hosts: 'DesktopNodes,ComputeNodes,LoginNodes,VisNodes'
   gather_facts: True
-  vars_files: 
-  - vars/passwords.yml 
+  vars_files:
+  - vars/passwords.yml
   - vars/names.yml
   - vars/ldapConfig.yml
-  - vars/filesystems.yml 
-  - vars/slurm.yml 
-  - vars/vars.yml 
+  - vars/filesystems.yml
+  - vars/slurm.yml
+  - vars/vars.yml
   tasks:
-  - include_vars: vars/passwords.yml 
+  - include_vars: vars/passwords.yml
   - include_vars: vars/names.yml
   - include_vars: vars/ldapConfig.yml
-  - include_vars: vars/filesystems.yml 
-  - include_vars: vars/slurm.yml 
-  - include_vars: vars/vars.yml 
+  - include_vars: vars/filesystems.yml
+  - include_vars: vars/slurm.yml
+  - include_vars: vars/vars.yml
+  #- include_vars: vars/c7packages.yml
   - { name: set use shared state, set_fact: usesharedstatedir=False }
   tags: [ always ]
 
 - hosts: 'DesktopNodes,ComputeNodes,LoginNodes'
   gather_facts: False
-  vars_files: 
-  - vars/passwords.yml 
+  vars_files:
+  - vars/passwords.yml
   - vars/names.yml
   - vars/ldapConfig.yml
-  - vars/filesystems.yml 
-  - vars/slurm.yml 
-  - vars/vars.yml 
+  - vars/filesystems.yml
+  - vars/slurm.yml
+  - vars/vars.yml
   strategy: free
   roles:
   - { role: move_homedir, tags: [ authentication, filesystems ] }
@@ -99,4 +100,4 @@
 
 - hosts: 'VisNodes'
   roles:
-  - { role: deploy-xorg, tags: [ deploy-xorg ] }
+  - { role: deploy-xorg, tags: [ deploy-xorg ] }
\ No newline at end of file

roles/extra_packages/tasks/main.yml

@@ -19,16 +19,19 @@
   when: ansible_os_family == 'RedHat'
   changed_when: '"No unfinished transactions left." not in yumCompleteTransactioncall.stdout'
 
-- name: "Install extra packages"
-  yum: "name={{ item }} exclude={{ excludes|join(',') }} update_cache=yes state=present"
-  with_items: "{{ extra_packages }}"
+- name: "Install extra packages  Centos"
+  yum: 
+    name: "{{ extra_packages }}"
+    exclude: "{{ excludes|join(',') }}"
+    update_cache: yes
+    state: present
   become: true
   become_user: root
   when:
    - '"CentOS" in ansible_distribution'
   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'"
   with_items: "{{ extra_packages }}"
   become: true
@@ -38,18 +41,12 @@
    - '"RedHat" in ansible_distribution'
   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"
-  yum: "name={{ item }}  update_cache=yes state=present enablerepo=epel" # exclude={{ excludes|join(',') }}
-  with_items: "{{ extra_packages_epel }}"
+  yum: 
+    name: "{{ extra_packages_epel }}"
+    update_cache: yes
+    state: present
+    enablerepo: epel # exclude={{ excludes|join(',') }}
   become: true
   become_user: root
   when: