diff --git a/playbooks/install.yaml b/playbooks/install.yaml index 691f213da..a3bcd3b6e 100644 --- a/playbooks/install.yaml +++ b/playbooks/install.yaml @@ -37,9 +37,7 @@ enable-serial-console {{ dib_init_element|default('simple-init') }} {{ extra_dib_elements|default('') }} - when: - - create_image_via_dib | bool - - not transform_boot_image | bool + when: create_image_via_dib | bool environment: http_proxy: "{{ lookup('env','http_proxy') }}" https_proxy: "{{ lookup('env','https_proxy') }}" diff --git a/playbooks/inventory/group_vars/localhost b/playbooks/inventory/group_vars/localhost index 6cfa2c9a3..546432503 100644 --- a/playbooks/inventory/group_vars/localhost +++ b/playbooks/inventory/group_vars/localhost @@ -54,11 +54,6 @@ mysql_password: create_image_via_dib: true dib_image_type: vm -# Transform boot image is intended for use with the Ubuntu trusty image. -# It makes the image bootable by installing Grub. -# Setting to prepend a partition image with a boot sector and partition table. -transform_boot_image: false - # Create IPA image instead of downloading an pre-made IPA image. create_ipa_image: false diff --git a/playbooks/inventory/group_vars/target b/playbooks/inventory/group_vars/target index 6cfa2c9a3..546432503 100644 --- a/playbooks/inventory/group_vars/target +++ b/playbooks/inventory/group_vars/target @@ -54,11 +54,6 @@ mysql_password: create_image_via_dib: true dib_image_type: vm -# Transform boot image is intended for use with the Ubuntu trusty image. -# It makes the image bootable by installing Grub. -# Setting to prepend a partition image with a boot sector and partition table. -transform_boot_image: false - # Create IPA image instead of downloading an pre-made IPA image. create_ipa_image: false diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml index 091541d54..529f58f06 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml @@ -24,8 +24,6 @@ create_image_via_dib: true dib_image_type: vm # Setting to install diskimage-builder install_dib: "{{ create_image_via_dib }}" -# Setting to prepend a partition image with a boot sector and partition table. -transform_boot_image: false # If testing is true, then the environment is setup for using libvirt # virtual machines for the hardware instead of real hardware. testing: false diff --git a/playbooks/test-bifrost.yaml b/playbooks/test-bifrost.yaml index c8bb2d358..8b03ed890 100644 --- a/playbooks/test-bifrost.yaml +++ b/playbooks/test-bifrost.yaml @@ -66,7 +66,7 @@ dib_os_element: "debian" dib_os_release: "buster" dib_elements: "vm enable-serial-console simple-init {{ extra_dib_elements|default('') }}" - when: create_image_via_dib | bool and not transform_boot_image | bool + when: create_image_via_dib | bool - role: bifrost-keystone-client-config user: "{{ ansible_env.SUDO_USER | default(ansible_user_id) }}" clouds: diff --git a/releasenotes/notes/transform_boot_image-16fe26bd1a849aa0.yaml b/releasenotes/notes/transform_boot_image-16fe26bd1a849aa0.yaml new file mode 100644 index 000000000..cca65151b --- /dev/null +++ b/releasenotes/notes/transform_boot_image-16fe26bd1a849aa0.yaml @@ -0,0 +1,3 @@ +other: + - | + Removes the no longer used ``transform_boot_image`` variable.