From 5ef557ad8f77085c8c36d1ead7e3dee20c344926 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Sun, 21 Aug 2022 22:05:58 -0400 Subject: [PATCH] cobbler: Define kernel options flag based on version Cobbler2: --kopts Cobbler3: --kernel-options Signed-off-by: David Galloway --- roles/cobbler/defaults/main.yml | 2 ++ roles/cobbler/vars/dnf_systems.yml | 2 ++ roles/cobbler_profile/tasks/update_kernel_options.yml | 2 +- roles/cobbler_profile/tasks/update_kernel_options_post.yml | 2 +- roles/cobbler_systems/tasks/populate_systems.yml | 4 ++-- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml index bbeb900..1668093 100644 --- a/roles/cobbler/defaults/main.yml +++ b/roles/cobbler/defaults/main.yml @@ -78,3 +78,5 @@ pip_packages: - ansible cobbler_settings_file: /etc/cobbler/settings + +kopts_flag: "--kopts" diff --git a/roles/cobbler/vars/dnf_systems.yml b/roles/cobbler/vars/dnf_systems.yml index 73601f1..d33cd05 100644 --- a/roles/cobbler/vars/dnf_systems.yml +++ b/roles/cobbler/vars/dnf_systems.yml @@ -25,3 +25,5 @@ settings: value: 1 cobbler_settings_file: /etc/cobbler/settings.yaml + +kopts_flag: "--kernel-options" diff --git a/roles/cobbler_profile/tasks/update_kernel_options.yml b/roles/cobbler_profile/tasks/update_kernel_options.yml index 37914e8..9cdb1c0 100644 --- a/roles/cobbler_profile/tasks/update_kernel_options.yml +++ b/roles/cobbler_profile/tasks/update_kernel_options.yml @@ -11,5 +11,5 @@ # This task is not idempotent because of the reason mentioned above. - name: "Set the profile's kernel_options" - command: cobbler profile edit --name={{ distro_name }} --kopts='{{ distro.kernel_options }}' + command: cobbler profile edit --name={{ distro_name }} "{{ kopts_flag }}"='{{ distro.kernel_options }}' when: kernel_options.stdout.strip() != distro.kernel_options diff --git a/roles/cobbler_profile/tasks/update_kernel_options_post.yml b/roles/cobbler_profile/tasks/update_kernel_options_post.yml index ede37d2..c7d593c 100644 --- a/roles/cobbler_profile/tasks/update_kernel_options_post.yml +++ b/roles/cobbler_profile/tasks/update_kernel_options_post.yml @@ -5,5 +5,5 @@ register: kernel_options_post - name: "Set the profile's kernel_options_post if needed." - command: cobbler profile edit --name={{ distro_name }} --kopts-post='{{ distro.kernel_options_post }}' + command: cobbler profile edit --name={{ distro_name }} "{{ kopts_flag }}"-post='{{ distro.kernel_options_post }}' when: kernel_options_post.stdout.strip() != distro.kernel_options_post diff --git a/roles/cobbler_systems/tasks/populate_systems.yml b/roles/cobbler_systems/tasks/populate_systems.yml index 2a5bfb4..c91d52b 100644 --- a/roles/cobbler_systems/tasks/populate_systems.yml +++ b/roles/cobbler_systems/tasks/populate_systems.yml @@ -14,7 +14,7 @@ "{{ groups.cobbler_managed | difference(cobbler_systems_current) }}" - name: Add missing systems to cobbler - command: cobbler system add --name={{ item.split('.')[0] }} --profile={{ default_profile }} --mac={{ hostvars[item].mac }} --ip-address={{ hostvars[item].ip }} --interface={{ hostvars[item].interface|default(interface) }} --hostname={{ item.split('.')[0] }}.{{ lab_domain }} --kopts="{{ hostvars[item].kernel_options|default(kernel_options) }}" --ksmeta="{{ hostvars[item].kickstart_metadata|default(kickstart_metadata) }}" --power-type={{ hostvars[item].power_type|default(power_type) }} --power-address={{ item.split('.')[0] }}.{{ ipmi_domain }} --power-user={{ hostvars[item].power_user|default(power_user) }} --power-pass={{ hostvars[item].power_pass|default(power_pass) }} --netboot-enabled false + command: cobbler system add --name={{ item.split('.')[0] }} --profile={{ default_profile }} --mac={{ hostvars[item].mac }} --ip-address={{ hostvars[item].ip }} --interface={{ hostvars[item].interface|default(interface) }} --hostname={{ item.split('.')[0] }}.{{ lab_domain }} "{{ kopts_flag }}"="{{ hostvars[item].kernel_options|default(kernel_options) }}" --ksmeta="{{ hostvars[item].kickstart_metadata|default(kickstart_metadata) }}" --power-type={{ hostvars[item].power_type|default(power_type) }} --power-address={{ item.split('.')[0] }}.{{ ipmi_domain }} --power-user={{ hostvars[item].power_user|default(power_user) }} --power-pass={{ hostvars[item].power_pass|default(power_pass) }} --netboot-enabled false with_items: "{{ cobbler_systems_add }}" when: - hostvars[item].mac is defined @@ -26,7 +26,7 @@ "{{ groups.cobbler_managed | intersect(cobbler_systems_current) }}" - name: Update existing systems in cobbler - command: cobbler system edit --name={{ item.split('.')[0] }} --mac={{ hostvars[item].mac }} --ip-address={{ hostvars[item].ip }} --interface={{ hostvars[item].interface|default(interface) }} --hostname={{ item.split('.')[0] }}.{{ lab_domain }} --kopts="{{ hostvars[item].kernel_options|default(kernel_options) }}" --kopts-post="{{ hostvars[item].kernel_options_post|default(kernel_options_post) }}" --ksmeta="{{ hostvars[item].kickstart_metadata|default(kickstart_metadata) }}" --power-type={{ hostvars[item].power_type|default(power_type) }} --power-address={{ item.split('.')[0] }}.{{ ipmi_domain }} --power-user={{ hostvars[item].power_user|default(power_user) }} --power-pass={{ hostvars[item].power_pass|default(power_pass) }} + command: cobbler system edit --name={{ item.split('.')[0] }} --mac={{ hostvars[item].mac }} --ip-address={{ hostvars[item].ip }} --interface={{ hostvars[item].interface|default(interface) }} --hostname={{ item.split('.')[0] }}.{{ lab_domain }} "{{ kopts_flag }}"="{{ hostvars[item].kernel_options|default(kernel_options) }}" "{{ kopts_flag }}"-post="{{ hostvars[item].kernel_options_post|default(kernel_options_post) }}" --ksmeta="{{ hostvars[item].kickstart_metadata|default(kickstart_metadata) }}" --power-type={{ hostvars[item].power_type|default(power_type) }} --power-address={{ item.split('.')[0] }}.{{ ipmi_domain }} --power-user={{ hostvars[item].power_user|default(power_user) }} --power-pass={{ hostvars[item].power_pass|default(power_pass) }} with_items: "{{ cobbler_systems_update }}" when: - hostvars[item].mac is defined -- 2.39.5