From: Zack Cerza Date: Wed, 15 Jul 2015 17:07:54 +0000 (-0600) Subject: cobbler_systems: properly find defaults X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F77%2Fhead;p=ceph-cm-ansible.git cobbler_systems: properly find defaults For interface and kernel_options Signed-off-by: Zack Cerza --- diff --git a/roles/cobbler_systems/tasks/populate_systems.yml b/roles/cobbler_systems/tasks/populate_systems.yml index 59ddc894..64a894c3 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 }} --kopts="{{ hostvars[item].kernel_options }}" --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) }} --kopts="{{ hostvars[item].kernel_options|default(kernel_options) }}" --netboot-enabled false with_items: cobbler_systems_add - name: set cobbler_systems_update @@ -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 }} --kopts="{{ hostvars[item].kernel_options }}" + command: cobbler system edit --name={{ item.split('.')[0] }} --mac={{ hostvars[item].mac }} --ip-address={{ hostvars[item].ip }} --interface={{ hostvars[item].interface|default(interface) }} --kopts="{{ hostvars[item].kernel_options|default(kernel_options) }}" with_items: cobbler_systems_update