From: David Galloway <dgallowa@redhat.com>
Date: Tue, 5 Dec 2017 20:00:08 +0000 (-0500)
Subject: cobbler_systems: Allow setting post install kernel options
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f26a95504fdee97ed4e82cebba530fe3723e0bde;p=ceph-cm-ansible.git

cobbler_systems: Allow setting post install kernel options

If defined in group_vars, kernel_options_post will be used.  Otherwise,
it defaults to the kernel_options_post in defaults/main.yml.

This fixes serial output during firstboot in Xenial or later (instead of
the repeated "Ubuntu 16.04 [-1;-1f" garbage.

Running `cobbler system edit` with --kopts-post="" is fine.  It just
leaves that field blank if kernel_options_post is empty.

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/roles/cobbler_systems/tasks/populate_systems.yml b/roles/cobbler_systems/tasks/populate_systems.yml
index b366206..4c64090 100644
--- a/roles/cobbler_systems/tasks/populate_systems.yml
+++ b/roles/cobbler_systems/tasks/populate_systems.yml
@@ -23,5 +23,5 @@
       "{{ 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) }}" --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="{{ 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) }}
   with_items: "{{ cobbler_systems_update }}"