openstack
/
bifrost
Code Issues Proposed changes

Merge "Change DIB role to default to Debian jessie"

This commit is contained in:
Jenkins 2015-12-03 01:23:49 +00:00 committed by Gerrit Code Review
parent f125922405 de7a20c8c5
commit 17d65108ea
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.rst
View File

@ -427,8 +427,11 @@ Custom IPA images
Bifrost supports the ability for a user to build a custom IPA ramdisk
utilizing the diskimage-builder element "ironic-agent". In order to utilize
this feature, the ``download_ipa`` setting must be set to ``false`` and the
create_ipa_image must be set to "true". By default, the playbook will build
a Debian based IPA image, if a pre-existing IPA image is not present on disk.
create_ipa_image must be set to "true". By default, the install playbook will
build a Debian jessie based IPA image, if a pre-existing IPA image is not
present on disk. If you wish to explicitly set a specific release to be
passed to diskimage-create, then the setting ``dib_os_release`` can be set in
addition to ``dib_os_element``.
If you wish to include an extra element into the IPA disk image, such as a
custom hardware manager, you can pass the variable ``ipa_extra_dib_elements``

4
playbooks/roles/bifrost-create-dib-image/tasks/main.yml
View File

@ -104,6 +104,10 @@
set_fact:
dib_packages_arg: "-p {{dib_packages}}"
when: dib_packages is defined and dib_packages != ""
- name: "Set default of Debian Jessie if building debian and not explicitly set, overwride with dib_os_release setting"
set_fact:
dib_os_release: "jessie"
when: dib_os_element == "debian" and dib_os_release is undefined
- name: "Set the DIB_RELEASE environment variable if set"
set_fact:
dib_env_vars: "{{dib_env_vars | combine({'DIB_RELEASE':dib_os_release}) }}"