From 1549276b62ccae18eedc279301c9358595892a5c Mon Sep 17 00:00:00 2001 From: David Galloway Date: Sun, 21 Aug 2022 22:15:04 -0400 Subject: [PATCH] cobbler: Define autoinstall flag based on version Cobbler2: --kickstart Cobbler3: --autoinstall Signed-off-by: David Galloway --- roles/cobbler/defaults/main.yml | 2 ++ roles/cobbler/vars/dnf_systems.yml | 4 ++++ roles/cobbler_profile/tasks/update_kickstart.yml | 2 +- roles/cobbler_systems/tasks/populate_systems.yml | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml index 16680930..69001574 100644 --- a/roles/cobbler/defaults/main.yml +++ b/roles/cobbler/defaults/main.yml @@ -80,3 +80,5 @@ pip_packages: cobbler_settings_file: /etc/cobbler/settings kopts_flag: "--kopts" + +autoinstall_flag: "--kickstart" diff --git a/roles/cobbler/vars/dnf_systems.yml b/roles/cobbler/vars/dnf_systems.yml index d33cd057..b2305f05 100644 --- a/roles/cobbler/vars/dnf_systems.yml +++ b/roles/cobbler/vars/dnf_systems.yml @@ -27,3 +27,7 @@ settings: cobbler_settings_file: /etc/cobbler/settings.yaml kopts_flag: "--kernel-options" + +autoinstall_flag: "--autoinstall" + +autoinstall_meta_flag: "--autoinstall-meta" diff --git a/roles/cobbler_profile/tasks/update_kickstart.yml b/roles/cobbler_profile/tasks/update_kickstart.yml index 9ad469ad..c7fba924 100644 --- a/roles/cobbler_profile/tasks/update_kickstart.yml +++ b/roles/cobbler_profile/tasks/update_kickstart.yml @@ -10,6 +10,6 @@ register: kickstart - name: "Set the profile's kickstart" - command: cobbler profile edit --name={{ distro_name }} --kickstart={{ kickstart_path }} + command: cobbler profile edit --name={{ distro_name }} "{{ autoinstall_flag }}"={{ kickstart_path }} when: kickstart is defined and kickstart.stdout != kickstart_path diff --git a/roles/cobbler_systems/tasks/populate_systems.yml b/roles/cobbler_systems/tasks/populate_systems.yml index c91d52b3..c9ab934b 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_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 + 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) }}" "{{ autoinstall_meta_flag|default('--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_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) }} + 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) }}" "{{ autoinstall_meta_flag|default('--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.47.3