Merge branch 'devel'

examples/group_vars/all/root_keys.yml

@@ -1,13 +1,10 @@
 ---
 root_keys:
-  - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyYOlbFgxMXZ+liGoxY+5fZwPn2ZbvrV9n6N2eIRYdgnTed1K55C5eef5W2s024/I5L1rbk9Mwu7Wvgey5xBlTUyqbXxuWkWtqHzCBfe9eGw/g4CEfgAi+Fl2koToKYRSCBSuWnFiStVvFxYZipoQZ73TJvlOUoZAx8u496Y03QhQc2WxIBk5eTQH40eLldrsjJK0AWZ8qXtdbdNjrCFC2ZDuV5//Bv1YzcFv/sbRmr9JC2SINWkDfNSE0YpZaY/6Vvv1jQlcGWTtOlW7a5uEtX8228oCV2oP7jzAVStYhMOsZ/mM0qRz3v863bCYNRlFQxMfkD69Yoj/fnpluhx5Vw==
   - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOs7WAhPmQeWFXkkKUpEDg2GyG0OyLNzi6OC5AM1k1Cad1QW2V9Ztk2OyGuxOG6DanUMsmEB1qAJq+7yK2fL4yuUSFxAk9Ioe0tMW5cEfnJhPNmU8eb7TX/GdoDPXS5LTYhA9hsfChvf9GrYEYelv3dl0PZgUOKIHqEqWmgpMEQP+xwbAB4MlGTNtbMXi2gOGVas+yt7B5DOqiZ35sDr9Zg114NaohAl8mzqU2bJxsFtKYvjGK2LcCVPY/nKoNG+zqvpJkU5wVglpGFgtaBQKTgLrTFRLCCpYR2YhyZKlCPYS6SKlInTx7KSR4iN3808Q5LzSDHK2nk8XiW+9VOYaZWQKpZoPK/RmjI1vO+AVk2dECtiMJGDuUM71FGZtAjcp+HXPI36tWFYpa1Z/NGj//mZ5yc+kZfzGeiKhC0yOgJDRkkSbMJ2TxaSZXSEyb6vke5ctUURdbBaB2YvS5VQJhTFJzAld7b+A1Zh7rf2tOLGPs/3AytIkDKGfBX4CBHdT3+sadvIsNN/pvgg0sn6DrZ1BbbjkqbfGEMgYLvOVr6K4iE8zlFVlM2JpgA1d04NXKbni3NV9gopmYCw6pO62N9rWebg/56g1J7JFpwb8sPGrm8pB8aTUc2WJaWuQUnF9oA6upPx1EQEDXYrRV0w1sCcU5M3QpvXLiGUo81FIZcw==
 
 admingroup: "admin"
 adminshell: "/bin/bash"
 adminusers:
-  - { name: cscluis, uid: 5001, state: "absent", groups: "{{admingroup}}", shell: "/sbin/nologin", pubkey: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA27hX0/f9J25uw+Eu7UOetIMfXqkf7IWMmfJii1Iaev6YYjcso9drOcYcDa6qmVTUhHphVFV8vgn1K5/Se5E38OpeuGmx1Zv2p/qBreKUzQZYewA4dcNDdmz4JwWRD2jSPN55YxMMSscZiHNl2sk0m0RDfO3t0hSHCwxSusDKbMzq9OaW2rJ02fdk/WweVlV4CKJwNrMTQ0S4p1dUB5QauGkTX/Mz2A5caa1ah6C+wkXP8kpWOW6eBV4y/Lfkyhwo4VkWiRCOMyT3A0YEJLq3DE89FTfYy9Aj8biHBwQ2xPem87OdLHZbVObxIIzVgcF+WbK33vsjydNbJ0xI1LUYVw==", key_state: "absent", remove: "yes" }
-  - { name: csculf, uid: 5002, state: "absent", groups: "{{admingroup}}", shell: "{{adminshell}}", pubkey: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAq9tQA0qxkzot64tUNKgGpW9H4RBz2H+Jr5wcC86kXnBBWeMmEeI9KrCF6+emhOopaha32ux9n42IW28fDjKh22F6vRUJFdUAwVcWRiG3Mki1ENRw4JSGkEdd+KfIolCtPy5kzxnmAFL3zdytUxY+e+OQlLXjA7FYfStdxB0TawIgAOibs9qzUYiGcfehw3QMZNVLRzFxAPvgJ4xzYTRlHxCJ5sP/hkL8zl5lysFQiMV5HAELh/A/XQMAYIphs5/4ijXkNVekN/iJEuEgq2XYBwn/E6iH2fwJY+Abo1sPTnsx1fdhVCtUvS6TRNWP8Ihy0YaNANU/eUof02jZouPQZGyx9upG9SZhEfCygET6QJ6V6Mkw6gC4AxqzwcS61gOQtieWeXZ2xF3NxvRXIx5QkyEPFoCLwnlLdidtIPOt4VikXvVvizah2I3KB9AewRgkOiBheiBNMoxOKSOQllMhJ/G4v820nXc1roNegiYvwC8XaddAQNc8NqYKJuVlc4zboJDwoGRSAhEXKVYL2gKdaYLeZWMa+keS/a9AzF1iqhc+nY1JFVb/0kUgOg2lqSHOX9XWvcDTVkBKbNwwpGrKCxP1BX0muQX5nL1xtqmPewOZVgsGFiavO8ix3C7r/GEMHbzG+wOtoG+POj+7zsUHSl4lj876dmIed/ddolnUwNk=" }
-  - { name: cscjguldmyr, uid: 5003, state: "present", groups: "{{admingroup}}", shell: "{{adminshell}}", pubkey: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyYOlbFgxMXZ+liGoxY+5fZwPn2ZbvrV9n6N2eIRYdgnTed1K55C5eef5W2s024/I5L1rbk9Mwu7Wvgey5xBlTUyqbXxuWkWtqHzCBfe9eGw/g4CEfgAi+Fl2koToKYRSCBSuWnFiStVvFxYZipoQZ73TJvlOUoZAx8u496Y03QhQc2WxIBk5eTQH40eLldrsjJK0AWZ8qXtdbdNjrCFC2ZDuV5//Bv1YzcFv/sbRmr9JC2SINWkDfNSE0YpZaY/6Vvv1jQlcGWTtOlW7a5uEtX8228oCV2oP7jzAVStYhMOsZ/mM0qRz3v863bCYNRlFQxMfkD69Yoj/fnpluhx5Vw==" }
-  - { name: cscmika, uid: 5004, state: "present", groups: "{{admingroup}}", shell: "{{adminshell}}", pubkey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsfBNhkV0UVHS44ouKt9/tK7Q4vKS9X6RHZfB+ThdZp00e7nUlnnR17DXJezu9TkktEvd2Xg213467DC9WTcscPzy116T0qw4byBKq7pRVX8EiBZ2tYFNCrhk9bM4IHNhonRi3iEGPG8oXVI0hD67t9X7ZBB5wEEEoTZIUhh57C5ZiMapCtZ63ABhHQIYHMzIsdRhjbY6OFA2Bp22401rJ5tP1dGObweYzdfBr7Xo4l3SI/7zPKWxuqJ9TXRzbrrNT6ULWas74hkSWEyrd2uiAmo49FXtfs04+Jv9s187aFoGwp3mIHCFS1nVme2rh2TM1QS6KMpcou27ATertWPcb" }
+  - { name: cscjguldmyr, uid: 5003, state: "absent", groups: "{{admingroup}}", shell: "{{adminshell}}", pubkey: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyYOlbFgxMXZ+liGoxY+5fZwPn2ZbvrV9n6N2eIRYdgnTed1K55C5eef5W2s024/I5L1rbk9Mwu7Wvgey5xBlTUyqbXxuWkWtqHzCBfe9eGw/g4CEfgAi+Fl2koToKYRSCBSuWnFiStVvFxYZipoQZ73TJvlOUoZAx8u496Y03QhQc2WxIBk5eTQH40eLldrsjJK0AWZ8qXtdbdNjrCFC2ZDuV5//Bv1YzcFv/sbRmr9JC2SINWkDfNSE0YpZaY/6Vvv1jQlcGWTtOlW7a5uEtX8228oCV2oP7jzAVStYhMOsZ/mM0qRz3v863bCYNRlFQxMfkD69Yoj/fnpluhx5Vw==" }
+  - { name: cscmika, uid: 5004, state: "absent", groups: "{{admingroup}}", shell: "{{adminshell}}", pubkey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsfBNhkV0UVHS44ouKt9/tK7Q4vKS9X6RHZfB+ThdZp00e7nUlnnR17DXJezu9TkktEvd2Xg213467DC9WTcscPzy116T0qw4byBKq7pRVX8EiBZ2tYFNCrhk9bM4IHNhonRi3iEGPG8oXVI0hD67t9X7ZBB5wEEEoTZIUhh57C5ZiMapCtZ63ABhHQIYHMzIsdRhjbY6OFA2Bp22401rJ5tP1dGObweYzdfBr7Xo4l3SI/7zPKWxuqJ9TXRzbrrNT6ULWas74hkSWEyrd2uiAmo49FXtfs04+Jv9s187aFoGwp3mIHCFS1nVme2rh2TM1QS6KMpcou27ATertWPcb" }
   - { name: cscsalmela, uid: 5005, state: "present", groups: "{{admingroup}}", shell: "{{adminshell}}", pubkey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOs7WAhPmQeWFXkkKUpEDg2GyG0OyLNzi6OC5AM1k1Cad1QW2V9Ztk2OyGuxOG6DanUMsmEB1qAJq+7yK2fL4yuUSFxAk9Ioe0tMW5cEfnJhPNmU8eb7TX/GdoDPXS5LTYhA9hsfChvf9GrYEYelv3dl0PZgUOKIHqEqWmgpMEQP+xwbAB4MlGTNtbMXi2gOGVas+yt7B5DOqiZ35sDr9Zg114NaohAl8mzqU2bJxsFtKYvjGK2LcCVPY/nKoNG+zqvpJkU5wVglpGFgtaBQKTgLrTFRLCCpYR2YhyZKlCPYS6SKlInTx7KSR4iN3808Q5LzSDHK2nk8XiW+9VOYaZWQKpZoPK/RmjI1vO+AVk2dECtiMJGDuUM71FGZtAjcp+HXPI36tWFYpa1Z/NGj//mZ5yc+kZfzGeiKhC0yOgJDRkkSbMJ2TxaSZXSEyb6vke5ctUURdbBaB2YvS5VQJhTFJzAld7b+A1Zh7rf2tOLGPs/3AytIkDKGfBX4CBHdT3+sadvIsNN/pvgg0sn6DrZ1BbbjkqbfGEMgYLvOVr6K4iE8zlFVlM2JpgA1d04NXKbni3NV9gopmYCw6pO62N9rWebg/56g1J7JFpwb8sPGrm8pB8aTUc2WJaWuQUnF9oA6upPx1EQEDXYrRV0w1sCcU5M3QpvXLiGUo81FIZcw==" }

requirements.yml

@@ -19,7 +19,7 @@
 
 - src: https://github.com/CSCfi/ansible-role-rsyslog
   path: roles
-  version: v1.1.7
+  version: v1.1.8
 
 - src: https://github.com/CSCfi/ansible-role-dhcp_server
   path: roles
@@ -44,7 +44,7 @@
 
 - src: https://github.com/CSCfi/ansible-role-slurm
   path: roles
-  version: v2.0.3
+  version: v2.0.4
 
 - src: https://github.com/CSCfi/ansible-role-cvmfs
   path: roles
@@ -62,7 +62,7 @@
 - src: https://github.com/willshersystems/ansible-sshd
   path: roles
   name: ansible-role-sshd
-  version: v0.7.6
+  version: v0.8.3
 
 - src: https://github.com/CSCfi/ansible-system-limits
   path: roles
@@ -83,7 +83,7 @@
 
 - src: https://github.com/CSCfi/ansible-role-collectd
   path: roles
-  version: v2.1.3
+  version: v2.1.4
 
 - src: https://github.com/CSCfi/ansible-role-pxe_config
   path: roles
@@ -109,6 +109,10 @@
   path: roles
   version: v1.4.9
 
+- src: https://github.com/CSCfi/ansible-role-arc-frontend-6
+  path: roles
+  version: v1.2.3
+
 - src: https://github.com/fgci-org/ansible-role-fgci-bash
   path: roles
   version: v1.3.0

roles/dns/handlers/main.yml

@@ -0,0 +1,8 @@
+---
+- name: reload NetworkManager
+  service:
+    name: NetworkManager
+    state: reloaded
+
+
+

roles/dns/tasks/main.yml

@@ -1,4 +1,8 @@
 ---
+
+- include_tasks: redhat.yml
+  when: ansible_os_family == "RedHat" and ansible_distribution_major_version|int >= 8
+
 - name: Deploy a clean /etc/resolv.conf
   template: src=resolv.conf.j2 dest=/etc/resolv.conf
   tags:

roles/dns/tasks/redhat.yml

@@ -0,0 +1,17 @@
+---
+
+- name: make sure line 'dns=none' is set in /etc/NetworkManager/NetworkManager.conf
+  ini_file:
+    path: /etc/NetworkManager/NetworkManager.conf
+    state: present
+    no_extra_spaces: yes
+    section: main
+    option: dns
+    value: none
+    owner: root
+    group: root
+    mode: 0644
+    backup: yes
+  notify:
+    - reload NetworkManager
+

roles/network_interface/tasks/main.yml

@@ -1,13 +1,20 @@
 ---
 
 - name: Add the OS specific varibles
-  include_vars: "{{ ansible_os_family }}.yml"
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version}}.yml"
+    - "{{ ansible_os_family }}.yml"
 
 - name: Install the required  packages
   package:
     name: "{{ network_pkgs }}"
     state: present
 
+- name: Include CentOS8 specific tasks
+  include_tasks: CentOS_8.yml
+  when: ansible_os_family == "RedHat" and ansible_distribution_major_version == "8"
+
 - name: Set default packet scheduler to reduce bufferbloat
   sysctl:
     name: net.core.default_qdisc

roles/network_interface/vars/CentOS-8.yml

@@ -0,0 +1,8 @@
+---
+network_pkgs:
+  - network-scripts
+  - python3-libselinux
+  - iputils
+
+net_path: "/etc/sysconfig/network-scripts"
+

roles/watermark-release/files/fgci-ansible-release

@@ -1 +1 @@
-2.1.8
+2.1.9