Merge "Remove default(omit) from Bifrost inventory template"

Author: Zuul

ansible/inventory/group_vars/all/bifrost

@@ -68,8 +68,8 @@ kolla_bifrost_deploy_image_filename: "deployment_image.qcow2"
 # UUID of the root filesystem contained within the deployment image.
 # See below URL for instructions on how to extract it:
 # https://docs.openstack.org/ironic/latest/admin/raid.html#image-requirements
-# Default is none.
-kolla_bifrost_deploy_image_rootfs:
+# Default is an empty string.
+kolla_bifrost_deploy_image_rootfs: ''
 
 # Custom cloud-init user-data passed to deploy of the deployment image.
 # Default is an empty string.

ansible/kolla-bifrost-hostvars.yml

@@ -19,7 +19,7 @@
     bifrost_hostvars:
       addressing_mode: static
       deploy_image_filename: "{{ kolla_bifrost_deploy_image_filename }}"
-      deploy_image_rootfs: "{{ kolla_bifrost_deploy_image_rootfs | default(omit, true) }}"
+      deploy_image_rootfs: "{{ kolla_bifrost_deploy_image_rootfs }}"
       ipv4_interface_mac: "{% if kolla_bifrost_ipv4_interface_mac is defined %}{{ kolla_bifrost_ipv4_interface_mac }}{% else %}{% raw %}{{ extra.pxe_interface_mac | default }}{% endraw %}{% endif %}"
       ipv4_address: "{{ admin_oc_net_name | net_ip }}"
       ipv4_subnet_mask: "{{ admin_oc_net_name | net_mask }}"

etc/kayobe/bifrost.yml

@@ -69,7 +69,7 @@
 # UUID of the root filesystem contained within the deployment image.
 # See below URL for instructions on how to extract it:
 # https://docs.openstack.org/ironic/latest/admin/raid.html#image-requirements
-# Default is none.
+# Default is an empty string.
 #kolla_bifrost_deploy_image_rootfs:
 
 # Custom cloud-init user-data passed to deploy of the deployment image.

releasenotes/notes/fix-bifrost-invenory-05f8a92915998f09.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes issue when Bifrost hostvars file incorectly generated by Kayobe.
+    `LP#2045927 <https://bugs.launchpad.net/kayobe/+bug/2045927>`__