openstack/bifrost
Code Issues Proposed changes

Merge "Add an option to use pre-built DIB images"

Browse Source
This commit is contained in:
Zuul 2020-06-11 09:12:09 +00:00 committed by Gerrit Code Review
commit 101e14e573
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
playbooks/roles/bifrost-ironic-install/defaults/main.yml
View File

@ -54,6 +54,7 @@ ans_network_interface: "{{ network_interface | replace('-', '_') }}"
ipa_file_protocol: "http" ipa_file_protocol: "http"
ipa_upstream_release: "master" ipa_upstream_release: "master"
use_tinyipa: true
enable_uefi_ipxe: true enable_uefi_ipxe: true
ipxe_efi_binary: ipxe.efi ipxe_efi_binary: ipxe.efi
@ -61,11 +62,25 @@ ipxe_efi_binary: ipxe.efi
ipa_kernel: "{{http_boot_folder}}/ipa.kernel" ipa_kernel: "{{http_boot_folder}}/ipa.kernel"
ipa_ramdisk: "{{http_boot_folder}}/ipa.initramfs" ipa_ramdisk: "{{http_boot_folder}}/ipa.initramfs"
ipa_kernel_url: "{{ ipa_file_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{file_url_port}}/ipa.kernel" ipa_kernel_url: "{{ ipa_file_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{file_url_port}}/ipa.kernel"
ipa_kernel_upstream_url: "https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa-{{ ipa_upstream_release }}.vmlinuz" ipa_kernel_upstream_url: >-
{%- if use_tinyipa | bool -%}
https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa-{{ ipa_upstream_release }}.vmlinuz
{%- elif ipa_upstream_release == "stable-train" -%}
https://tarballs.openstack.org/ironic-python-agent/dib/files/ipa-centos7-{{ ipa_upstream_release }}.kernel
{%- else -%}
https://tarballs.openstack.org/ironic-python-agent/dib/files/ipa-centos8-{{ ipa_upstream_release }}.kernel
{%- endif -%}
ipa_kernel_upstream_checksum_algo: "sha256" ipa_kernel_upstream_checksum_algo: "sha256"
ipa_kernel_upstream_checksum_url: "{{ ipa_kernel_upstream_url }}.{{ ipa_kernel_upstream_checksum_algo }}" ipa_kernel_upstream_checksum_url: "{{ ipa_kernel_upstream_url }}.{{ ipa_kernel_upstream_checksum_algo }}"
ipa_ramdisk_url: "{{ ipa_file_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{file_url_port}}/ipa.initramfs" ipa_ramdisk_url: "{{ ipa_file_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{file_url_port}}/ipa.initramfs"
ipa_ramdisk_upstream_url: "https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa-{{ ipa_upstream_release }}.gz" ipa_ramdisk_upstream_url: >-
{%- if use_tinyipa | bool -%}
https://tarballs.openstack.org/ironic-python-agent/tinyipa/files/tinyipa-{{ ipa_upstream_release }}.gz
{%- elif ipa_upstream_release == "stable-train" -%}
https://tarballs.openstack.org/ironic-python-agent/dib/files/ipa-centos7-{{ ipa_upstream_release }}.initramfs
{%- else -%}
https://tarballs.openstack.org/ironic-python-agent/dib/files/ipa-centos8-{{ ipa_upstream_release }}.initramfs
{%- endif -%}
ipa_ramdisk_upstream_checksum_algo: "sha256" ipa_ramdisk_upstream_checksum_algo: "sha256"
ipa_ramdisk_upstream_checksum_url: "{{ ipa_ramdisk_upstream_url }}.{{ ipa_ramdisk_upstream_checksum_algo }}" ipa_ramdisk_upstream_checksum_url: "{{ ipa_ramdisk_upstream_url }}.{{ ipa_ramdisk_upstream_checksum_algo }}"
deploy_image_filename: "deployment_image.qcow2" deploy_image_filename: "deployment_image.qcow2"

6
releasenotes/notes/use-tinyipa-31f5343def1c0bf4.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
The new variable ``use_tinyipa`` (defaulting to ``true``) defines whether
to use the pre-built tinyIPA images or production-ready CentOS images
built with DIB.