openstack
/
bifrost
Code Issues Proposed changes

Merge "Add variable for deploy image type"

This commit is contained in:
Zuul 2018-03-07 18:25:14 +00:00 committed by Gerrit Code Review
parent 829b4375af f86bbd4309
commit d4ccee0dec
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/install.yaml
View File

@ -23,7 +23,7 @@
config_region_name: "{{ keystone.bootstrap.region_name }}"
config_auth_url: "{{ keystone.bootstrap.public_url }}"
- { role: bifrost-create-dib-image, dib_imagename: "{{ http_boot_folder }}/ipa", build_ramdisk: false, dib_os_element: "{{ ipa_dib_os_element|default('debian') }}", dib_elements: "ironic-agent {{ ipa_extra_dib_elements | default('') }}", when: create_ipa_image | bool == true }
- { role: bifrost-create-dib-image, dib_imagename: "{{ deploy_image }}", dib_imagetype: "qcow2", dib_elements: "vm enable-serial-console {{ dib_init_element|default('simple-init') }} {{ extra_dib_elements|default('') }}", when: create_image_via_dib | bool == true and transform_boot_image | bool == false }
- { role: bifrost-create-dib-image, dib_imagename: "{{ deploy_image }}", dib_imagetype: "qcow2", dib_elements: "{{ dib_image_type|default('vm') }} enable-serial-console {{ dib_init_element|default('simple-init') }} {{ extra_dib_elements|default('') }}", when: create_image_via_dib | bool == true and transform_boot_image | bool == false }
environment:
http_proxy: "{{ lookup('env','http_proxy') }}"
https_proxy: "{{ lookup('env','https_proxy') }}"

1
playbooks/inventory/group_vars/localhost
View File

@ -52,6 +52,7 @@ mysql_password:
# Setting to utilize diskimage-builder to create a bootable image.
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.

1
playbooks/inventory/group_vars/target
View File

@ -52,6 +52,7 @@ mysql_password:
# Setting to utilize diskimage-builder to create a bootable image.
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.

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

@ -12,6 +12,7 @@ ironicinspectorclient_source_install: false
staging_drivers_source_install: false
# Setting to utilize diskimage-builder to create a bootable image.
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.