Add new module to configure global kernel parameters

Signed-off-by: Fernando <fernando.alcocer.ochoa@ibm.com>

diff --git a/roles/maas/defaults/main.yml b/roles/maas/defaults/main.yml
index 882abf2def9fab9739f7fa2cb57ce696f478d6b0..4d899c7162b54d86563209e7f64143c65be09989 100644 (file)
--- a/roles/maas/defaults/main.yml
+++ b/roles/maas/defaults/main.yml
@@ -9,6 +9,7 @@ postgres_version: "16"
 maas_version: "3.6"
 maas_install_method: "apt"
 maas_home_dir: "/home/ubuntu/maas"
+global_kernel_opt: "console=tty0 console=ttyS1,115200"
 
 # DNS variables
 default_domains:

diff --git a/roles/maas/tasks/config_maas.yml b/roles/maas/tasks/config_maas.yml
index 877ae658b07676c9d737217b1b6cfbb590235a9e..4ef2fbbb30db560a530bf8b2988dab6fa7a20ed8 100644 (file)
--- a/roles/maas/tasks/config_maas.yml
+++ b/roles/maas/tasks/config_maas.yml
@@ -65,10 +65,14 @@
       ansible.builtin.blockinfile:
         path: "{{ curtin_userdata_path.stdout if maas_install_method == 'snap' else '/etc/maas/preseeds/curtin_userdata' }}"
         insertafter: EOF
-        block: |
-          90_create_cm_user: ["curtin", "in-target", "--", "sh", "-c", "useradd {{ cm_user }} -m -s /bin/bash -g sudo"]
-          92_delete_cm_pass: ["curtin", "in-target", "--", "sh", "-c", "passwd -d cm"]
-          94_configure_sudo: ["curtin", "in-target", "--", "sh", "-c", "printf '%%sudo ALL=(ALL) NOPASSWD: ALL\nDefaults !requiretty\nDefaults visiblepw' >> /etc/sudoers.d/cephlab_sudo"]
-          96_create_ssh_directory: ["curtin", "in-target", "--", "sh", "-c", "mkdir -p /home/cm/.ssh"]
-          98_copy_ssh_keys_cm: ["curtin", "in-target", "--", "sh", "-c", "echo '{{ cm_user_ssh_keys|join('\n') }}' >> /home/cm/.ssh/authorized_keys"]
+        block: |2
+            90_create_cm_user: ["curtin", "in-target", "--", "sh", "-c", "useradd {{ cm_user }} -m -s /bin/bash -g sudo"]
+            92_delete_cm_pass: ["curtin", "in-target", "--", "sh", "-c", "passwd -d cm"]
+            94_configure_sudo: ["curtin", "in-target", "--", "sh", "-c", "printf '%%sudo ALL=(ALL) NOPASSWD: ALL\nDefaults !requiretty\nDefaults visiblepw' >> /etc/sudoers.d/cephlab_sudo"]
+            96_create_ssh_directory: ["curtin", "in-target", "--", "sh", "-c", "mkdir -p /home/cm/.ssh"]
+            98_copy_ssh_keys_cm: ["curtin", "in-target", "--", "sh", "-c", "echo '{{ cm_user_ssh_keys|join('\n') }}' >> /home/cm/.ssh/authorized_keys"]
       when: "cm_user_ssh_keys is defined and cm_user is defined"
+
+    - name: Configure global kernel options
+      command: "maas {{ maas_admin_username }} maas set-config name=kernel_opts value='{{ global_kernel_opt }}'"
+      when: "global_kernel_opt is defined"

diff --git a/roles/maas/tasks/main.yml b/roles/maas/tasks/main.yml
index b5c75eb172e2f844b2aad675e449ac27e1794161..567ec0b5e5eb1bdb4fe89e45e1f928fa270b832a 100644 (file)
--- a/roles/maas/tasks/main.yml
+++ b/roles/maas/tasks/main.yml
@@ -49,15 +49,13 @@
 
 - import_tasks: initialize_secondary_rack.yml
 
-# Configure MAAS
-- import_tasks: config_maas.yml
-
 # Logging into the MAAS API to use CLI
 - name: Get API key
   command: maas apikey --username={{ maas_admin_username }}
   when: inventory_hostname in groups['maas_region_rack_server']
   tags:
   - config_dhcp
+  - config_maas
   - add_machines
   - config_dns
   - config_ntp
@@ -69,11 +67,15 @@
   when: inventory_hostname in groups['maas_region_rack_server']
   tags:
   - config_dhcp
+  - config_maas
   - add_machines
   - config_dns
   - config_ntp
   - add_users  
 
+# Configure MAAS
+- import_tasks: config_maas.yml
+
 # Configure NTP Service
 - import_tasks: config_ntp.yml
 
@@ -102,6 +104,7 @@
   command: "maas logout {{ maas_admin_username }}"
   tags:
   - config_dhcp
+  - config_maas
   - add_machines
   - config_dns
   - config_ntp