diff --git a/CICD/plays/allnodes.yml b/CICD/plays/allnodes.yml index 49c536e142f45576a35bb43b5f0bf80788c1e5ff..beca31d3ab444b2b334d092cfff05d315a8b99be 100644 --- a/CICD/plays/allnodes.yml +++ b/CICD/plays/allnodes.yml @@ -1,24 +1,24 @@ - 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 ] } diff --git a/CICD/plays/init_slurmconf.yml b/CICD/plays/init_slurmconf.yml index 30667ac53b5b6c387af0bdacb609f09cc8bfa5c3..3a15e8891234c38fc1816548b2d400efa1831d49 100644 --- a/CICD/plays/init_slurmconf.yml +++ b/CICD/plays/init_slurmconf.yml @@ -1,12 +1,12 @@ --- - 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: } diff --git a/CICD/plays/make_files.yml b/CICD/plays/make_files.yml index b05925ce73f9be136bb46128961990b938c07910..668502d72004eea89cf137ceafbc46d5a1b34f4a 100644 --- a/CICD/plays/make_files.yml +++ b/CICD/plays/make_files.yml @@ -14,7 +14,7 @@ - hosts: 'ManagementNodes' roles: - { role: calculateEtcHosts } - + #- hosts: 'NFSNodes' # roles: # - { role: calculateExports } diff --git a/CICD/plays/mgmtnodes.yml b/CICD/plays/mgmtnodes.yml index 50442355f2c9c1b1114a613c0280e6d8c2249a3c..794e23313a31f7a3ba3775eaefefbae0863169ae 100644 --- a/CICD/plays/mgmtnodes.yml +++ b/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 } diff --git a/CICD/plays/nfssqlnodes.yml b/CICD/plays/nfssqlnodes.yml index 24a7338397f32ac7e0ca448935f394c77b112d86..9284f83246fa7e0913a303fd1928b8cea935555e 100644 --- a/CICD/plays/nfssqlnodes.yml +++ b/CICD/plays/nfssqlnodes.yml @@ -1,46 +1,46 @@ # 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 ] diff --git a/roles/OpenVPN-Client/tasks/copyCerts.yml b/roles/OpenVPN-Client/tasks/copyCerts.yml index 710f776b5ecb5a982b4e5131bc19aabc627be631..99e83fdc92ee25b94200b184acc2e3618e5408bc 100644 --- a/roles/OpenVPN-Client/tasks/copyCerts.yml +++ b/roles/OpenVPN-Client/tasks/copyCerts.yml @@ -1,13 +1,13 @@ ---- -- +--- +- 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" diff --git a/roles/OpenVPN-Client/tasks/installOpenVPN.yml b/roles/OpenVPN-Client/tasks/installOpenVPN.yml index 12041d4028f8b273cbb8de09df81a38dd0a83ef9..a99f767d3fba0ea2a9c3e2e01be6f7f8521d16a2 100644 --- a/roles/OpenVPN-Client/tasks/installOpenVPN.yml +++ b/roles/OpenVPN-Client/tasks/installOpenVPN.yml @@ -1,4 +1,4 @@ ---- +--- - name: "Install OpenVPN" yum: "name=openvpn state=present" become: true diff --git a/roles/OpenVPN-Server/tasks/installOpenVPN.yml b/roles/OpenVPN-Server/tasks/installOpenVPN.yml index 58b5dbc0c707cdc246d40ec06f3ec58e6a34780e..23db557314a6a026fea7c8d9bd82a32490c8f07c 100644 --- a/roles/OpenVPN-Server/tasks/installOpenVPN.yml +++ b/roles/OpenVPN-Server/tasks/installOpenVPN.yml @@ -1,4 +1,4 @@ ---- +--- - name: "Install OpenVPN" yum: "name=openvpn state=present" notify: "restart openvpn" diff --git a/roles/apache2/tasks/apacheRedHat.yml b/roles/apache2/tasks/apacheRedHat.yml index 2a5a83dacc74919106efa8a5ad817ec808143cfe..dd6095495dbe3a0ce993b1a3cd2d64c88b906dea 100644 --- a/roles/apache2/tasks/apacheRedHat.yml +++ b/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 diff --git a/roles/calculateEtcHosts/tasks/main.yml b/roles/calculateEtcHosts/tasks/main.yml index ceed9049e5b841abaea1a7d9055ca5a8dff93388..1391a95a672a7a4cafa02ae7a3c48e5bdfc5b077 100644 --- a/roles/calculateEtcHosts/tasks/main.yml +++ b/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 diff --git a/roles/calculateKnownHosts/tasks/main.yml b/roles/calculateKnownHosts/tasks/main.yml index 73cc26492306be3afc3139ab0c140d43672926c0..f95b7ffe1bcc4c1ee21f177d478b5855da5e232e 100644 --- a/roles/calculateKnownHosts/tasks/main.yml +++ b/roles/calculateKnownHosts/tasks/main.yml @@ -1,7 +1,7 @@ - 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 diff --git a/roles/cleancrash/tasks/main.yml b/roles/cleancrash/tasks/main.yml index aa43f5deea7d54f441967326f3d454f687717ea5..1a5788242cde44d3088450e53e888df927b53382 100644 --- a/roles/cleancrash/tasks/main.yml +++ b/roles/cleancrash/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: stat crash files +- name: stat crash files find: path=/var/crash register: files diff --git a/roles/config_repos/tasks/main.yml b/roles/config_repos/tasks/main.yml index 8bd44d7e636c997a15d78632a9b5504a10eecc70..7f4f64b5d2b648899655a118388b9dce1f654aed 100644 --- a/roles/config_repos/tasks/main.yml +++ b/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 diff --git a/roles/cvl-menus/tasks/main.yml b/roles/cvl-menus/tasks/main.yml index dc1a1775cf3056b65969813774b2bc50c4b2f539..446a92482e53a726d2ca2340179340ba4d01a4ef 100644 --- a/roles/cvl-menus/tasks/main.yml +++ b/roles/cvl-menus/tasks/main.yml @@ -1,14 +1,14 @@ - 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 diff --git a/roles/cvlExtraFiles/tasks/main.yml b/roles/cvlExtraFiles/tasks/main.yml index d8a6ed4d32c88bdc5cb3530e5e4d7beea648e461..33ead1e5cc36de76c310a5d23a4428e2e082745b 100644 --- a/roles/cvlExtraFiles/tasks/main.yml +++ b/roles/cvlExtraFiles/tasks/main.yml @@ -1,5 +1,5 @@ --- -- 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 diff --git a/roles/cvlFijiCronJob/tasks/main.yml b/roles/cvlFijiCronJob/tasks/main.yml index 01fc36fddb13e59f6909de639bd3dd0b69d00292..1491cf63db8cc0161325168da5b433e4c59c37f6 100644 --- a/roles/cvlFijiCronJob/tasks/main.yml +++ b/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 diff --git a/roles/deploy-xorg/tasks/main.yml b/roles/deploy-xorg/tasks/main.yml index fb5ec1bb27a58127edb7f8c204cce430f16a7b27..73769d7b585b62971292716d943f3b22a9d65d4a 100644 --- a/roles/deploy-xorg/tasks/main.yml +++ b/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 diff --git a/roles/dump_ldap_config/tasks/main.yml b/roles/dump_ldap_config/tasks/main.yml index f8ddc470676c249b5c0704bcba92b554337c7f87..63f17d00d18f00f4a33a01238b6be6aea91ef5ef 100644 --- a/roles/dump_ldap_config/tasks/main.yml +++ b/roles/dump_ldap_config/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: grab cacert - shell: cat {{ ldapCARootDest }} + shell: cat {{ ldapCARootDest }} register: ldapCaCertContents - name: dump vars diff --git a/roles/easy-rsa-CA/tasks/buildCA.yml b/roles/easy-rsa-CA/tasks/buildCA.yml index e0df29a7e305083ac88049f9fdb21dfe824d7a71..6f0f797e9cae2ba9fb2f16798182f2d9186193dd 100644 --- a/roles/easy-rsa-CA/tasks/buildCA.yml +++ b/roles/easy-rsa-CA/tasks/buildCA.yml @@ -1,5 +1,5 @@ ---- -- +--- +- 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: diff --git a/roles/easy-rsa-CA/tasks/main.yml b/roles/easy-rsa-CA/tasks/main.yml index 50dfbfafef0e4d7682081b1d87dd552bde088006..04e64596c0ff0736444e9d22be52c940f5c194ac 100644 --- a/roles/easy-rsa-CA/tasks/main.yml +++ b/roles/easy-rsa-CA/tasks/main.yml @@ -1,3 +1,3 @@ ---- -- +--- +- include: buildCA.yml diff --git a/roles/easy-rsa-certificate/tasks/buildCert.yml b/roles/easy-rsa-certificate/tasks/buildCert.yml index 0850d47a23b2c78698c5876473c7be343d74e239..9be49fa83da9baa64123a6a479f747b37ed866fe 100644 --- a/roles/easy-rsa-certificate/tasks/buildCert.yml +++ b/roles/easy-rsa-certificate/tasks/buildCert.yml @@ -1,4 +1,4 @@ ---- +--- - name: "Check client ca certificate" register: ca_cert stat: "path={{ x509_cacert_file }}" diff --git a/roles/easy-rsa-certificate/tasks/main.yml b/roles/easy-rsa-certificate/tasks/main.yml index 475415cc2e1cf8b2d9b7303f530544caf699011e..845858ef71c14e7327a888ac1cd102ce315d1482 100644 --- a/roles/easy-rsa-certificate/tasks/main.yml +++ b/roles/easy-rsa-certificate/tasks/main.yml @@ -1,3 +1,3 @@ ---- -- +--- +- include: buildCert.yml diff --git a/roles/easy-rsa-common/tasks/copyConfigurationFile.yml b/roles/easy-rsa-common/tasks/copyConfigurationFile.yml index 766ad10375ded9e6b9b023629430ae95709e0be7..2a6c83f5cefe129fcf648ac132e923ac9cfde6b1 100644 --- a/roles/easy-rsa-common/tasks/copyConfigurationFile.yml +++ b/roles/easy-rsa-common/tasks/copyConfigurationFile.yml @@ -1,4 +1,4 @@ ---- +--- - name: "Copy the configuration file" template: src={{ item }} dest=/etc/easy-rsa/2.0/vars mode=0644 owner=root with_first_found: diff --git a/roles/easy-rsa-common/tasks/installEasyRsaSource.yml b/roles/easy-rsa-common/tasks/installEasyRsaSource.yml index 3c1bd4d2e4a25aef218cc9628e5dfb39b4d70d5d..876f7db8c87d317e77f307c62da58e67a358a8de 100644 --- a/roles/easy-rsa-common/tasks/installEasyRsaSource.yml +++ b/roles/easy-rsa-common/tasks/installEasyRsaSource.yml @@ -6,7 +6,7 @@ - name: Untar the source shell: tar xvfz 2.2.2.tar.gz chdir=/tmp creates=/tmp/easy-rsa-2.2.2 -- +- name: "Moving easy-rsa to /etc" shell: cp -rf /tmp/easy-rsa-2.2.2/easy-rsa /etc/ creates=/etc/easy-rsa sudo: True @@ -18,4 +18,4 @@ creates: "/etc/easy-rsa/2.0/keys/" when: installed|changed become: true - + diff --git a/roles/easy-rsa-common/tasks/yumList.yml b/roles/easy-rsa-common/tasks/yumList.yml index 317196bacbcf78f8c041c4da4dbb3932c005861a..0eeb952f48d3fb31cf360c01547079294fda4126 100644 --- a/roles/easy-rsa-common/tasks/yumList.yml +++ b/roles/easy-rsa-common/tasks/yumList.yml @@ -10,7 +10,7 @@ become: true - name: "Setting hostname" - shell: sysctl kernel.hostname={{ inventory_hostname }} + shell: sysctl kernel.hostname={{ inventory_hostname }} sudo: True - name: "Restarting Network" diff --git a/roles/enable_modules/tasks/main.yml b/roles/enable_modules/tasks/main.yml index fb585996a0a0da83b5b05550c76330d2d503b6ae..7e6d8a96a87afe557eabfbba2bd33b07d86a6f6d 100644 --- a/roles/enable_modules/tasks/main.yml +++ b/roles/enable_modules/tasks/main.yml @@ -31,7 +31,7 @@ become_user: root when: default_modules == "lmod" -# vars: +# vars: # MODULESHOMEvar: '/usr/share/modules' - name: template modulecmd bash @@ -63,7 +63,7 @@ become: true become_user: root when: default_modules == "modulecmd" - + - name: Create a symbolic link file: src: /usr/share/modules diff --git a/roles/etcHosts/tasks/main.yml b/roles/etcHosts/tasks/main.yml index fc85df29ab3501098b73b3a9bc78476293600a03..9ba7ab19e7a788e6024191902211f8e96032c9d5 100644 --- a/roles/etcHosts/tasks/main.yml +++ b/roles/etcHosts/tasks/main.yml @@ -24,7 +24,7 @@ - name: set domainname by sysctl shell: /sbin/sysctl kernel.domainname="{{ domain }}" become: true - when: not sysctl_domainname.stdout == domain + when: not sysctl_domainname.stdout == domain - name: set /etc/sysconfig/network on CentOS 6 lineinfile: dest=/etc/sysconfig/network line='HOSTNAME={{ inventory_hostname }}' regexp='^HOSTNAME' @@ -37,9 +37,9 @@ when: ansible_distribution == "Debian" and ansible_distribution_major_version == "8" - name: set preserve hostname on CentOS - lineinfile: + lineinfile: args: - dest: /etc/cloud/cloud.cfg + dest: /etc/cloud/cloud.cfg line: "preserve_hostname: True" become: true when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7" diff --git a/roles/extra_packages/tasks/main.yml b/roles/extra_packages/tasks/main.yml index 5eb671f4be002547cf189b91a2d3cd8322feea52..5ae43384fdcddd38230c4dc58c63d4b9b20ed3e7 100644 --- a/roles/extra_packages/tasks/main.yml +++ b/roles/extra_packages/tasks/main.yml @@ -9,18 +9,18 @@ become_user: root when: ansible_os_family == 'RedHat' changed_when: false - + - name: "Clear yum pending transactions" command: yum-complete-transaction --cleanup-only become: true - become_user: root + become_user: root register: yumCompleteTransactioncall when: ansible_os_family == 'RedHat' changed_when: '"No unfinished transactions left." not in yumCompleteTransactioncall.stdout' - name: "Install extra packages Centos" - yum: + yum: name: "{{ extra_packages }}" exclude: "{{ excludes|join(',') }}" update_cache: yes @@ -36,13 +36,13 @@ with_items: "{{ extra_packages }}" become: true become_user: root - when: + when: - '"DGX" in ansible_product_name' - '"RedHat" in ansible_distribution' register: result - + - name: "Install extra packages from epel only" - yum: + yum: name: "{{ extra_packages_epel }}" update_cache: yes state: present @@ -53,7 +53,7 @@ - '"CentOS" in ansible_distribution' - name: "Show yum install output" - debug: + debug: msg: "{{ result.results }}" - name: "Install extra packages" diff --git a/roles/extra_packages/vars/CentOS_7.yml b/roles/extra_packages/vars/CentOS_7.yml index 011e97555eaf6ea19870e0ebbbea95ef9aa35156..3a9aae33a6b7af9f0d01471a76c82bd5ef5bfe32 100644 --- a/roles/extra_packages/vars/CentOS_7.yml +++ b/roles/extra_packages/vars/CentOS_7.yml @@ -55,7 +55,7 @@ extra_packages: - libcurl-devel - libXmu-devel.x86_64 # for matlab GUI - xauth - - gtk+-devel + - gtk+-devel - gtk2-devel - libidn-devel.x86_64 - libacl-devel.x86_64 @@ -68,7 +68,7 @@ extra_packages: - mesa-libGL-devel - mesa-libGLU-devel - libpng - - texlive + - texlive - libjpeg-turbo-devel - libjpeg-turbo - libjpeg-turbo-utils @@ -132,7 +132,7 @@ extra_packages: - SDL-devel - freeglut - freeglut-devel - # + # - qt-devel # perf for Ehsan performance - perf @@ -162,7 +162,7 @@ extra_packages: - libxc-devel # for atop - atop - # for Andreas Ernst + # for Andreas Ernst - emacs - zsh # RT #9173 @@ -171,5 +171,5 @@ extra_packages: - perl-CPAN - + diff --git a/roles/extra_packages/vars/Ubuntu_14.yml b/roles/extra_packages/vars/Ubuntu_14.yml index d9869255c24dfa1bb2fe009f9520a129c7001440..5647f4c6fa8034d2a4223862f6471142e23dcf1c 100644 --- a/roles/extra_packages/vars/Ubuntu_14.yml +++ b/roles/extra_packages/vars/Ubuntu_14.yml @@ -36,7 +36,7 @@ extra_packages: - ncurses-dev - unzip - libpng12-dev - - texlive + - texlive - openjdk-7-jdk - libjpeg62 - libjpeg62-dev @@ -74,23 +74,23 @@ extra_packages: - zsh # adele request (bioinformatics) # linuxbrew - - build-essential - - curl - - git - - python-setuptools - - ruby + - build-essential + - curl + - git + - python-setuptools + - ruby # adele - ncbi-blast+ - - bedtools - - cd-hit - - mcl - - parallel - - cpanminus - - prank - - mafft + - bedtools + - cd-hit + - mcl + - parallel + - cpanminus + - prank + - mafft - fasttree - pandoc # chris request utility packages - - liblzma-dev - - libpcre3-dev + - liblzma-dev + - libpcre3-dev - libcurl4-openssl-dev diff --git a/roles/extra_packages/vars/main.yml b/roles/extra_packages/vars/main.yml index b70d611e95a35d73562b2d50a066f34d98c685d8..e01499d535576229d1a7ff4d9085cd036dfd33af 100644 --- a/roles/extra_packages/vars/main.yml +++ b/roles/extra_packages/vars/main.yml @@ -151,7 +151,7 @@ pkgs: - perl-ExtUtils-MakeMaker - perl-ExtUtils-ParseXS - perl-HTML-Parser - - perl-HTML-Tagset + - perl-HTML-Tagset - perl-Test-Harness - perl-Time-HiRes - pexpect @@ -189,7 +189,7 @@ pkgs: - qt-sqlite - qt-x11 - rhino - - rsync + - rsync - samba-client - scipy - spice-vdagent @@ -209,7 +209,7 @@ pkgs: - util-linux-ng - uuid - vim-X11 - - vim-common + - vim-common - vim-enhanced - vim-minimal - wacomexpresskeys diff --git a/roles/fail2ban/tasks/main.yml b/roles/fail2ban/tasks/main.yml index f5f9c59b9abfa6ffd01abcc27d2b1b0f6a1a85e4..2cacf7098772ce3a7d9c6528b0f676bb8a81dd03 100644 --- a/roles/fail2ban/tasks/main.yml +++ b/roles/fail2ban/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Install fail2ban on Red Hat system yum: - name: + name: - fail2ban-server - fail2ban-sendmail state: present diff --git a/roles/gluster_volcreate/tasks/main.yml b/roles/gluster_volcreate/tasks/main.yml index f2bbdb5e2a2f3b3f60138f74c4fb8318dd1def0f..948a9aeb1d7ebac273fcaf8809290f1ee9ed20f8 100644 --- a/roles/gluster_volcreate/tasks/main.yml +++ b/roles/gluster_volcreate/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: make server list - set_fact: + set_fact: server_list: "{{ gluster_servers|join(',') }}" - name: show server list @@ -26,7 +26,7 @@ delegate_to: "{{ gluster_servers[0] }}" - name: create volume - gluster_volume: + gluster_volume: name: "{{ volname }}" brick: "{{ brickmnt }}/brick" cluster: "{{ server_list }}" diff --git a/roles/gpu_update/tasks/main.yml b/roles/gpu_update/tasks/main.yml index a8afecae3f400ee67cd41dd4445bd0595d7ec0d5..e49458772992bca1c9d76e2a1fe948424a3f133e 100644 --- a/roles/gpu_update/tasks/main.yml +++ b/roles/gpu_update/tasks/main.yml @@ -15,13 +15,13 @@ slurm_state_rsrv_drain: "State=RESERVED+DRAIN " - name: Fail if jobs are running - fail: msg="The node is not in IDLE+DRAIN, DOWN* or DOWN*+DRAIN, RESERVED+DRAIN we will not continue!" + fail: msg="The node is not in IDLE+DRAIN, DOWN* or DOWN*+DRAIN, RESERVED+DRAIN we will not continue!" when: (slurm_state_down_star_drain not in node_status_result.stdout) and (slurm_state_down_drain not in node_status_result.stdout) and (slurm_state_down_star not in node_status_result.stdout) and (slurm_state_idle_drain not in node_status_result.stdout) and (slurm_state_rsrv_drain not in node_status_result.stdout) -# when: (node_status_result.stdout.find('State=DOWN\*\+DRAIN') != -1) +# when: (node_status_result.stdout.find('State=DOWN\*\+DRAIN') != -1) # or (node_status_result.stdout.find('State=DOWN\* ') != -1) # or (node_status_result.stdout.find('State=IDLE\+DRAIN') != -1) @@ -44,7 +44,7 @@ become: true ## Install packages -- name: install deps +- name: install deps yum: name={{ item }} state=present become: true with_items: @@ -53,7 +53,7 @@ - wget - pciutils - kernel-headers - - kernel-devel + - kernel-devel - xterm - libX11-common - libX11-devel @@ -73,15 +73,15 @@ ## Disable Nouveau (only required once on build # MASSIVE M1 and M2 originaly used this method... - name: Add nouveau from blacklist (MASSIVE Centos 6 only) - lineinfile: + lineinfile: args: - dest: /etc/modprobe.d/blacklist.conf - line: "blacklist nouveau" + dest: /etc/modprobe.d/blacklist.conf + line: "blacklist nouveau" state: present become: true when: ansible_os_family == "RedHat" and ansible_lsb.major_release|int == 6 # M3 But this is the preferred method (which is what the installer does -- name: Template nvidia-installer-disable-nouveau.conf +- name: Template nvidia-installer-disable-nouveau.conf template: dest=/etc/modprobe.d/nvidia-installer-disable-nouveau.conf src=nvidia-installer-disable-nouveau.conf.j2 become: true when: ansible_os_family != "RedHat" and ansible_lsb.major_release|int != 6 @@ -89,9 +89,9 @@ - name: Check if nouveau module is loaded shell: cat /proc/modules always_run: yes - register: modules_result + register: modules_result -- name: Restart host to remove nouveau module +- name: Restart host to remove nouveau module shell: "sleep 2 && shutdown -r now &" async: 1 poll: 1 @@ -104,19 +104,19 @@ when: modules_result.stdout.find('nouveau') != -1 # Removed as this is related to old ways of controlling access to driver files -# - name: Template nvidia.conf +# - name: Template nvidia.conf # template: dest=/etc/modprobe.d/nvidia.conf src=nvidia.conf.j2 # become: true ## Install NVIDIA driver -- name: Check nvidia driver version - shell: nvidia-smi +- name: Check nvidia driver version + shell: nvidia-smi register: nvidia_result always_run: yes - debug: var=nvidia_result.stdout_lines -- set_fact: +- set_fact: upgrading_driver: false - name: Set upgrading_driver flag set_fact: @@ -136,7 +136,7 @@ register: nvidia_modules_result always_run: yes -- name: Restart host to unloaded nvidia module +- name: Restart host to unloaded nvidia module shell: "sleep 2 && shutdown -r now &" async: 1 poll: 1 @@ -149,16 +149,16 @@ when: upgrading_driver and (nvidia_modules_result.stdout.find('nvidia') != -1) - name: Copy nvidia installer to /tmp - copy: - src=NVIDIA-Linux-x86_64-{{ nvidia_version }}.run + copy: + src=NVIDIA-Linux-x86_64-{{ nvidia_version }}.run dest=/tmp/NVIDIA-Linux-x86_64-{{ nvidia_version }}.run mode=755 # shell: cp -f /usr/local/src/CUDA/driver/NVIDIA-Linux-x86_64-{{ nvidia_version }}.run /tmp/NVIDIA-Linux-x86_64-{{ nvidia_version }}.run - # become: true + # become: true when: upgrading_driver -- name: Install nvidia driver - shell: /tmp/NVIDIA-Linux-x86_64-{{ nvidia_version }}.run --silent +- name: Install nvidia driver + shell: /tmp/NVIDIA-Linux-x86_64-{{ nvidia_version }}.run --silent become: true when: upgrading_driver # when: nvidia_result.stdout.find("{{ nvidia_version }}") != -1 @@ -168,7 +168,7 @@ shell: /usr/bin/nvidia-xconfig -a --use-display-device=none become: true -- name: Comment out auth required so xserver can start from slurm job +- name: Comment out auth required so xserver can start from slurm job lineinfile: dest=/etc/pam.d/xserver regexp='^auth\s+required\s+pam_console.so' line='#auth required pam_console.so' @@ -176,15 +176,15 @@ # state=present become: true -- name: set persistence mode - lineinfile: +- name: set persistence mode + lineinfile: args: dest: /etc/rc.d/rc.local - line: "nvidia-smi --persistence-mode=1" + line: "nvidia-smi --persistence-mode=1" state: present become: true -- name: Restart host to enable new driver +- name: Restart host to enable new driver shell: "sleep 2 && shutdown -r now &" async: 1 poll: 1 @@ -211,8 +211,8 @@ retries: 5 delay: 5 -- name: Check GPU correct version - debug: msg="Correct Driver Version {{ nvidia_version }}" +- name: Check GPU correct version + debug: msg="Correct Driver Version {{ nvidia_version }}" when: nvidia_result.stdout.find("{{ nvidia_version }}") != -1 - name: Start Slurm diff --git a/roles/hpcsystems/tasks/main.yml b/roles/hpcsystems/tasks/main.yml index 1f1cbf4ed9e0c049d9430153fe0605e039f8bac8..a1be9eb4cb30905b3eb24abc7ddd9fda466ab1c1 100644 --- a/roles/hpcsystems/tasks/main.yml +++ b/roles/hpcsystems/tasks/main.yml @@ -42,13 +42,13 @@ extra_args: "--upgrade" - name: install hpcsystem - git: + git: repo: git@gitlab.erc.monash.edu.au:hpc-team/hpcsystem.git dest: /usr/local/hpcsystem accept_hostkey: True - name: install hpcsystem_config - git: + git: repo: git@gitlab.erc.monash.edu.au:hpc-team/m3_hpcsystem_config.git dest: /usr/local/hpcsystem_config accept_hostkey: True diff --git a/roles/installPackage/tasks/main.yml b/roles/installPackage/tasks/main.yml index 56379ea06801ecf34682834bdc51a42e514385b6..de05decb6f0c18ca95fddd7e6cf37dbdbcb2ad1a 100644 --- a/roles/installPackage/tasks/main.yml +++ b/roles/installPackage/tasks/main.yml @@ -1,11 +1,11 @@ --- - name: Pre installation - shell: "{{ preInstallation }}" + shell: "{{ preInstallation }}" become: true ignore_errors: true when: ansible_distribution == 'CentOS' and preInstallation is defined - -- name: Add new repo file + +- name: Add new repo file shell: "{{ importRepo.command }} {{ importRepo.destination }}" become: true run_once: true @@ -13,24 +13,24 @@ creates: "{{ importRepo.destination }}" when: ansible_distribution == 'CentOS' and importRepo is defined -- name: Install yum packages +- name: Install yum packages yum: name={{ item }} state=present with_items: yumPackageList become: true when: ansible_distribution == 'CentOS' and yumPackageList is defined -- name: Install yum group packages +- name: Install yum group packages shell: yum --setopt=protected_multilib=false -y groupinstall "{{ item }}" with_items: yumGroupPackageList become: true when: ansible_distribution == 'CentOS' and yumGroupPackageList is defined - name: Post installation - shell: "{{ postInstallation }}" + shell: "{{ postInstallation }}" become: true when: ansible_distribution == 'CentOS' and postInstallation is defined - -- name: conditional shell copy command + +- name: conditional shell copy command shell: "{{ cliCopy.run }}" become: true run_once: true diff --git a/roles/jasons_ssh_ca/tasks/main.yml b/roles/jasons_ssh_ca/tasks/main.yml index 40ba4484813bf64228b2358f3ff03d3341229dcd..d042a64d3a576b4992521b6631eca649c8fbc2f2 100644 --- a/roles/jasons_ssh_ca/tasks/main.yml +++ b/roles/jasons_ssh_ca/tasks/main.yml @@ -7,7 +7,7 @@ - name: edit sshd_config lineinfile: - args: + args: dest: /etc/ssh/sshd_config line: TrustedUserCAKeys /etc/ssh/server_ca.pub state: present diff --git a/roles/karaage2.7/tasks/install_via_apt.yml b/roles/karaage2.7/tasks/install_via_apt.yml index 05ef4b0d4d8101ee4ca47f7c674c0767a7ce1742..90658c5761b3305f57a867ab2f068a5c83b2fcc9 100644 --- a/roles/karaage2.7/tasks/install_via_apt.yml +++ b/roles/karaage2.7/tasks/install_via_apt.yml @@ -18,7 +18,7 @@ apt: update_cache=true become: true when: repoConfigured|failed - + - name: install karaage apt: name={{ item }} state=present diff --git a/roles/karaage2.7/tasks/main.yml b/roles/karaage2.7/tasks/main.yml index 5820435315b99f1d6b5fb25be053655667ad6c04..126b4a59fa6150a1010efeb01f1fbd7b537ae9ad 100644 --- a/roles/karaage2.7/tasks/main.yml +++ b/roles/karaage2.7/tasks/main.yml @@ -36,20 +36,20 @@ mysql_user: name='karaage' password={{ karaageSqlPassword }} priv=karaage.*:ALL state=present login_user=root login_password={{ sqlrootPasswd }} - name: allow public karaage registrations - lineinfile: + lineinfile: args: - dest: /etc/karaage/registration_settings.py - regexp: "#ALLOW_REGISTRATIONS" - line: "ALLOW_REGISTRATIONS = True" + dest: /etc/karaage/registration_settings.py + regexp: "#ALLOW_REGISTRATIONS" + line: "ALLOW_REGISTRATIONS = True" backrefs: yes become: true -# Why not template the whole of global_settings.py? +# Why not template the whole of global_settings.py? # Because I don't know what kg_set_secret_key does so I can't easily template my own secret key - name: chmod global_settings.py - file: - args: + file: + args: path: /etc/karaage/global_settings.py owner: root group: "{{ wwwgroup }}" @@ -57,38 +57,38 @@ become: true - name: karaage settings db type - lineinfile: + lineinfile: args: - dest: /etc/karaage/global_settings.py - regexp: " 'ENGINE': 'django.db.backends.'," - line: " 'ENGINE': 'django.db.backends.mysql'," + dest: /etc/karaage/global_settings.py + regexp: " 'ENGINE': 'django.db.backends.'," + line: " 'ENGINE': 'django.db.backends.mysql'," backrefs: yes become: true - name: karaage settings db db - lineinfile: + lineinfile: args: - dest: /etc/karaage/global_settings.py - regexp: " 'NAME': ''," - line: " 'NAME': 'karaage'," + dest: /etc/karaage/global_settings.py + regexp: " 'NAME': ''," + line: " 'NAME': 'karaage'," backrefs: yes become: true - name: karaage settings db user - lineinfile: + lineinfile: args: - dest: /etc/karaage/global_settings.py - regexp: " 'USER': ''," - line: " 'USER': 'karaage'," + dest: /etc/karaage/global_settings.py + regexp: " 'USER': ''," + line: " 'USER': 'karaage'," backrefs: yes become: true - name: karaage settings db password - lineinfile: + lineinfile: args: - dest: /etc/karaage/global_settings.py - regexp: " 'PASSWORD': ''," - line: " 'PASSWORD': '{{ karaageSqlPassword }}'," + dest: /etc/karaage/global_settings.py + regexp: " 'PASSWORD': ''," + line: " 'PASSWORD': '{{ karaageSqlPassword }}'," backrefs: yes become: true @@ -138,7 +138,7 @@ line: "LDAP_ADMIN_USER = '{{ ldapManager }}'" backrefs: yes become: true - + - name: ldap admin passwd lineinfile: @@ -171,7 +171,7 @@ shell: echo 'describe auth_user' | mysql -u karaage --password={{ karaageSqlPassword }} karaage ignore_errors: true register: karaageTablesCreated - + - name: template ldap.conf template: src=ldap_conf.j2 dest=/etc/ldap/ldap.conf become: true @@ -202,7 +202,7 @@ when: karaageTablesCreated|failed - name: fix up karaage transactions.py - lineinfile: + lineinfile: args: line: import tldap.django insertafter: import tldap @@ -211,7 +211,7 @@ become: true - name: fix up karaage tldap/manager.py - lineinfile: + lineinfile: args: line: import tldap.django insertafter: import tldap diff --git a/roles/karaage2.7_noppolicy/tasks/main.yml b/roles/karaage2.7_noppolicy/tasks/main.yml index 7e51106c4a9c68dad466eb3328be8b1c95222e1c..f07e6329954b8617eaca2c0f7411d430d66b30a6 100644 --- a/roles/karaage2.7_noppolicy/tasks/main.yml +++ b/roles/karaage2.7_noppolicy/tasks/main.yml @@ -4,33 +4,33 @@ become: true - name: link defaultUnlocked mixin - shell: ln -s /usr/share/pyshared/placard/schemas/defaultUnlocked.py /usr/lib/python2.7/dist-packages/placard/schemas/defaultUnlocked.py ; ln -s /usr/share/pyshared/placard/schemas/defaultUnlocked.py /usr/lib/python2.6/dist-packages/placard/schemas/defaultUnlocked.py + shell: ln -s /usr/share/pyshared/placard/schemas/defaultUnlocked.py /usr/lib/python2.7/dist-packages/placard/schemas/defaultUnlocked.py ; ln -s /usr/share/pyshared/placard/schemas/defaultUnlocked.py /usr/lib/python2.6/dist-packages/placard/schemas/defaultUnlocked.py args: creates: /usr/lib/python2.6/dist-packages/placard/schemas/defaultUnlocked.py become: true - name: configure ldap mixins 1 - lineinfile: + lineinfile: args: - dest: /etc/karaage/ldap_schemas.py + dest: /etc/karaage/ldap_schemas.py regexp: 'from placard.schemas.pwdpolicy import pwdPolicyMixin' - line: "from placard.schemas.defaultUnlocked import defaultUnlockedMixin" + line: "from placard.schemas.defaultUnlocked import defaultUnlockedMixin" backrefs: yes become: true - name: configure ldap mixins 2 - lineinfile: + lineinfile: args: - dest: /etc/karaage/ldap_schemas.py + dest: /etc/karaage/ldap_schemas.py regexp: ' mixin_list = \[ common.personMixin, pwdPolicyMixin, kPersonMixin \]' line: " mixin_list = [ common.personMixin, defaultUnlockedMixin, kPersonMixin ]" backrefs: yes become: true - name: configure ldap mixins 3 - lineinfile: + lineinfile: args: - dest: /etc/karaage/ldap_schemas.py + dest: /etc/karaage/ldap_schemas.py regexp: 'class person\(rfc.person, rfc.organizationalPerson, rfc.inetOrgPerson, rfc.pwdPolicy, common.baseMixin\):' line: "class person(rfc.person, rfc.organizationalPerson, rfc.inetOrgPerson, common.baseMixin):" backrefs: yes diff --git a/roles/karaage3.1.17/handlers/main.yml b/roles/karaage3.1.17/handlers/main.yml index d0a0c30f115363c1b5c70c7f199f3f8262112bd4..61f7331345a22437439935522ec9e3e799599102 100644 --- a/roles/karaage3.1.17/handlers/main.yml +++ b/roles/karaage3.1.17/handlers/main.yml @@ -1,8 +1,8 @@ --- -- name: restart apache2 +- name: restart apache2 service: name=apache2 state=restarted become: true -- name: restart postfix +- name: restart postfix service: name=postfix state=restarted become: true diff --git a/roles/karaage3.1.17/tasks/karaage.yml b/roles/karaage3.1.17/tasks/karaage.yml index 4daa387c22cb392145b4eb70af25a04df8229424..c696462c2c65ca3198ba3ab58970e0b160bd05fd 100644 --- a/roles/karaage3.1.17/tasks/karaage.yml +++ b/roles/karaage3.1.17/tasks/karaage.yml @@ -43,7 +43,7 @@ - lapack-devel - blas-devel - libffi-devel - when: ansible_os_family == "RedHat" + when: ansible_os_family == "RedHat" #- # name: Install the latest pip # shell: easy_install pip @@ -108,8 +108,8 @@ template: src=kg-idps.j2 dest=/usr/bin/kg-idps mode=755 become: true -- name: install shibboleth cache file - template: src="files/{{ shibboleth_deploy }}_metadata.aaf.xml.j2" dest=/tmp/metadata.aaf.xml +- name: install shibboleth cache file + template: src="files/{{ shibboleth_deploy }}_metadata.aaf.xml.j2" dest=/tmp/metadata.aaf.xml - name: "enabling Karaage configuration" @@ -130,7 +130,7 @@ - name: "Check karaage DB has been initialized or not" - shell: mysql -h {{ karaageDbHost }} -u {{ karaageDbName }} --password={{ karaagePassword }} -Bse 'use karaage; show tables;' | wc -l + shell: mysql -h {{ karaageDbHost }} -u {{ karaageDbName }} --password={{ karaagePassword }} -Bse 'use karaage; show tables;' | wc -l register: karaage_db_init - name: enable wsgi @@ -143,13 +143,13 @@ - name: " Create DB tables" - shell: kg-manage migrate + shell: kg-manage migrate become: true when: karaage_db_init.stdout.find("0") == 0 - name: "Create IDP institutes (disable it as cache is not available)" - shell: kg-idps /tmp/metadata.aaf.xml + shell: kg-idps /tmp/metadata.aaf.xml become: true when: karaage_db_init.stdout.find("0") == 0 diff --git a/roles/karaage3.1.17/tasks/prerequisitesDebian.yml b/roles/karaage3.1.17/tasks/prerequisitesDebian.yml index 40115776cd0d9aeda37d1c55ddd27e61adcf05e0..ee106e6f37b0ca500f4abf19470e960ea6249010 100644 --- a/roles/karaage3.1.17/tasks/prerequisitesDebian.yml +++ b/roles/karaage3.1.17/tasks/prerequisitesDebian.yml @@ -5,7 +5,7 @@ apt: name={{ item }} update_cache=yes with_items: - debian-keyring -- +- apt: update_cache=yes name: "Upgrading apt..." become: true diff --git a/roles/ldapclient/handlers/main.yml b/roles/ldapclient/handlers/main.yml index 947a057a10954a52a463a9a9278ce915740c0bb5..8a612d24aeee39585f3f6e7a6b029e86ace775e2 100644 --- a/roles/ldapclient/handlers/main.yml +++ b/roles/ldapclient/handlers/main.yml @@ -1,4 +1,4 @@ --- -- name: restart sssd +- name: restart sssd service: name=sssd state=restarted become: true diff --git a/roles/ldapclient/tasks/installOpenLdap.yml b/roles/ldapclient/tasks/installOpenLdap.yml index 371381e960b8399a38400a13a075695682314c58..d4f8b62a4cd5791d8cea61e28bd24761eec3f6fa 100644 --- a/roles/ldapclient/tasks/installOpenLdap.yml +++ b/roles/ldapclient/tasks/installOpenLdap.yml @@ -1,6 +1,6 @@ --- - name: "Install open ldap package yum" - yum: + yum: name: ['openldap', 'openldap-clients', 'sssd', 'sssd-common', 'sssd-client', 'nss', 'nss-tools'] state: present become: true @@ -10,7 +10,7 @@ action: apt pkg={{ item }} state=present with_items: - ldap-utils - - sssd - - libpam-sss + - sssd + - libpam-sss become: true when: ansible_os_family == 'Debian' diff --git a/roles/ldapclient/tasks/main.yml b/roles/ldapclient/tasks/main.yml index 4335800bef1c3529895fa56a3b4c5c6c2a4f2c8c..6cea1fe228569e56a5dc8a4a059617d2efff55b3 100644 --- a/roles/ldapclient/tasks/main.yml +++ b/roles/ldapclient/tasks/main.yml @@ -1,5 +1,5 @@ --- - - include: installOpenLdap.yml + include: installOpenLdap.yml - - include: configLdapClient.yml + include: configLdapClient.yml diff --git a/roles/ldapserver/tasks/main.yml b/roles/ldapserver/tasks/main.yml index f92972e710c24be9ab9148ce52d1ae0c8bdc53b2..c6bf89bd675971c10a8fc986f22f8e04962e8aa4 100644 --- a/roles/ldapserver/tasks/main.yml +++ b/roles/ldapserver/tasks/main.yml @@ -1,10 +1,10 @@ --- - name: include vars - include_vars: + include_vars: file: "{{ ansible_distribution }}_{{ ansible_distribution_version }}_{{ ansible_architecture }}.yml" - name: include vars2 - include_vars: + include_vars: file: "{{ ansible_distribution }}.yml" - name: install system packages apt @@ -19,7 +19,7 @@ with_items: "{{ system_packages }}" when: ansible_os_family == 'RedHat' -- name: Fixed default configuration +- name: Fixed default configuration lineinfile: dest=/etc/default/slapd regexp='^SLAPD_SERVICES="ldap:/// ldapi:///"' line='SLAPD_SERVICES="ldaps:/// ldap:/// ldapi:///"' become: true when: ansible_os_family == 'Debian' @@ -102,7 +102,7 @@ when: ldap_TLSCARoot is defined - name: copy key - copy: src="files/{{ ldapKey }}" dest="{{ ldapKeyDest }}" mode=600 owner={{ ldapuser }} group={{ ldapgroup }} + copy: src="files/{{ ldapKey }}" dest="{{ ldapKeyDest }}" mode=600 owner={{ ldapuser }} group={{ ldapgroup }} become: true - name: enable ssl centos @@ -130,7 +130,7 @@ become: true - name: initialise server ssl - shell: ldapmodify -Y EXTERNAL -H ldapi:/// -f /tmp/ssl.ldif -D cn=config + shell: ldapmodify -Y EXTERNAL -H ldapi:/// -f /tmp/ssl.ldif -D cn=config become: true when: tlsConfigured|failed @@ -153,7 +153,7 @@ shell: ldapadd -Y EXTERNAL -H ldapi:/// -f "{{ ldapDir }}/schema/auxposixgroup.ldif" -D cn=config become_user: root become: True - + - name: check ppolicy module loaded shell: slapcat -b cn=config | grep "olcModuleLoad. {.*}ppolicy" become: true @@ -161,7 +161,7 @@ register: ppolicyModuleLoaded - name: load ppolicy module - shell: ldapadd -Y EXTERNAL -H ldapi:/// -f /tmp/load_modules.ldif -D cn=config + shell: ldapadd -Y EXTERNAL -H ldapi:/// -f /tmp/load_modules.ldif -D cn=config become: true when: ppolicyModuleLoaded|failed @@ -172,7 +172,7 @@ register: ppolicyOverlayConfigured - name: add ppolicy overlay - shell: ldapadd -Y EXTERNAL -H ldapi:/// -f /tmp/ppolicy_overlay.ldif -D cn=config + shell: ldapadd -Y EXTERNAL -H ldapi:/// -f /tmp/ppolicy_overlay.ldif -D cn=config become: true when: ppolicyOverlayConfigured|failed @@ -183,7 +183,7 @@ register: refintModuleLoaded - name: load refint module - shell: ldapadd -Y EXTERNAL -H ldapi:/// -f /tmp/load_refint.ldif -D cn=config + shell: ldapadd -Y EXTERNAL -H ldapi:/// -f /tmp/load_refint.ldif -D cn=config become: true when: refintModuleLoaded|failed @@ -194,7 +194,7 @@ register: memberofModuleLoaded - name: load memberof module - shell: ldapadd -Y EXTERNAL -H ldapi:/// -f /tmp/load_memberof.ldif -D cn=config + shell: ldapadd -Y EXTERNAL -H ldapi:/// -f /tmp/load_memberof.ldif -D cn=config become: true when: memberofModuleLoaded|failed @@ -203,7 +203,7 @@ ignore_errors: true register: memberOfConfigured -- name: add member of config +- name: add member of config shell: ldapadd -x -D {{ ldapManager }} -w {{ ldapManagerPassword }} -x -H ldap://localhost -f /tmp/memberOfConfig.ldif when: memberOfConfigured|failed @@ -212,7 +212,7 @@ ignore_errors: true register: refintConfigured -- name: add refint config +- name: add refint config shell: ldapadd -x -D {{ ldapManager }} -w {{ ldapManagerPassword }} -x -H ldap://localhost -f /tmp/refint_config.ldif when: refintConfigured|failed @@ -227,12 +227,12 @@ become: true when: managerConfigured|failed - name: initialise server manager - shell: ldapmodify -Y EXTERNAL -H ldapi:/// -f /tmp/manager2.ldif -D cn=config + shell: ldapmodify -Y EXTERNAL -H ldapi:/// -f /tmp/manager2.ldif -D cn=config become: true ignore_errors: true when: managerConfigured|failed - name: initialise server manager - shell: ldapmodify -Y EXTERNAL -H ldapi:/// -f /tmp/manager3.ldif -D cn=config + shell: ldapmodify -Y EXTERNAL -H ldapi:/// -f /tmp/manager3.ldif -D cn=config become: true when: managerConfigured|failed diff --git a/roles/ldapserver/vars/CentOS.yml b/roles/ldapserver/vars/CentOS.yml index e1d68d894c333b3b379f537ea2128c4a5e4ec159..6b10fe385ef874432d13f376bfbf835e1b3ec5ed 100644 --- a/roles/ldapserver/vars/CentOS.yml +++ b/roles/ldapserver/vars/CentOS.yml @@ -1,4 +1,4 @@ --- ldapDir: "/etc/openldap" module_path: "/usr/lib64/openldap/" - + diff --git a/roles/link_directories/tasks/main.yml b/roles/link_directories/tasks/main.yml index fd9f2f83f4c1f56b2ee912ec6116513fdd5bfeb2..71fd3bd08bf2777275c9dfc6792fa32b94176dbb 100644 --- a/roles/link_directories/tasks/main.yml +++ b/roles/link_directories/tasks/main.yml @@ -12,7 +12,7 @@ when: stat_r.stat.exists and stat_r.stat.isdir become: true -- name: stat +- name: stat stat: path={{ dest }} register: stat_r diff --git a/roles/lmod/tasks/main.yml b/roles/lmod/tasks/main.yml index 1b348eda5459d56ba3318eaba8a2a5a0d9016317..6d57b95b1aeb55c8b4fda8a93c10fe03b3996149 100644 --- a/roles/lmod/tasks/main.yml +++ b/roles/lmod/tasks/main.yml @@ -31,8 +31,8 @@ become: true - name: install lua debian - package: - name: lmod + package: + name: lmod state: present become: true when: ansible_os_family == 'Debian' diff --git a/roles/lustre-client/tasks/main.yml b/roles/lustre-client/tasks/main.yml index abc7cb79e2975ff924d0d44d13b98767c8f4c934..1dc38fde837cfbb77709164a4d24cfb5294b0495 100644 --- a/roles/lustre-client/tasks/main.yml +++ b/roles/lustre-client/tasks/main.yml @@ -65,7 +65,7 @@ when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "14" - name: "Mount lustre filesystems" - mount: name="{{ item.mntpt }}" src="{{ item.servers }}"/"{{ item.src }}" state="mounted" fstype="lustre" opts="_netdev,flock" + mount: name="{{ item.mntpt }}" src="{{ item.servers }}"/"{{ item.src }}" state="mounted" fstype="lustre" opts="_netdev,flock" become: true with_items: "{{ mntlist }}" diff --git a/roles/mailchimpLastlogin/tasks/main.yml b/roles/mailchimpLastlogin/tasks/main.yml index f3d6c006bb9b1b8786e4c3327980b802dfb31fdf..143fa046f005f732e45135b430b19292720880ce 100644 --- a/roles/mailchimpLastlogin/tasks/main.yml +++ b/roles/mailchimpLastlogin/tasks/main.yml @@ -1,5 +1,5 @@ - name: create install dir - file: + file: name: "{{ item }}" state: directory owner: "{{ cron_user }}" @@ -25,7 +25,7 @@ become_user: "{{ cron_user }}" - name: install config - template: + template: src: "{{ item }}.j2" dest: "{{install_path}}/{{ item }}" owner: root diff --git a/roles/mailchimpLastlogin/vars/main.yml b/roles/mailchimpLastlogin/vars/main.yml index b4ff5d4b2c57c06a6a5ea0f5f80cf9181f9a91f8..bf6d97e9cb15219857c581c532a51c57653ba0c8 100644 --- a/roles/mailchimpLastlogin/vars/main.yml +++ b/roles/mailchimpLastlogin/vars/main.yml @@ -4,4 +4,4 @@ key: "{{ mailchimp_key }}" datetag: "{{ mailchimp_datetag | default('last_login') }}" numtag: "{{ mailchimp_numtag | default('days_since_active') }}" - + diff --git a/roles/make_filesystems/tasks/main.yml b/roles/make_filesystems/tasks/main.yml index 41c096e1d48f0428e522151be604107f3af67d80..4672fcb1c49fc8ef6688c9ea340b8ed50f2d0811 100644 --- a/roles/make_filesystems/tasks/main.yml +++ b/roles/make_filesystems/tasks/main.yml @@ -46,7 +46,7 @@ # become: true # when: mkFileSystems is defined # -#- name: Mount device +#- name: Mount device # mount: name={{ item.name }} src={{ item.dev }} fstype={{ item.fstype }} opts={{ item.opts }} state=mounted # with_items: mountFileSystems # become: true diff --git a/roles/modulefiles/tasks/main.yml b/roles/modulefiles/tasks/main.yml index dd27a45a2630f24acc3a36fde8e76d8cfa2fca27..af749adc0e8e1d40550b35f107a615bb31c5dea3 100644 --- a/roles/modulefiles/tasks/main.yml +++ b/roles/modulefiles/tasks/main.yml @@ -10,7 +10,7 @@ when: ansible_os_family == 'Debian' - name: add /usr/local/Modules to the module file path - lineinfile: + lineinfile: args: dest: /usr/share/Modules/init/.modulespath line: /usr/local/Modules/modulefiles @@ -20,7 +20,7 @@ # for some reason ubuntu uses lowercase modules - name: add /usr/local/Modules to the module file path - lineinfile: + lineinfile: args: dest: /usr/share/modules/init/.modulespath line: /usr/local/Modules/modulefiles diff --git a/roles/move_homedir/tasks/main.yml b/roles/move_homedir/tasks/main.yml index 9493ebf98c8ec25cab3e7ae5d41942953ec9a26c..87e59f043a7ba66d9825ac28007f027a0d880479 100644 --- a/roles/move_homedir/tasks/main.yml +++ b/roles/move_homedir/tasks/main.yml @@ -1,6 +1,6 @@ - name: make /local_home file: path=/local_home owner=root group=root state=directory - become: true + become: true - name: stat the local_home path stat: path=/local_home/{{ ansible_user }} diff --git a/roles/mysql/vars/CentOS_7.yml b/roles/mysql/vars/CentOS_7.yml index 24834c49a59e0a5ae210ed9065d018efab0a26c5..5f6f87dc34daf37cdd1ed0061007c702299b72f0 100644 --- a/roles/mysql/vars/CentOS_7.yml +++ b/roles/mysql/vars/CentOS_7.yml @@ -2,7 +2,7 @@ server_packages: - python - python-devel - MySQL-python - - mariadb-server + - mariadb-server client_packages: - mariadb diff --git a/roles/nagios_config/tasks/main.yml b/roles/nagios_config/tasks/main.yml index 5b42c49aaefe4a4f87f22021d25c974c03dc43a5..89a50f8e215762b3f5c23684c83294031cfe5950 100644 --- a/roles/nagios_config/tasks/main.yml +++ b/roles/nagios_config/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: configure monitoring - copy: src={{ item }}_nagios2.cfg dest=/etc/nagios3/conf.d/{{ item }}_nagios2.cfg + copy: src={{ item }}_nagios2.cfg dest=/etc/nagios3/conf.d/{{ item }}_nagios2.cfg with_items: - 'hostgroups' - 'hosts' @@ -19,7 +19,7 @@ - 'extinfo' become: true -- name: change cgi config +- name: change cgi config copy: src=cgi.cfg dest=/etc/nagios3/cgi.cfg become: true diff --git a/roles/nagios_monitored/tasks/main.yml b/roles/nagios_monitored/tasks/main.yml index e69f82f9c1a3c377832745366586762724657cad..6cf7311b79afdbb5396c6b75aeabee7cc618e0d2 100644 --- a/roles/nagios_monitored/tasks/main.yml +++ b/roles/nagios_monitored/tasks/main.yml @@ -18,18 +18,18 @@ - name: install monitor scripts copy: dest={{ nagios_home }}/scripts/{{ item }} src=files/scripts/{{ item }} mode=755 with_items: - - check_apache2 - - check_blocked_vis_jobs + - check_apache2 + - check_blocked_vis_jobs - check_ldap_client - - check_mysql - - check_slurmdbd - - check_blocked_beamline_jobs + - check_mysql + - check_slurmdbd + - check_blocked_beamline_jobs - check_disk - check_localfs.sh - - check_ntp - - check_blocked_compute_jobs - - check_ldap - - check_munge - - check_slurm + - check_ntp + - check_blocked_compute_jobs + - check_ldap + - check_munge + - check_slurm become: true - + diff --git a/roles/nagios_server/handlers/main.yml b/roles/nagios_server/handlers/main.yml index d0a0c30f115363c1b5c70c7f199f3f8262112bd4..61f7331345a22437439935522ec9e3e799599102 100644 --- a/roles/nagios_server/handlers/main.yml +++ b/roles/nagios_server/handlers/main.yml @@ -1,8 +1,8 @@ --- -- name: restart apache2 +- name: restart apache2 service: name=apache2 state=restarted become: true -- name: restart postfix +- name: restart postfix service: name=postfix state=restarted become: true diff --git a/roles/nfs-common/tasks/yumPackages.yml b/roles/nfs-common/tasks/yumPackages.yml index 9fa88e2e0733d2b4bd0ad1f84f292456a9bea875..70cb727d19045168e20a58a12b0560b7efe8a005 100644 --- a/roles/nfs-common/tasks/yumPackages.yml +++ b/roles/nfs-common/tasks/yumPackages.yml @@ -1,4 +1,4 @@ ---- +--- - name: "Install nfs-utils" package: name: diff --git a/roles/nfs-server/tasks/startServer.yml b/roles/nfs-server/tasks/startServer.yml index a2e0cbea827fc4dcc251b05f997dcb75581d4d9e..40b43124362ea3cff1510f38ec87f95f558a2af3 100644 --- a/roles/nfs-server/tasks/startServer.yml +++ b/roles/nfs-server/tasks/startServer.yml @@ -1,4 +1,4 @@ ---- +--- - name: "Create exports if necessary" file: dest={{ item.src }} state=directory mode=755 owner=root group=root become: true diff --git a/roles/nhc/tasks/main.yml b/roles/nhc/tasks/main.yml index fdc90302e8744e719ec7713a94ae5a4ce3d5ca21..bcc820f613e5205c334117e0524359366fed7912 100644 --- a/roles/nhc/tasks/main.yml +++ b/roles/nhc/tasks/main.yml @@ -24,14 +24,14 @@ creates: /tmp/nhc-{{ nhc_version }}/autogen.sh when: not nhc_binary.stat.exists -- name: build nhc +- name: build nhc shell: ./autogen.sh && ./configure --prefix={{ nhc_dir }} && make args: chdir: /tmp/nhc-{{ nhc_version }} creates: /tmp/nhc-{{ nhc_version }}/configure when: not nhc_binary.stat.exists -- name: install nhc +- name: install nhc shell: make install become: true args: @@ -62,7 +62,7 @@ #test NAT is working by pinging an external address, i.e. a license server, or by default Google Public DNS - set_fact: - EXTERNAL_IP_ADDRESS: "8.8.8.8" + EXTERNAL_IP_ADDRESS: "8.8.8.8" when: EXTERNAL_IP_ADDRESS is undefined - name: install nhc NAT check diff --git a/roles/ntp/defaults/main.yml b/roles/ntp/defaults/main.yml index ae20e08a50818b0793dd8fefa83f246b5a7b86d7..9ffc52d7407ffc38ca92ceb15e71c47cbbee981a 100644 --- a/roles/ntp/defaults/main.yml +++ b/roles/ntp/defaults/main.yml @@ -1,2 +1,2 @@ --- -ntp_server: "ntp0.cs.mu.oz.au" +ntp_server: "ntp0.cs.mu.oz.au" diff --git a/roles/ntp/handlers/main.yml b/roles/ntp/handlers/main.yml index f3ed0f7fd9bcb2a64dd0363e6db0301fd89b3c22..9c681e03ea87dd65e739aacb6a308bddf94053c2 100644 --- a/roles/ntp/handlers/main.yml +++ b/roles/ntp/handlers/main.yml @@ -1,3 +1,3 @@ --- - - name: restart ntpd + - name: restart ntpd service: name=ntpd state=restarted diff --git a/roles/openssh/handlers/main.yml b/roles/openssh/handlers/main.yml index 145dee27d85f4629d6472c67dec385c45a5835be..e77e6b9a21dcf2bfcda1a87db0252bae4b1fc7dd 100644 --- a/roles/openssh/handlers/main.yml +++ b/roles/openssh/handlers/main.yml @@ -1,4 +1,4 @@ --- - - name: restart openssh + - name: restart openssh service: name={{ sshd_name }} enabled=yes state=restarted become: true diff --git a/roles/openssh/tasks/installSsh.yml b/roles/openssh/tasks/installSsh.yml index c789823250d562e5330818cdfaa8368747cbe612..9b92120c41d33f1649e7343f45d8e7f0ef5d803c 100644 --- a/roles/openssh/tasks/installSsh.yml +++ b/roles/openssh/tasks/installSsh.yml @@ -2,32 +2,32 @@ apt: name={{ item }} state=present update_cache=yes become: true with_items: - - gcc - - make + - gcc + - make - libssl-dev - zlib1g-dev - libpam0g-dev when: ansible_os_family == "Debian" -- name: get ssh source +- name: get ssh source shell: wget http://mirror.aarnet.edu.au/pub/OpenBSD/OpenSSH/portable/openssh-{{ ssh_version }}.tar.gz args: chdir: /tmp creates: /tmp/openssh-{{ ssh_version }}.tar.gz -- name: untar ssh - shell: tar zxf /tmp/openssh-{{ ssh_version }}.tar.gz +- name: untar ssh + shell: tar zxf /tmp/openssh-{{ ssh_version }}.tar.gz args: chdir: /tmp creates: /tmp/openssh-{{ ssh_version }}/ssh -- name: build ssh +- name: build ssh shell: ./configure --prefix={{ ssh_dir }} --with-ipv4-default --with-md5-passwords --with-pam && make args: chdir: /tmp/openssh-{{ ssh_version }} creates: /tmp/openssh-{{ ssh_version }}/ssh -- name: install ssh +- name: install ssh shell: make install become: true args: @@ -36,7 +36,7 @@ - name: copy init script template: dest=/etc/init.d/{{ sshd_name }} src=ssh.initd.centos.j2 mode=755 - become: true + become: true when: ansible_os_family == "RedHat" - name: copy init script @@ -46,7 +46,7 @@ - name: check config file stat: path=/etc/ssh/sshd_config - register: ssh_config + register: ssh_config ignore_errors: true - name: create config file link @@ -64,10 +64,10 @@ become: true - name: edit config file attache lines" - lineinfile: dest=/etc/ssh/sshd_config line="{{ item }}" + lineinfile: dest=/etc/ssh/sshd_config line="{{ item }}" with_items: - "KexAlgorithms curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group14-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1" - "Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-gcm@openssh.com,aes256-gcm@openssh.com,chacha20-poly1305@openssh.com,aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc,aes256-cbc,arcfour" notify: restart openssh become: true - + diff --git a/roles/opensslCA/tasks/main.yml b/roles/opensslCA/tasks/main.yml index 854bfb0368d3667ec98cd9454dfd9b24b9058a37..82a88c3ab731acfe60466c32bbdab21bb87355ff 100644 --- a/roles/opensslCA/tasks/main.yml +++ b/roles/opensslCA/tasks/main.yml @@ -13,7 +13,7 @@ - name: initialise ca shell: echo 01 > serial ; touch index.txt - args: + args: chdir: "{{ x509cadir }}" creates: index.txt become: true diff --git a/roles/opensslServer/tasks/main.yml b/roles/opensslServer/tasks/main.yml index cf7469c1debf905d886c4e401e2797da22368560..dce1d4f9f9af79457073e0bfa83e0090d27c7e54 100644 --- a/roles/opensslServer/tasks/main.yml +++ b/roles/opensslServer/tasks/main.yml @@ -60,7 +60,7 @@ # # Signing tasks -# +# - name: sign certs shell: yes | openssl ca -config {{ cadir }}/openssl.cnf -days 3650 -in /tmp/{{ certname }}.csr -out /tmp/{{ certname }}.cert diff --git a/roles/p100_firmware/tasks/main.yml b/roles/p100_firmware/tasks/main.yml index 44580f195db1bab74e0bf39dabd725c233c5d8c0..4e7d224fe5330bf35c02a6ca1b211e43409bd081 100644 --- a/roles/p100_firmware/tasks/main.yml +++ b/roles/p100_firmware/tasks/main.yml @@ -9,7 +9,7 @@ become: true become_user: root ignore_errors: true -- name: stop create-dev-uvm +- name: stop create-dev-uvm service: name=collectd state=stopped become: true become_user: root @@ -36,7 +36,7 @@ shell: /usr/sbin/lsmod | grep nvidia ignore_errors: true #- meta: end_play -- name: download Firwmare +- name: download Firwmare get_url: url: "http://consistency0/src/{{ BINARY_NAME }}" dest: "/tmp/{{ BINARY_NAME }}" @@ -45,7 +45,7 @@ command: "/tmp/{{ BINARY_NAME }}" #command: "ls -l /tmp/{{ BINARY_NAME }}" become: true - become_user: root + become_user: root register: upgrade_out - name: stdout of upgrade is debug: var=upgrade_out.stdout @@ -60,7 +60,7 @@ become: true become_user: root ignore_errors: true -- name: start create-dev-uvm +- name: start create-dev-uvm service : name=create-dev-uvm state=started become: true become_user: root diff --git a/roles/pam_sshd/tasks/main.yml b/roles/pam_sshd/tasks/main.yml index 25e9b257afaf38a05b7d675ae2556038ae84bd45..45879123245d44f6da936379c51bdbe24e30d1f0 100644 --- a/roles/pam_sshd/tasks/main.yml +++ b/roles/pam_sshd/tasks/main.yml @@ -8,11 +8,11 @@ template: src=loginnodes_sshd.j2 dest=/etc/pam.d/sshd become: true become_user: root - when: computenodepam is undefined or not computenodepam + when: computenodepam is undefined or not computenodepam - name: "Copy password sshd pam config" template: src=computenodes_sshd.j2 dest=/etc/pam.d/sshd become: true become_user: root - when: computenodepam is defined and computenodepam + when: computenodepam is defined and computenodepam diff --git a/roles/postfix/handlers/main.yml b/roles/postfix/handlers/main.yml index 5b2be226ccd78907d173297c6e4dc49ed5a02d8e..8ede4a1055a2d51112502338ce9b5ebd869b5136 100644 --- a/roles/postfix/handlers/main.yml +++ b/roles/postfix/handlers/main.yml @@ -1,4 +1,4 @@ --- -- name: restart postfix +- name: restart postfix service: name=postfix state=restarted become: true diff --git a/roles/postfix/tasks/main.yml b/roles/postfix/tasks/main.yml index 10dd2f7f72a3c330aa516200f5ddf7a741aeac8e..0a59b19c61b5ccd51247ac61c0ab5658b28cadbd 100644 --- a/roles/postfix/tasks/main.yml +++ b/roles/postfix/tasks/main.yml @@ -9,7 +9,7 @@ become: true notify: restart postfix -- name: start postfix +- name: start postfix service: name=postfix state=started become: true diff --git a/roles/prefer_ipv4/tasks/main.yml b/roles/prefer_ipv4/tasks/main.yml index f75e8a004120e852c155c4a71b2f2edf79397150..1926044debb3429a9fbc5a5ba3db0fc1ade12933 100644 --- a/roles/prefer_ipv4/tasks/main.yml +++ b/roles/prefer_ipv4/tasks/main.yml @@ -1,10 +1,10 @@ - name: Copy over gai.conf to /etc/ become: true become_user: root - copy: + copy: src: gai.conf dest: /etc/gai.conf owner: root group: root mode: 0644 - + diff --git a/roles/provision/tasks/main.yml b/roles/provision/tasks/main.yml index adbf87ad770d261fcce8690466e2e40d1d78871e..294ce9627c7674f099c0180eac3ed32a52ec8f41 100644 --- a/roles/provision/tasks/main.yml +++ b/roles/provision/tasks/main.yml @@ -3,10 +3,10 @@ file: path="{{ provision | dirname }}" state=directory mode=755 owner=root become: true -- name: copy provision template +- name: copy provision template template: src=provision.sh.j2 dest={{ provision }} mode=755 owner=root become: true -- name: provision cron job +- name: provision cron job cron: name=provision job="/usr/bin/flock -x -n /tmp/provision.lck -c {{ provision }}" user=root minute=*/30 state=present become: true diff --git a/roles/provision_homedir/tasks/main.yml b/roles/provision_homedir/tasks/main.yml index 9ed37a74638c3b77fb9e7fb8538f66833fa1b891..73559a9c6bc804034591efd9425dc074685993d0 100644 --- a/roles/provision_homedir/tasks/main.yml +++ b/roles/provision_homedir/tasks/main.yml @@ -13,11 +13,11 @@ become: true when: ansible_os_family == 'Debian' -- name: copy provision_homedir template +- name: copy provision_homedir template template: src=provision_homedir.py.j2 dest={{ provision_homedir }} mode=700 owner=root become: true # the lockfile for makeing home directories should be located on the shared directory where the home directories will be created. Otherwise it will be racey -- name: provision_homedir cron job +- name: provision_homedir cron job cron: name=provision_homedir job="/usr/bin/flock -x -n {{ mnthome }}/home/provision.lck -c {{ provision_homedir }}" user=root minute=*/15 state=present become: true diff --git a/roles/provision_slurm/tasks/main.yml b/roles/provision_slurm/tasks/main.yml index 4eb7e95ba87f4711e35b9d39367286c91859cfe8..c549fb88fe20c1f4e74c526cde58cf7359872534 100644 --- a/roles/provision_slurm/tasks/main.yml +++ b/roles/provision_slurm/tasks/main.yml @@ -14,12 +14,12 @@ become: true when: ansible_os_family == 'Debian' -- name: copy provision_slurm template +- name: copy provision_slurm template template: src=provision_slurm.py.j2 dest={{ provision_slurm }} mode=700 owner=root become: true run_once: true # the lockfile for makeing home directories should be located on the shared directory where the home directories will be created. Otherwise it will be racey -- name: provision_slurm cron job +- name: provision_slurm cron job cron: name=provision_slurm job="/usr/bin/flock -x -n {{ lockpath }}/slurm_provision.lck -c {{ provision_slurm }}" user=root minute=*/20 state=present become: true diff --git a/roles/set_semaphore_count/tasks/main.yml b/roles/set_semaphore_count/tasks/main.yml index 1e2321d48254e1944813d6d7e56041d39ae85ac2..440242cfaa55c532a4126ecd12c5b379c6d96589 100644 --- a/roles/set_semaphore_count/tasks/main.yml +++ b/roles/set_semaphore_count/tasks/main.yml @@ -3,12 +3,12 @@ set_fact: SEM_COUNT: "500\t256000\t64\t10240" when: SEM_COUNT is not defined - + - name: test value debug: msg="Value of semaphores is {{ SEM_COUNT }} " #" - + - name: Place comment line in file - lineinfile: + lineinfile: path: /etc/sysctl.d/88-setSemaphore.conf line: "#set large semaphore count. Needed for Gamess." state: present @@ -19,9 +19,9 @@ become: true become_user: root when: ansible_os_family == 'RedHat' - + - name: Place comment line in file - lineinfile: + lineinfile: path: /etc/sysctl.d/88-setSemaphore.conf line: "#https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/5/html/tuning_and_optimizing_red_hat_enterprise_linux_for_oracle_9i_and_10g_databases/sect-oracle_9i_and_10g_tuning_guide-setting_semaphores-setting_semaphore_parameters " state: present @@ -30,7 +30,7 @@ when: ansible_os_family == 'RedHat' - name: Place comment line in file - lineinfile: + lineinfile: path: /etc/sysctl.d/88-setSemaphore.conf line: "kernel.sem={{ SEM_COUNT }}" state: present @@ -52,11 +52,11 @@ #- debug: # var: current_sem -- name: set semaphore count now +- name: set semaphore count now shell: "/usr/bin/echo {{ SEM_COUNT }} > /proc/sys/kernel/sem" become: true become_user: root - when: + when: - current_sem.changed - ansible_os_family == 'RedHat' diff --git a/roles/set_timezone/tasks/main.yml b/roles/set_timezone/tasks/main.yml index 4d5d9f521e972cb7b69b9258e43d55da9ad70a19..c824bbb4f9b94a7cdb8ba90dbd776456a470c3b1 100644 --- a/roles/set_timezone/tasks/main.yml +++ b/roles/set_timezone/tasks/main.yml @@ -6,30 +6,30 @@ register: ntpinstall - name: restart ntpd redhat - service: name=ntpd state=restarted + service: name=ntpd state=restarted become: true become_user: root - when: + when: - ansible_os_family == "RedHat" - ntpinstall.changed - name: ensure ntpd is enabled and started redhat - service: name=ntpd state=started enabled=yes - become: true + service: name=ntpd state=started enabled=yes + become: true become_user: root when: ansible_os_family == "RedHat" - + - name: restart ntpd ubuntu - service: name=ntp state=restarted + service: name=ntp state=restarted become: true become_user: root - when: + when: - ansible_os_family == "Debian" - ntpinstall.changed - name: ensure ntpd is enabled and started ubuntu - service: name=ntp state=started enabled=yes - become: true + service: name=ntp state=started enabled=yes + become: true become_user: root when: ansible_os_family == "Debian" diff --git a/roles/shibboleth-sp/handlers/main.yml b/roles/shibboleth-sp/handlers/main.yml index 3070cd7df33df6b30af18596f14df572e6549abf..8475dfcfe1ab0440717cac2b6cf25971428417cd 100644 --- a/roles/shibboleth-sp/handlers/main.yml +++ b/roles/shibboleth-sp/handlers/main.yml @@ -1,9 +1,9 @@ --- -- name: "Restarting Apache" +- name: "Restarting Apache" service: name=apache2 state=restarted become: true -- name: "Restarting shibboleth" +- name: "Restarting shibboleth" service: name=shibd state=restarted become: true diff --git a/roles/shibboleth-sp/tasks/shibbolethConfig.yml b/roles/shibboleth-sp/tasks/shibbolethConfig.yml index 3f08102b338829bc68abf5a24456d88ba9202199..ef931c2e019305982ba65fc637b85f2f5c2f9f83 100644 --- a/roles/shibboleth-sp/tasks/shibbolethConfig.yml +++ b/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 }}"/>' - diff --git a/roles/shibboleth-sp/tasks/shibbolethPrerequisites.yml b/roles/shibboleth-sp/tasks/shibbolethPrerequisites.yml index fc2b0d411caa600dd391dd6e037d083f6b53ef85..6b88598c43c15cecd58670e35cd40ee5cd0bcfc2 100644 --- a/roles/shibboleth-sp/tasks/shibbolethPrerequisites.yml +++ b/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 diff --git a/roles/slurm-common/defaults/main.yml b/roles/slurm-common/defaults/main.yml index 283c06273b4c10af672e815f0fe0062f986814fd..87a980a53d568be25c86bff26a1ad7b00dcc2724 100644 --- a/roles/slurm-common/defaults/main.yml +++ b/roles/slurm-common/defaults/main.yml @@ -1,5 +1,5 @@ --- -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'} diff --git a/roles/slurm-common/tasks/createSlurmDirectories.yml b/roles/slurm-common/tasks/createSlurmDirectories.yml index ba82cd78ea1dae229ba95a63a2f03a1131e7ec29..de9f8e15aa7bdfadd0df1a072deac2d6ad6197c9 100644 --- a/roles/slurm-common/tasks/createSlurmDirectories.yml +++ b/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 diff --git a/roles/slurm-common/tasks/installMungeFromSource.yml b/roles/slurm-common/tasks/installMungeFromSource.yml index 7a24698ec82a8c6eac5c263891e8c00536e6e85e..cf39c3f9273c7d3c7347fd73efe5d226d5033744 100644 --- a/roles/slurm-common/tasks/installMungeFromSource.yml +++ b/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 diff --git a/roles/slurm-common/tasks/installSlurmFromSource.yml b/roles/slurm-common/tasks/installSlurmFromSource.yml index 9d1a326c634ede300ccbe6571b6123b88903cf50..13d5f7a5a1ea246dd6c74c54874c9746530282c1 100644 --- a/roles/slurm-common/tasks/installSlurmFromSource.yml +++ b/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 diff --git a/roles/slurm-common/tasks/main.yml b/roles/slurm-common/tasks/main.yml index 1e53779ccd9d716cdaa1bce1b6d822c954659748..802caf58bfedab3d8bc78e075aeb7108ee0e6890 100644 --- a/roles/slurm-common/tasks/main.yml +++ b/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 diff --git a/roles/slurm-start/tasks/main.yml b/roles/slurm-start/tasks/main.yml index 33d9ca1690932920b538b1e3532f767b35e1323a..9bbba39e8eff35baf883c7fb56b53c578854e69e 100644 --- a/roles/slurm-start/tasks/main.yml +++ b/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 diff --git a/roles/slurm-trigger/tasks/main.yml b/roles/slurm-trigger/tasks/main.yml index 0e65185c9bd6e7b560db9a434199de6ba992006b..4918db5097db7b5d40df2307c31bb1b32d44d309 100644 --- a/roles/slurm-trigger/tasks/main.yml +++ b/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 - - - + + + diff --git a/roles/slurm_sql_bk/tasks/main.yml b/roles/slurm_sql_bk/tasks/main.yml index 70cd526502e0da5b1410b69207e6c9d36381ee6c..b501271568103c3d355555c78438bd5fafb1acaf 100644 --- a/roles/slurm_sql_bk/tasks/main.yml +++ b/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 diff --git a/roles/smb_config/tasks/main.yml b/roles/smb_config/tasks/main.yml index 2bcf399185035c61e04632e2978f854c2aa03f01..dd278527d2412906e3aeb4d45707b14682dffcfc 100644 --- a/roles/smb_config/tasks/main.yml +++ b/roles/smb_config/tasks/main.yml @@ -1,10 +1,10 @@ --- - 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 diff --git a/roles/ssh-keepalive/tasks/main.yml b/roles/ssh-keepalive/tasks/main.yml index c58c27bd4e3a743cd8255e20c986cfbe8e96b713..f35a755af437c328a8d591a2fc50d80ed53aacce 100644 --- a/roles/ssh-keepalive/tasks/main.yml +++ b/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 diff --git a/roles/ssh-nopassword-login/tasks/main.yml b/roles/ssh-nopassword-login/tasks/main.yml index 59fb47f69eee03427dd442252563893e47a45040..209f83d033e18c66dc0469e11ad53e445d459554 100644 --- a/roles/ssh-nopassword-login/tasks/main.yml +++ b/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 diff --git a/roles/ssh-password-login/tasks/main.yml b/roles/ssh-password-login/tasks/main.yml index 7c133001c777cee39ad6fa519d11537d49bc928d..1f2e8a079333c6c05f0f6ece2f7b426674435cf3 100644 --- a/roles/ssh-password-login/tasks/main.yml +++ b/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 diff --git a/roles/strudel_build/vars/CentOS_6_x86_64.yml b/roles/strudel_build/vars/CentOS_6_x86_64.yml index 650e1d8e93fa3ae7468486a5eabbdd4d5d8b215d..95f26993df7d91fa2c5c2f0dd341ea1fd8eb749e 100644 --- a/roles/strudel_build/vars/CentOS_6_x86_64.yml +++ b/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 diff --git a/roles/strudel_build/vars/CentOS_7_x86_64.yml b/roles/strudel_build/vars/CentOS_7_x86_64.yml index a2a585dfa9ec102c64359f0755abadbfb5c3b66b..4e892809d774ce1d38be1185b3f7568452c20c30 100644 --- a/roles/strudel_build/vars/CentOS_7_x86_64.yml +++ b/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 diff --git a/roles/strudel_build/vars/Fedora_19_x86_64.yml b/roles/strudel_build/vars/Fedora_19_x86_64.yml index a250e49d5b511b6a62097b90dcfa96e9ca2bca32..28e8e7331f2594f068839bb30841aa56b9a3a7a5 100644 --- a/roles/strudel_build/vars/Fedora_19_x86_64.yml +++ b/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 diff --git a/roles/strudel_build/vars/Fedora_20_x86_64.yml b/roles/strudel_build/vars/Fedora_20_x86_64.yml index 2e3f8e6d311c8e8242fee2f3bc650cb532aa048d..4e83d4d96b0556e44b17725f5fba28d66ea649dc 100644 --- a/roles/strudel_build/vars/Fedora_20_x86_64.yml +++ b/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 diff --git a/roles/strudel_config/tasks/main.yml b/roles/strudel_config/tasks/main.yml index 51610a4b2e7dcfdba703a12f318529e796ee57a9..dd2e06dfbd1ecb8bbcd07ea9693231b71f6c835b 100644 --- a/roles/strudel_config/tasks/main.yml +++ b/roles/strudel_config/tasks/main.yml @@ -1,5 +1,5 @@ - name: "Set login node" - set_fact: + set_fact: loginNode: "{{ ansible_eth0.ipv4.address }}" - name: "Temlate Strudel config" diff --git a/roles/strudel_test/tasks/main.yml b/roles/strudel_test/tasks/main.yml index 6dfbeac2bfdd2eed22de38df3b3203cdec19ce2c..7879835e413f8e673063078d60d40e3212a6d69e 100644 --- a/roles/strudel_test/tasks/main.yml +++ b/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" diff --git a/roles/strudel_test/vars/CentOS_6_x86_64.yml b/roles/strudel_test/vars/CentOS_6_x86_64.yml index 650e1d8e93fa3ae7468486a5eabbdd4d5d8b215d..95f26993df7d91fa2c5c2f0dd341ea1fd8eb749e 100644 --- a/roles/strudel_test/vars/CentOS_6_x86_64.yml +++ b/roles/strudel_test/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 diff --git a/roles/strudel_test/vars/CentOS_7_x86_64.yml b/roles/strudel_test/vars/CentOS_7_x86_64.yml index a2a585dfa9ec102c64359f0755abadbfb5c3b66b..4e892809d774ce1d38be1185b3f7568452c20c30 100644 --- a/roles/strudel_test/vars/CentOS_7_x86_64.yml +++ b/roles/strudel_test/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 diff --git a/roles/strudel_test/vars/Fedora_19_x86_64.yml b/roles/strudel_test/vars/Fedora_19_x86_64.yml index a250e49d5b511b6a62097b90dcfa96e9ca2bca32..28e8e7331f2594f068839bb30841aa56b9a3a7a5 100644 --- a/roles/strudel_test/vars/Fedora_19_x86_64.yml +++ b/roles/strudel_test/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 diff --git a/roles/strudel_test/vars/Fedora_20_x86_64.yml b/roles/strudel_test/vars/Fedora_20_x86_64.yml index 2e3f8e6d311c8e8242fee2f3bc650cb532aa048d..4e83d4d96b0556e44b17725f5fba28d66ea649dc 100644 --- a/roles/strudel_test/vars/Fedora_20_x86_64.yml +++ b/roles/strudel_test/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 diff --git a/roles/syncExports/handlers/main.yml b/roles/syncExports/handlers/main.yml index 51c3b0bff89519f6219b5c593e4db1de11127e21..4aafca24e3385af80380eac544f2f96e0e6ed7b1 100644 --- a/roles/syncExports/handlers/main.yml +++ b/roles/syncExports/handlers/main.yml @@ -1,5 +1,5 @@ --- -- name: "Reload exports" +- name: "Reload exports" command: exportfs -ra delegate_to: "{{ nfs_server }}" become: true diff --git a/roles/telegraf/tasks/main.yml b/roles/telegraf/tasks/main.yml index 830e211629565344a08b9a560c40f308d01d2318..ef69d986b82c97086391d90b86d2d6c47f9a5950 100644 --- a/roles/telegraf/tasks/main.yml +++ b/roles/telegraf/tasks/main.yml @@ -23,7 +23,7 @@ become_user: root - name: Make a directory for extra files - file: + file: state: directory mode: 'u=rwx,g=rx,o=rx' owner: 'telegraf' diff --git a/roles/upgrade/tasks/main.yml b/roles/upgrade/tasks/main.yml index e3d222132ba2a0fef418fe821491ab296ca36f8f..20afe1a240d1a9de9e02c2c9f5d0d79919140c05 100644 --- a/roles/upgrade/tasks/main.yml +++ b/roles/upgrade/tasks/main.yml @@ -55,24 +55,24 @@ when: ansible_os_family=="RedHat" check_mode: no changed_when: False - args: + args: warn: False - + - name: get kernel-devel version shell: dpkg -l linux-image* | grep "^ii" | grep "linux-image-[0-9]" | sed 's/\ \ */ /g' | cut -f 2 -d " " | cut -f 3-5 -d "-" register: dpkg_l_output when: ansible_os_family=="Debian" check_mode: no - changed_when: False + changed_when: False - name: get kernel version shell: uname -r register: uname_r_output check_mode: no - changed_when: False + changed_when: False - name: default dont reboot - set_fact: + set_fact: reboot_now: false - name: debug1 @@ -89,7 +89,7 @@ - name: set reboot when kernel has changed set_fact: reboot_now: true - when: ansible_os_family=="Debian" and not uname_r_output.stdout in dpkg_l_output.stdout + when: ansible_os_family=="Debian" and not uname_r_output.stdout in dpkg_l_output.stdout - name: debug3 debug: var=reboot_now