Merge branch 'remTrailingWhitespaces2' into 'master'

removing training whitespaces from plays and roles

See merge request !327

roles/shibboleth-sp/tasks/shibbolethConfig.yml

@@ -5,19 +5,19 @@
 # with_items: shibboleth_file
 # become: true
 
-- 
+-
   name: "Setting shibboleth2.xml sp.example.org"
   become: true
-  replace: 
+  replace:
   args:
-   dest: /etc/shibboleth/shibboleth2.xml 
-   regexp: sp.example.org 
+   dest: /etc/shibboleth/shibboleth2.xml
+   regexp: sp.example.org
    replace: "{{ ansible_hostname }}.{{ domain }}"
    backup: yes
-   
+
 -
  name: "Remove SSO entityID"
- lineinfile: 
+ lineinfile:
  args:
    dest: /etc/shibboleth/shibboleth2.xml
    regexp: '^(\s*)<SSO entityID="https://idp.example.org/idp/shibboleth"'
@@ -25,61 +25,61 @@
    backrefs: true
  become: true
 
-- 
+-
   name: "Setting shibboleth2.xml handlerSSL"
   become: true
-  replace: 
+  replace:
   args:
-   dest: /etc/shibboleth/shibboleth2.xml 
-   regexp: 'handlerSSL="false"' 
-   replace: 'handlerSSL="true"   handlerURL="https://{{ ansible_hostname }}.{{ domain }}/Shibboleth.sso"' 
-   
+   dest: /etc/shibboleth/shibboleth2.xml
+   regexp: 'handlerSSL="false"'
+   replace: 'handlerSSL="true"   handlerURL="https://{{ ansible_hostname }}.{{ domain }}/Shibboleth.sso"'
+
 
-- 
+-
   name: "Setting shibboleth2.xml supportContact"
   become: true
-  replace: 
+  replace:
   args:
-   dest: /etc/shibboleth/shibboleth2.xml 
-   regexp: 'supportContact="root@localhost"' 
+   dest: /etc/shibboleth/shibboleth2.xml
+   regexp: 'supportContact="root@localhost"'
    replace: 'supportContact="{{ admin_email }}"'
-   
 
-- 
+
+-
   name: "Enabling MetadataProvider"
   become: true
-  replace: 
+  replace:
   args:
-   dest: /etc/shibboleth/shibboleth2.xml 
-   regexp: '<!-- Example of remotely supplied batch of signed metadata. -->\s+<!--\s+<MetadataProvider' 
+   dest: /etc/shibboleth/shibboleth2.xml
+   regexp: '<!-- Example of remotely supplied batch of signed metadata. -->\s+<!--\s+<MetadataProvider'
    replace: '<!-- Example of remotely supplied batch of signed metadata. -->\n\t<MetadataProvider'
-   
-- 
+
+-
   name: "Enabling MetadataProvider"
   become: true
-  replace: 
+  replace:
   args:
-   dest: /etc/shibboleth/shibboleth2.xml 
-   regexp: '</MetadataProvider>\s+-->' 
+   dest: /etc/shibboleth/shibboleth2.xml
+   regexp: '</MetadataProvider>\s+-->'
    replace: '</MetadataProvider>'
-- 
+-
   name: "Setting shibboleth2.xml Federation URI"
   become: true
-  replace: 
+  replace:
   args:
-   dest: /etc/shibboleth/shibboleth2.xml 
-   regexp: 'uri="http://federation.org/federation-metadata.xml"' 
+   dest: /etc/shibboleth/shibboleth2.xml
+   regexp: 'uri="http://federation.org/federation-metadata.xml"'
    replace: 'uri="{{ aaf_federation_url }}/metadata.aaf.signed.complete.xml"'
-   
-- 
+
+-
   name: "Setting shibboleth2.xml backingFilePath"
   become: true
-  replace: 
+  replace:
   args:
-   dest: /etc/shibboleth/shibboleth2.xml 
-   regexp: 'backingFilePath="federation-metadata.xml"' 
+   dest: /etc/shibboleth/shibboleth2.xml
+   regexp: 'backingFilePath="federation-metadata.xml"'
    replace: 'backingFilePath="metadata.aaf.xml"'
-   
+
 - name: copy AAF metadata cert
   copy: src=files/{{ shib_metadata_cert }} dest=/etc/shibboleth/aaf-metadata-cert.pem mode=644
   become: true
@@ -87,21 +87,21 @@
 
 - name: "Setting shibboleth2.xml aaf Certificate"
   become: true
-  replace: 
+  replace:
   args:
-   dest: /etc/shibboleth/shibboleth2.xml 
-   regexp: 'type="Signature" certificate="fedsigner.pem"' 
+   dest: /etc/shibboleth/shibboleth2.xml
+   regexp: 'type="Signature" certificate="fedsigner.pem"'
    replace: 'type="Signature" certificate="aaf-metadata-cert.pem"'
-   
-- 
+
+-
   name: "Setting shibboleth2.xml AAF Discovery URL"
   become: true
-  replace: 
+  replace:
   args:
-   dest: /etc/shibboleth/shibboleth2.xml 
-   regexp: 'discoveryURL=".*"' 
+   dest: /etc/shibboleth/shibboleth2.xml
+   regexp: 'discoveryURL=".*"'
    replace: 'discoveryURL="{{ aaf_discovery_url }}"'
-   
+
 - name: make shib private directory
   file: path=/etc/shibboleth/private state=directory mode=700 owner="_shibd"
   become: true
@@ -118,13 +118,13 @@
   become: true
   copy: src=files/{{ shib_cert }} dest=/etc/shibboleth/certs/{{ shib_cert }} owner="_shibd" mode=644
 
-- 
+-
   name: "Setting shibboleth2.xml Credential Resolver"
   become: true
-  replace: 
+  replace:
   args:
-   dest: /etc/shibboleth/shibboleth2.xml 
-   regexp: '<CredentialResolver type="File" key=".*" certificate=".*"/>' 
+   dest: /etc/shibboleth/shibboleth2.xml
+   regexp: '<CredentialResolver type="File" key=".*" certificate=".*"/>'
    replace: '<CredentialResolver type="File" key="/etc/shibboleth/private/{{ shib_key }}" certificate="/etc/shibboleth/certs/{{ shib_cert }}"/>'
 
 -

roles/shibboleth-sp/tasks/shibbolethPrerequisites.yml

@@ -4,7 +4,7 @@
  become: true
  apt: name={{ item }} state=present
  with_items:
-  - shibboleth-sp2-schemas 
+  - shibboleth-sp2-schemas
   - libshibsp-dev
   - libapache2-mod-shib2
   - opensaml2-tools

roles/slurm-common/defaults/main.yml

 ---
-slurm_use_vpn: False 
+slurm_use_vpn: False
 slurmddebug: {level: 5, log: '/var/log/slurm/slurmd.log'}
 slurmctlddebug: {level: 5, log: '/mnt/slurm-logs/slurmctld.log'}
 slurmdbdlog: {level: 5, log: '/mnt/slurm-logs/slurmdbd.log'}

roles/slurm-common/tasks/createSlurmDirectories.yml

@@ -12,7 +12,7 @@
   become: true
 
 - name: stat run directory
-  stat: path={{ slurmdatadir }} 
+  stat: path={{ slurmdatadir }}
   become_user: root
   become: True
   register: runstat
@@ -22,9 +22,9 @@
   file: path={{ slurmdatadir }} state=directory owner=slurm group=slurm mode=755
   become: true
   when: slurmdatadir is defined and not runstat.stat.exists
-      
+
 - name: stat pid directory
-  stat: path={{ slurmpiddir }} 
+  stat: path={{ slurmpiddir }}
   become_user: root
   become: True
   register: pidstat
@@ -55,7 +55,7 @@
   when: slurmstatedir is defined  and not usesharedstatedir
 
 - name: stat log directory
-  stat: path={{ slurmlogdir }} 
+  stat: path={{ slurmlogdir }}
   become_user: root
   become: True
   register: logstat

roles/slurm-common/tasks/installMungeFromSource.yml

@@ -28,15 +28,15 @@
   when: not munge_binary.stat.exists
 
 - name: set use_systemd Redhat
-  set_fact: 
+  set_fact:
     use_systemd: True
-  when: (ansible_distribution == "CentOS" or ansible_distribution == "RedHat") and ( ansible_distribution_major_version == "7") 
+  when: (ansible_distribution == "CentOS" or ansible_distribution == "RedHat") and ( ansible_distribution_major_version == "7")
 
 - name: set use_systemd Debian
-  set_fact: 
+  set_fact:
     use_systemd: True
   when: ansible_os_family == "Debian"
-  
+
 - name: copy init script
   template: dest=/etc/init.d/munge src=munge.initd.j2 mode=755
   become: true

roles/slurm-common/tasks/installSlurmFromSource.yml

@@ -9,7 +9,7 @@
   file:
     path: "{{ slurm_dir }}"
     state: absent
-  become: true 
+  become: true
   when: force_slurm_recompile is defined
 
 - name: unarchive slurm

roles/slurm-common/tasks/main.yml

@@ -40,7 +40,7 @@
   when: ansible_os_family == "RedHat"
 
 - name: install deps
-  package: 
+  package:
     state: present
     name:
       - gcc
@@ -108,7 +108,7 @@
   template: src="gres.conf.j2" dest={{ slurm_dir }}/etc/gres.conf mode=644
   become: true
 
-- name: make slurm prolog dir 
+- name: make slurm prolog dir
   file: path=/opt/slurm/etc state=directory mode=755
   become: true
   become_user: root
@@ -124,7 +124,7 @@
 - name: install slurm.conf
   copy: src=files/slurm.conf dest={{ slurm_dir }}/etc/slurm.conf
   become: true
-  when: slurm_use_vpn==False 
+  when: slurm_use_vpn==False
 
 - name: install slurm.conf
   template: src=slurm-vpn.conf.j2 dest={{ slurm_dir }}/etc/slurm.conf
@@ -136,7 +136,7 @@
 #  become: true
 #  when: slurm_use_vpn==False
 
-- name: setup envirnment variables 
+- name: setup envirnment variables
   template: src=slurm_setup.sh.j2 dest=/etc/profile.d/slurm_setup.sh
   become: true
 

roles/slurm-start/tasks/main.yml

@@ -56,7 +56,7 @@
   become: true
   when: use_systemd is defined and start_slurmdbd is defined and slurmdbd_service_installed.changed
 
-- name: make sure munge is started 
+- name: make sure munge is started
   service: name=munge state=started enabled=yes
   become: true
   when: use_systemd is defined and start_slurmdbd is defined

roles/slurm-trigger/tasks/main.yml

@@ -10,13 +10,13 @@
   become: true
   become_user: root
 
-- name: Execute set_primary_slurmctld_failure)trigger  
+- name: Execute set_primary_slurmctld_failure)trigger
   command: "{{ slurm_dir }}/sbin/set_primary_slurmctld_failure_trigger.sh"
   become: true
   become_user: slurm
   run_once: true
   ignore_errors: true
- 
+
 - name:  template primary_slurmctld_resumed_operation
   template: dest="{{ slurm_dir }}/sbin/primary_slurmctld_resumed_operation.sh" src=primary_slurmctld_resumed_operation.sh.j2 mode="0755"
   become: true
@@ -27,13 +27,13 @@
   become: true
   become_user: root
 
-- name: Execute primary_slurmctld_resumed_operation.sh  
+- name: Execute primary_slurmctld_resumed_operation.sh
   command: "{{ slurm_dir }}/sbin/set_primary_slurmctld_resumed_operation_trigger.sh"
   become: true
   become_user: slurm
   run_once: true
   ignore_errors: true
-  
+
 - name:  template node_down
   template: dest="{{ slurm_dir }}/sbin/node_down.sh" src=node_down.sh.j2 mode="0755"
   become: true
@@ -51,6 +51,6 @@
   become_user: slurm
   run_once: true
   ignore_errors: true
-  
- 
- 
+
+
+

roles/slurm_sql_bk/tasks/main.yml

@@ -16,7 +16,7 @@
     copy:
       src: "./slm_db_backup"
       dest: "/root/.ssh"
-      owner: root 
+      owner: root
       group: root
       mode: '600'
     become: True
@@ -33,23 +33,23 @@
       path: "{{ MGMT_BIN_DIR }}"
       state: directory
     become: true
-    become_user: root 
+    become_user: root
   - name: "template sql backupscript to  {{ MGMT_BIN_DIR }}"
     template: src="backup_mysql_for_slurm.sh.j2" dest="{{ MGMT_BIN_DIR }}/backup_mysql_for_slurm.sh"  mode="700"
     become: true
-    become_user: root 
+    become_user: root
   - name: Make a daily crontab entry
     cron:
       name: "Backup of MySQL Database for Slurm"
-      job: "{{ MGMT_BIN_DIR }}/backup_mysql_for_slurm.sh"  
+      job: "{{ MGMT_BIN_DIR }}/backup_mysql_for_slurm.sh"
       hour: 23
       minute: 55
     become: true
-    become_user: root 
+    become_user: root
   - name: Create directory {{ SQL_BK_DATA_DIR }} to store initial mysql dump
     file: path={{ SQL_BK_DATA_DIR }} state=directory
     become: true
-    become_user: root 
+    become_user: root
   - name: template mysql config file to server
     template: src="mysql.conf.j2" dest="{{ MGMT_BIN_DIR }}/mysql.conf" mode="600"
     become: true
@@ -57,8 +57,8 @@
   #
   # template delete file to localhost.then copy to remote host
   #
-  - name: make a unique name for the backup script 
-    set_fact: 
+  - name: make a unique name for the backup script
+    set_fact:
         unique_name: "delete_old_mysql_bk_{{ SQL_BK_DEST_DIR | basename }}.sh"
   - name: Unique filename is
     debug: var=unique_name

roles/smb_config/tasks/main.yml

 ---
 - name: Config smb.conf parameter added to prevent SMB1 connections to RDS
   copy:
-     src: files/smb.conf 
+     src: files/smb.conf
      dest: /etc/samba/smb.conf
      owner: root
      group: root
      mode: 0644
   become: yes
-  tags: smb_config 
+  tags: smb_config

roles/ssh-keepalive/tasks/main.yml

@@ -3,10 +3,10 @@
   args:
     dest: /etc/ssh/sshd_config
     regexp: "#?ClientAliveInterval [0-9]+"
-    line: "ClientAliveInterval 60" 
+    line: "ClientAliveInterval 60"
     backrefs: yes
   become: true
-  notify: 
+  notify:
   - restart sshd
   - restart ssh
 
@@ -15,10 +15,10 @@
   args:
     dest: /etc/ssh/sshd_config
     regexp: "#?ClientAliveCountMax [0-9]+"
-    line: "ClientAliveCountMax 5" 
+    line: "ClientAliveCountMax 5"
     backrefs: yes
   become: true
-  notify: 
+  notify:
   - restart sshd
   - restart ssh
 

roles/ssh-nopassword-login/tasks/main.yml

@@ -3,10 +3,10 @@
   args:
     dest: /etc/ssh/sshd_config
     regexp: "ChallengeResponseAuthentication yes"
-    line: "ChallengeResponseAuthentication no" 
+    line: "ChallengeResponseAuthentication no"
     backrefs: yes
   become: true
-  notify: 
+  notify:
   - restart sshd
   - restart ssh
 
@@ -18,7 +18,7 @@
     line: "PasswordAuthentication no"
     backrefs: yes
   become: true
-  notify: 
+  notify:
   - restart sshd
   - restart ssh
 

roles/ssh-password-login/tasks/main.yml

@@ -3,10 +3,10 @@
   args:
     dest: /etc/ssh/sshd_config
     regexp: "ChallengeResponseAuthentication no"
-    line: "ChallengeResponseAuthentication yes" 
+    line: "ChallengeResponseAuthentication yes"
     backrefs: yes
   become: true
-  notify: 
+  notify:
   - restart sshd
   - restart ssh
 
@@ -18,7 +18,7 @@
     line: "PasswordAuthentication no"
     backrefs: yes
   become: true
-  notify: 
+  notify:
   - restart sshd
   - restart ssh
 

roles/strudel_build/vars/CentOS_6_x86_64.yml

@@ -68,6 +68,6 @@
    - python-psutil
 
 
- 
+
  pkg_name: ./rpmbuild/RPMS/x86_64/strudel-{{ strudel_ver }}-1.x86_64.rpm
  dest_pkg_name: strudel_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}_{{ strudel_ver }}_x86_64.rpm

roles/strudel_build/vars/CentOS_7_x86_64.yml

@@ -65,6 +65,6 @@
    - python-psutil
 
 
- 
+
  pkg_name: ./rpmbuild/RPMS/x86_64/strudel-{{ strudel_ver }}-1.x86_64.rpm
  dest_pkg_name: strudel_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}_{{ strudel_ver }}_x86_64.rpm

roles/strudel_build/vars/Fedora_19_x86_64.yml

@@ -66,6 +66,6 @@
    - python-psutil
 
 
- 
+
  pkg_name: ./rpmbuild/RPMS/x86_64/strudel-0.6.0-1.x86_64.rpm
  dest_pkg_name: strudel_{{ ansible_distribution }}_{{ ansible_distribution_version }}_{{ hostvars[ansible_hostname]['ansible_date_time']['date'] }}_x86_64.rpm

roles/strudel_build/vars/Fedora_20_x86_64.yml

@@ -67,6 +67,6 @@
    - python-psutil
 
 
- 
+
  pkg_name: ./rpmbuild/RPMS/x86_64/strudel-{{ strudel_ver }}-1.x86_64.rpm
  dest_pkg_name: strudel_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}_{{ strudel_ver }}_x86_64.rpm

roles/strudel_config/tasks/main.yml

 - name: "Set login node"
-  set_fact: 
+  set_fact:
     loginNode: "{{ ansible_eth0.ipv4.address }}"
 
 - name: "Temlate Strudel config"

roles/strudel_test/tasks/main.yml

@@ -2,7 +2,7 @@
 - include_vars: "{{ ansible_distribution }}_{{ ansible_distribution_major_version }}_{{ ansible_architecture }}.yml"
 
 - name: get turbovnc
-  shell: wget http://sourceforge.net/projects/turbovnc/files/1.2.3/turbovnc_1.2.3_amd64.deb 
+  shell: wget http://sourceforge.net/projects/turbovnc/files/1.2.3/turbovnc_1.2.3_amd64.deb
   when: ansible_os_family == "Debian"
 
 - name: install turobvnc
@@ -23,7 +23,7 @@
   copy: src=/tmp/{{ dest_pkg_name }} dest=/tmp/{{ dest_pkg_name }}
 
 - name: install launhcer
-  apt: deb=/tmp/{{ dest_pkg_name }} 
+  apt: deb=/tmp/{{ dest_pkg_name }}
   become: true
   when: ansible_os_family == "Debian"