Merge branch 'remTrailingWhitespaces2' into 'master'

removing training whitespaces from plays and roles

See merge request !327

CICD/plays/allnodes.yml

 - hosts: 'all'
-  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:
   - { name: set use shared state, set_fact: usesharedstatedir=False }
   - { name: set hostgroup, set_fact: hostgroup='ComputeNodes' }
   tags: [ always ]
 
 - hosts: 'all'
-  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: disable_selinux, tags: [ disableselinux ] }
@@ -31,13 +31,13 @@
 
 
 - hosts: 'DesktopNodes,ComputeNodes,LoginNodes,ManagementNodes'
-  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: disable_selinux, tags: [ disableselinux ] }

CICD/plays/init_slurmconf.yml

 ---
 - hosts: 'all'
   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
 - hosts: 'all'
   tasks:
   - { name: setup, setup: }

CICD/plays/make_files.yml

@@ -14,7 +14,7 @@
 - hosts: 'ManagementNodes'
   roles:
   - { role: calculateEtcHosts }
-  
+
 #- hosts: 'NFSNodes'
 #  roles:
 #  - { role: calculateExports }

CICD/plays/mgmtnodes.yml

@@ -3,13 +3,13 @@
 #
 
 - hosts: 'ManagementNodes'
-  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:
       #  - { name: set hostgroup, set_fact: hostgroup='ManagementNodes' }
   - { name: set use shared state, set_fact: usesharedstatedir=True }
@@ -18,13 +18,13 @@
 - hosts: 'ManagementNodes'
   strategy: free
   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
   roles:
 #  - { role: ldapclient, tags: [ authentication ] }
 #  - { role: ssh-password-login }

CICD/plays/nfssqlnodes.yml

 # Role to initialize nfs and SQL Nodes
-# 
+#
 #
 
 - hosts: 'all'
   tasks:
   - { name: setup, setup: }
   tags: [ always ]
-  
+
 #we need this here to gather facts and fill required variables.
 - hosts: 'ManagementNodes'
   gather_facts: True
   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
   - { name: set hostgroup, set_fact: hostgroup='ManagementNodes' }
   - { name: set use shared state, set_fact: usesharedstatedir=True }
   tags: [ always ]
-  
+
 - hosts: 'SQLNodes,NFSNodes'
-  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
   pre_tasks:
   - { name: set hostgroup, set_fact: hostgroup='SQLNodes', tags: [ always ] }
   - { name: set use shared state, set_fact: usesharedstatedir=True, tags: [ always ] }
 
 - hosts: 'SQLNodes'
-  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
   gather_facts: True
   roles:
@@ -49,15 +49,15 @@
   - { role: mysql, mysql_type: mysql_server,  mysql_root_password: "{{ sqlrootPasswd }}", mysql_user_name: slurmdb, mysql_user_db_name: slurm_acct_db, mysql_user_hosts_group: "{{ groups['ManagementNodes'] }}", mysql_user_password: "{{ slurmdb_passwd }}", tags: [ database ] }
   - { role: slurm-mysql-config, tags: [database,slurmdb] }
   tags: [ sql ]
- 
+
 - hosts: 'NFSNodes'
-  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
   gather_facts: False
   roles:
@@ -71,13 +71,13 @@
 - hosts: 'NFSNodes'
   strategy: free
   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
   roles:
   - { role: nfs-server }
   tags: [ nfs,nfs-server ]

roles/OpenVPN-Client/tasks/copyCerts.yml

---- 
-- 
+---
+-
   copy: "src=/tmp/{{ inventory_hostname }}/ca.crt dest=/etc/openvpn/ca.crt  mode=644 owner=root group=root"
   name: "Copying CA certificate"
   when: "client_ca_cert.stat.exists == false"
-- 
+-
   copy: "src=/tmp/{{ inventory_hostname }}/{{ inventory_hostname }}.crt dest=/etc/openvpn/{{ inventory_hostname }}.crt mode=644 owner=root group=root"
   name: "Copying Client certificate"
   when: "client_sign_cert.stat.exists == false"
-- 
+-
   copy: "src=/tmp/{{ inventory_hostname }}/{{ inventory_hostname }}.key dest=/etc/openvpn/{{ inventory_hostname }}.key  mode=600 owner=root group=root"
   name: "Copying Client key"
   when: "client_key.stat.exists == false"

roles/OpenVPN-Client/tasks/installOpenVPN.yml

---- 
+---
 - name: "Install OpenVPN"
   yum: "name=openvpn state=present"
   become: true

roles/OpenVPN-Server/tasks/installOpenVPN.yml

---- 
+---
 - name: "Install OpenVPN"
   yum: "name=openvpn state=present"
   notify: "restart openvpn"

roles/apache2/tasks/apacheRedHat.yml

@@ -6,7 +6,7 @@
  yum: name={{ item }} state=present
  with_items:
   - mod_ssl
-  - mod_wsgi 
+  - mod_wsgi
   - openssl
   - httpd
   - httpd-devel

roles/calculateEtcHosts/tasks/main.yml

@@ -14,7 +14,7 @@
 
 - name: fetch hosts file
   fetch: src=/tmp/etcHosts dest=files/etcHosts flat=yes
-  
+
 - name: make sure our repo server is resolvable
   lineinfile:
     path: files/etcHosts

roles/calculateKnownHosts/tasks/main.yml

 - name: "Templating /etc/ssh/known_hosts"
   template: src=known_hosts.j2 dest=/tmp/ssh_known_hosts owner=root group=root mode=644
   become: true
-  register: sshknownhost 
+  register: sshknownhost
 
 - name: fetch known_hosts file
   fetch: src=/tmp/ssh_known_hosts dest=files/ssh_known_hosts flat=yes

roles/cleancrash/tasks/main.yml

 ---
-- name: stat crash files 
+- name: stat crash files
   find: path=/var/crash
   register: files
 

roles/config_repos/tasks/main.yml

@@ -6,7 +6,7 @@
     line: "{{ reposerverip }} {{ reposervername }}"
     owner: root
     group: root
-  become: True 
+  become: True
 
 #- name: remove default repos
 #  file:
@@ -23,9 +23,9 @@
 #  - foreman.repo
 #  - puppetlabs.repo
 #  - rdo-release.repo
-#  - CentOS-CR.repo  
-#  - CentOS-Media.repo  
-#  - CentOS-OpenStack-kilo.repo 
+#  - CentOS-CR.repo
+#  - CentOS-Media.repo
+#  - CentOS-OpenStack-kilo.repo
 #  - epel.repo
 #  - monashhpc_mellanox.repo
 #  - epel-testing.repo

roles/cvl-menus/tasks/main.yml

 - name: Sanity check menu directory
-  shell: mkdir -p /etc/xdg/menus/applications-merged 
+  shell: mkdir -p /etc/xdg/menus/applications-merged
   args:
     creates: "/etc/xdg/menus/applications-merged"
   become: true
-  
+
 - name: configure the cvl menues
   copy: src=cvl.menu dest=/etc/xdg/menus/applications-merged/cvl.menu mode=644 owner=root group=root
   become: true
 
-- name: configure the cvl backgroud image 
+- name: configure the cvl backgroud image
   copy: src={{ item }} dest=/usr/share/backgrounds/{{ item }} mode=644 owner=root group=root
   with_items:
     - cvl_desktop.svg

roles/cvlExtraFiles/tasks/main.yml

 ---
-- name: extra file symbolic links 
+- name: extra file symbolic links
   file: src={{ item.src }} path={{ item.dest }} state={{ item.type }} force=yes
   with_items: "{{ extraFiles }}"
   become: true

roles/cvlFijiCronJob/tasks/main.yml

@@ -4,7 +4,7 @@
   ignore_errors: true
   register: fijiupdatescript
 
-- name: CVL fiji cron job 
+- name: CVL fiji cron job
   cron: name=fijiupdate job=/cvl/local/bin/fiji_daily_update.sh user=root hour=5 state=present
   become: true
   when: fijiupdatescript | success

roles/deploy-xorg/tasks/main.yml

@@ -6,7 +6,7 @@
   changed_when: False
 
 - name: set env for nvidia_card_lists
-  set_fact: 
+  set_fact:
     nvidiacardslist: "{{ nvidiacards.stdout | from_json }}"
 
 - name: generate nvidia-xorg-conf

roles/dump_ldap_config/tasks/main.yml

 ---
 - name: grab cacert
-  shell: cat {{ ldapCARootDest }} 
+  shell: cat {{ ldapCARootDest }}
   register: ldapCaCertContents
 
 - name: dump vars

roles/easy-rsa-CA/tasks/buildCA.yml

---- 
-- 
+---
+-
   name: "Building the CA Certificate"
   shell: ' bash -c " cd /etc/easy-rsa/2.0; source ./vars; ./clean-all;  export EASY_RSA=/etc/easy-rsa/2.0; /etc/easy-rsa/2.0/pkitool --initca $* "'
   args:

roles/easy-rsa-CA/tasks/main.yml

---- 
-- 
+---
+-
   include: buildCA.yml