Merge branch 'devel' into stable

tasks/_mergeimages.yml

 
 - name: detect architecture
-  set_fact: 
+  ansible.builtin.set_fact: 
      _linux_installer_arch: "x86_64"
   when: _linux_dist_arch == "x86_64" or  _linux_dist_arch == "amd64" or _linux_dist_arch == "x64"
 
-- set_fact: 
+- ansible.builtin.set_fact: 
      _linux_installer_arch: "x86"
   when: _linux_dist_arch == "x86" or (_linux_dist_arch | regex_search('i[0-9]86'))
 
-- set_fact:
+- ansible.builtin.set_fact:
      _linux_installer_initrfsfile: "initramfs-lts"
      _linux_installer_kernelfile: "vmlinuz-lts"
 
 - name: download linux installer initrfs image file 
-  get_url:
+  ansible.builtin.get_url:
     url: "{{ '%s/v%s/releases/%s/netboot/%s' | format(linux_installer_home_mirror, linux_installer_version, _linux_installer_arch, _linux_installer_initrfsfile) }}"
     dest: "{{ '/tmp/%s' | format(_linux_installer_initrfsfile) }}"
 
 - name: download linux installer kernel file
-  get_url:
+  ansible.builtin.get_url:
     url: "{{ '%s/v%s/releases/%s/netboot/%s' | format(linux_installer_home_mirror, linux_installer_version, _linux_installer_arch, _linux_installer_kernelfile) }}"
     dest: "{{ '/tmp/%s_%s' | format(_linux_installer_kernelfile, _linux_dist_arch) }}"
 
 - name: merge linux installer initrfs image with installer image
-  shell: "{{ 'cat /tmp/%s %s >/tmp/linux_%s_%s.gz' | format(_linux_installer_initrfsfile, _linux_installer_image_file.path, linux_installer_distribution, _linux_dist_arch) }}"
+  ansible.builtin.shell: "{{ 'cat /tmp/%s %s >/tmp/linux_%s_%s.gz' | format(_linux_installer_initrfsfile, _linux_installer_image_file.path, linux_installer_distribution, _linux_dist_arch) }}"
 
 - name: save images for registration
-  set_fact:
+  ansible.builtin.set_fact:
      system_installer_images: >-
         {%- set retval = namespace(data = []) -%}
         {%- if system_installer_images is defined -%}

tasks/answerfile.yml

 
-- call_tasks:
+- sdm.oor.call_tasks:
     from: answerfile
     super: true
 
 - name: create answer file
-  template:
+  ansible.builtin.template:
     src: answerfile.j2
     dest: "{{ system_answerfile_path }}"
   delegate_to: "{{ system_answerfile_server }}"

tasks/buildinstaller.yml

 
 - name: create installer build root directory
-  tempfile:
+  ansible.builtin.tempfile:
     state: directory
   register: _linux_install_dir
 
 - name: publish installer build root
-  set_fact:
+  ansible.builtin.set_fact:
     linux_build_installer_root: "{{ _linux_install_dir.path }}"  
 
 - name: create installers directory layout
-  file:
+  ansible.builtin.file:
     path: "{{ '%s/%s' | format(linux_build_installer_root, _linux_dir) }}"
     state: directory
   loop:
@@ -22,13 +22,13 @@
     loop_var: _linux_dir
 
 - name: set installers module download path
-  template:
+  ansible.builtin.template:
     dest: "{{ '%s/etc/conf.d/modloop' | format(linux_build_installer_root) }}" 
     src: modloop.conf.j2
     mode: "0644"
 
 - name: set installer repositories
-  copy:
+  ansible.builtin.copy:
     dest: "{{ '%s/etc/apk/repositories' | format(linux_build_installer_root) }}" 
     content: |
        {{ '%s/v%s/main' | format(linux_installer_home_mirror, linux_installer_version) }}
@@ -36,35 +36,35 @@
     mode: "0644"
 
 - name: configure boot default services
-  copy:
+  ansible.builtin.copy:
     dest: "{{ '%s/etc/.default_boot_services' | format(linux_build_installer_root) }}"
     content: "boot_default_services"
  
 - name: install custom inittab
-  copy:
+  ansible.builtin.copy:
     src: inittab
     dest: "{{ '%s/etc/inittab' | format(linux_build_installer_root) }}" 
     mode: "0644"
 
 - name: install hostname script for udhcpc
-  copy:
+  ansible.builtin.copy:
     src: hostname
     dest: "{{ '%s/etc/udhcpc/post-bound/hostname' | format(linux_build_installer_root) }}" 
     mode: "0755"
 
 - name: install installer configuration
-  template:
+  ansible.builtin.template:
     src: installer.conf.j2
     dest: "{{ '%s/etc/installer.conf' | format(linux_build_installer_root) }}" 
     mode: "0644"
 
 - name: install ssh public key
-  copy:
+  ansible.builtin.copy:
     src: "{{ '%s/ansible.pub' | format(sdm_sshkeys) }}"
     dest: "{{ '%s/opt/ansible.pub' | format(linux_build_installer_root) }}"
 
 - name: install basic installer scripts
-  copy:
+  ansible.builtin.copy:
     src: "{{ _linux_install_file.name }}"
     dest: "{{ '%s/opt/%s' | format(linux_build_installer_root, _linux_install_file.name) }}"
     mode: "{{ _linux_install_file.mode }}"

tasks/configure.yml

 ---
 
-- call_tasks:
+- sdm.oor.call_tasks:
     from: configure
     super: true
 
 - name: install locale.gen file
-  template:
+  ansible.builtin.template:
     src: locale.gen.j2
     dest: "{{ '{}/locale.gen'.format(system_config_directory) }}"
     mode: 0644
 
 - name: activate '{{ locale | join(', ') }}'
-  command: locale-gen
+  ansible.builtin.command: locale-gen

tasks/finaliseinstaller.yml

 
 - name: create temporary root directory
-  tempfile:
+  ansible.builtin.tempfile:
     state: directory
   register: _linux_temporary_root_directory  
 
 - name: create target directory for compressed overlay filesystem
-  file:
+  ansible.builtin.file:
     path: "{{ '%s/%s' | format(_linux_temporary_root_directory.path, _linux_dir) }}"
     state: directory
   loop:
@@ -15,48 +15,48 @@
     loop_var: _linux_dir
 
 - name: set path to compressed overlay filesystem
-  copy:
+  ansible.builtin.copy:
     dest: "{{ '%s/tmp/apkovls' | format(_linux_temporary_root_directory.path) }}" 
     content: "/opt/ovl.tar.gz"
     mode: "0644"
 
 - name: compress overlay filesystem
-  archive:
+  community.general.archive:
     path: "{{ '%s/*' | format(linux_build_installer_root) }}"
     dest: "{{ '%s/opt/ovl.tar.gz'  | format(_linux_temporary_root_directory.path) }}"    
 
 - name: create temporary linux installer image name
-  tempfile:
+  ansible.builtin.tempfile:
     suffix: ".gz"
   register: _linux_installer_image_file
 
 - name: compress linux installer
-  shell: "{{ 'find * | cpio -o -H newc -R +0:+0 | gzip -2 > %s' | format(_linux_installer_image_file.path) }}"
+  ansible.builtin.shell: "{{ 'find * | cpio -o -H newc -R +0:+0 | gzip -2 > %s' | format(_linux_installer_image_file.path) }}"
   args:
     chdir: "{{ _linux_temporary_root_directory.path }}"
 
-- call_tasks:
+- sdm.oor.call_tasks:
      from: _mergeimages
   loop: "{{ system_supported_architectures[linux_installer_distribution] }}"   
   loop_control:      
     loop_var: _linux_dist_arch
 
-- call_tasks:
+- sdm.oor.call_tasks:
      from: installer
      super: true
 
 - name: cleanup temporary root directory
-  file:
+  ansible.builtin.file:
     path: "{{ _linux_temporary_root_directory }}"
     state: absent
 
 - name: cleanup installers build root directory
-  file:
+  ansible.builtin.file:
     path: "{{ linux_build_installer_root }}"
     state: absent
 
 - name: cleanup compressed linux installer image
-  file:
+  ansible.builtin.file:
     path: "{{ _linux_installer_image_file.path }}"
     state: absent
 

tasks/installer.yml

 
-- call_tasks: 
+- sdm.oor.call_tasks: 
     from: buildinstaller.yml
 
-- call_tasks: 
+- sdm.oor.call_tasks: 
     from: finaliseinstaller.yml

templates/answerfile.j2

@@ -29,7 +29,7 @@ export DISK_DEVICES
 {%   if ifdata.ipv4 is defined %}
 {%     if hostobj.network.classes[ifdata.class].dhcp is defined %}
 {%       if hostobj.network.classes[ifdata.class].dhcp.ipv4 is defined %}
-{%         if (ifdata.ipv4 | ip_in_range('%s-%s' | format(hostobj.network.classes[ifdata.class].dhcp.ipv4.from, hostobj.network.classes[ifdata.class].dhcp.ipv4.to))) == true and ifdata.static == False %}
+{%         if (ifdata.ipv4 | sdm.common.ip_in_range('%s-%s' | format(hostobj.network.classes[ifdata.class].dhcp.ipv4.from, hostobj.network.classes[ifdata.class].dhcp.ipv4.to))) == true and ifdata.static == False %}
 {%           set ifresdata.ipv4_address = "DHCP" %}
 {%         else %}
 {%           set ifresdata.ipv4_address = ifdata.ipv4 %}
@@ -50,7 +50,7 @@ export DISK_DEVICES
 {%   if ifdata.ipv6 is defined %}
 {%     if hostobj.network.classes[ifdata.class].dhcp is defined %}
 {%       if hostobj.network.classes[ifdata.class].dhcp.ipv6 is defined %}
-{%         if (ifdata.ipv6 | ip_in_range('%s-%s' | format(hostobj.network.classes[ifdata.class].dhcp.ipv6.from, hostobj.network.classes[ifdata.class].dhcp.ipv6.to))) == true and ifdata.static == False %}
+{%         if (ifdata.ipv6 | sdm.common.ip_in_range('%s-%s' | format(hostobj.network.classes[ifdata.class].dhcp.ipv6.from, hostobj.network.classes[ifdata.class].dhcp.ipv6.to))) == true and ifdata.static == False %}
 {%           set ifresdata.ipv6_address = "DHCP" %}
 {%         else %}
 {%           set ifresdata.ipv6_address = ifdata.ipv6 %}