playbook/ors: split ors playbook into ors and ors-image-backports

playbook/ors-image-backports.yml

+- name: a play that runs entirely on the ansible host
+  hosts: 127.0.0.1
+  connection: local
+
+  vars_files:
+    - settings/ors.yml
+
+  roles:
+    - ors-image-backports

playbook/ors.yml

@@ -13,4 +13,5 @@
     - settings/ors.yml
 
   roles:
+    - ors-image-backports
     - ors

playbook/ors_backport_after

+1696519344

playbook/roles/ors-image-backports/files/configure-grub

+#!/bin/bash
+CONF="/etc/default/grub"
+BAK="/tmp/default.grub"
+N_CORE="$(($(lscpu | sed -n 's/^Core.*: *\([0-9]*\)/\1/gp') * $(lscpu | sed -n 's/^Socket.*: *\([0-9]*\)/\1/gp')))"
+cp $CONF $BAK;
+if ! (grep -q idle=halt /proc/cmdline && grep -q "maxcpus=$N_CORE" /proc/cmdline); then
+  sed -i 's/^\(GRUB_CMDLINE_LINUX_DEFAULT.*\)idle=[a-z]* *\(.*\)/\1\2/g' $CONF;
+  sed -i 's/^\(GRUB_CMDLINE_LINUX_DEFAULT.*\)"/\1 idle=halt"/g' $CONF;
+  sed -i 's/^\(GRUB_CMDLINE_LINUX_DEFAULT.*\)maxcpus=[0-9]* *\(.*\)/\1\2/g' $CONF;
+  sed -i 's/^\(GRUB_CMDLINE_LINUX_DEFAULT.*\)"/\1 maxcpus='"$N_CORE"'"/g' $CONF;
+  if ! update-grub; then
+    cp $BAK $CONF;
+    update-grub;
+  fi
+fi
+rm -f $BAK;

playbook/roles/ors-image-backports/meta/main.yml

+---
+dependencies:
+  - { role: package, package_name: ifupdown, package_state: absent  }

playbook/roles/ors-image-backports/tasks/main.yml

@@ -62,6 +62,8 @@
   - name: Enable and stop systemd-networkd
     systemd: name=systemd-networkd.service enabled=yes state=stopped
 
+## Don't use role repository because package needs to be removed after installing systemd-networkd
+
   - name: Remove ifupdown
     shell: 'DEBIAN_FRONTEND="noninteractive" apt remove --purge -y ifupdown'
 

playbook/roles/ors/tasks/main.yml

@@ -3,34 +3,25 @@
   - name: Create /opt/upgrader where some logs will be stored
     file: path=/opt/upgrader state=directory mode=0755
 
-# Legacy
+# SSD image backports
 
-  - name: Remove obsolete cron
-    cron: name="Launch Upgrader with ansible" state=absent
+  - stat: path=/opt/upgrader/last-backport
+    register: last_backport
 
-  - name: Remove obsolete cron
-    cron: name="Launch Startup with ansible" state=absent
+  - stat: path=/opt/upgrader/playbook-tmp/ors_backport_after
+    register: ors_backport_after
 
-  - name: Remove obsolete cron
-    cron: name="Launch ors playbook periodically" state=absent
+  - shell: echo 1 > /opt/upgrader/last-backport
+    when: last_backport.stat.exists == False
 
-  - name: Remove obsolete cron
-    cron: name="Launch ors playbook at reboot" state=absent
+  - name: Do ors backport
+    shell: ansible-playbook ors-image-backports.yml -i hosts 2>>/opt/upgrader/ors_backport.log  >> /opt/upgrader/ors_backport.log
+    when: (ors_backport_after.stat.exists == True) and (lookup('file', '/opt/upgrader/playbook-tmp/ors_backport_after')|int > lookup('file', '/opt/upgrader/last-backport')|int )
+    args:
+      chdir: /opt/upgrader/playbook-tmp/
 
-  - name: Remove obsolete cron
-    cron: name="Launch ors playbook every 3 hours" state=absent
-
-  - name: Check if Service Exists
-    stat: path=/etc/init.d/init-sdr
-    register: init_sdr_service
-
-  - name: Reload daemon
-    systemd: daemon_reload=yes
-    when: init_sdr_service.stat.exists
-
-  - name: Disable old init-sdr service
-    systemd: name=init-sdr enabled=no
-    when: init_sdr_service.stat.exists
+  - shell: echo {{ ansible_date_time.epoch }} > /opt/upgrader/last-backport
+    when: (ors_backport_after.stat.exists == True) and (lookup('file', '/opt/upgrader/playbook-tmp/ors_backport_after')|int > lookup('file', '/opt/upgrader/last-backport')|int )
 
 # Radio Hardware
 
@@ -101,60 +92,12 @@
   - name: Configure firewall
     script: configure-firewall
 
-  - name: Configure /etc/systemd/network/dhcp.network
-    copy: src=systemd-dhcp-network dest=/etc/systemd/network/dhcp.network owner=root mode=644
-
-  - name: Create a directory if it does not exist
-    file: path=/etc/systemd/system/systemd-networkd-wait-online.service.d state=directory mode=0755
-
-  - name: Configure /etc/systemd/system/systemd-networkd-wait-online.service.d/override.conf
-    copy: src=systemd-wait-online-override dest=/etc/systemd/system/systemd-networkd-wait-online.service.d/override.conf owner=root mode=644
-
-  - name: Enable and stop systemd-networkd
-    systemd: name=systemd-networkd.service enabled=yes state=stopped
-
-  - name: Remove ifupdown
-    shell: 'DEBIAN_FRONTEND="noninteractive" apt remove --purge -y ifupdown'
-
-  - name: Start systemd-networkd
-    systemd: name=systemd-networkd.service enabled=yes state=started
-
-  - name: Configure dhcp timeout
-    lineinfile: dest=/etc/dhcp/dhclient.conf regexp="^timeout (.*)" line="timeout 15" state=present
-
   - name: Configure IPv4 forwarding
     lineinfile: dest=/etc/sysctl.conf regexp="^net.ipv4.conf.all.forwarding=(.*)" line="net.ipv4.conf.all.forwarding=1" state=present
 
   - name: Configure IPv6 forwarding
     lineinfile: dest=/etc/sysctl.conf regexp="^net.ipv6.conf.all.forwarding=(.*)" line="net.ipv6.conf.all.forwarding=1" state=present
 
-  - name: Disable dnsmasq service
-    systemd: name=dnsmasq.service enabled=no state=stopped
-    ignore_errors: yes
-
-  - name: Disable DNS stub resolver
-    lineinfile: dest=/etc/systemd/resolved.conf regexp="(.*)DNSStubListener=(.*)" line="DNSStubListener=no" state=present
-    register: disable_dns_stub
-
-  - name: Create resolv symbolic link
-    file:
-      src: /run/systemd/resolve/resolv.conf
-      dest: /etc/resolv.conf
-      state: link
-      force: true
-    register: create_resolv_link
-
-  - name: Configure default nameservers
-    lineinfile: dest=/etc/systemd/resolved.conf regexp="^DNS=(.*)" line="DNS=1.1.1.1 8.8.8.8" state=present
-    register: configure_default_nameservers
-
-  - name: Restart systemd-resolved.service if necessary
-    systemd: name=systemd-resolved.service enabled=yes state=restarted
-    when: (disable_dns_stub.changed) or (create_resolv_link.changed) or (configure_default_nameservers.changed)
-
-  - name: Enable and start systemd-resolved.service
-    systemd: name=systemd-resolved.service enabled=yes state=started
-
   - name: Redirect 53 to 5353
     ansible.builtin.iptables:
       chain: PREROUTING

playbook/sha256sum

-3c460573540179069c4f2d86ca1159e0e7c2d18899e971e75613b5ffb65b4f5b  -
+30ce2169ae3dc5e2c28dc5ac409f53caa62144f209458aa2508339188d7f3510  -