Skip to content

Commit 559a08b

Browse files
committed
Remove default(omit) from Bifrost inventory template
The use of default(omit) is for module parameters, not templates. It will generate something like '__omit_place_holder__43ba6b6adb2908224e20a191174d53ef36403cfc'. Closes-Bug: #2045927 Depends-On: https://review.opendev.org/c/openstack/bifrost/+/953336 Change-Id: Ia614645d6b49f10a0c81ae0a0ab2398a9b56912c Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
1 parent 664e03d commit 559a08b

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

ansible/inventory/group_vars/all/bifrost

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ kolla_bifrost_deploy_image_filename: "deployment_image.qcow2"
6868
# UUID of the root filesystem contained within the deployment image.
6969
# See below URL for instructions on how to extract it:
7070
# https://docs.openstack.org/ironic/latest/admin/raid.html#image-requirements
71-
# Default is none.
72-
kolla_bifrost_deploy_image_rootfs:
71+
# Default is an empty string.
72+
kolla_bifrost_deploy_image_rootfs: ''
7373

7474
# Custom cloud-init user-data passed to deploy of the deployment image.
7575
# Default is an empty string.

ansible/kolla-bifrost-hostvars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
bifrost_hostvars:
2020
addressing_mode: static
2121
deploy_image_filename: "{{ kolla_bifrost_deploy_image_filename }}"
22-
deploy_image_rootfs: "{{ kolla_bifrost_deploy_image_rootfs | default(omit, true) }}"
22+
deploy_image_rootfs: "{{ kolla_bifrost_deploy_image_rootfs }}"
2323
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 %}"
2424
ipv4_address: "{{ admin_oc_net_name | net_ip }}"
2525
ipv4_subnet_mask: "{{ admin_oc_net_name | net_mask }}"

etc/kayobe/bifrost.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
# UUID of the root filesystem contained within the deployment image.
7070
# See below URL for instructions on how to extract it:
7171
# https://docs.openstack.org/ironic/latest/admin/raid.html#image-requirements
72-
# Default is none.
72+
# Default is an empty string.
7373
#kolla_bifrost_deploy_image_rootfs:
7474

7575
# Custom cloud-init user-data passed to deploy of the deployment image.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes issue when Bifrost hostvars file incorectly generated by Kayobe.
5+
`LP#2045927 <https://bugs.launchpad.net/kayobe/+bug/2045927>`__

0 commit comments

Comments
 (0)