Merge "Change dib element to enable serial console"

This commit is contained in:
Jenkins 2017-03-20 13:42:13 +00:00 committed by Gerrit Code Review
commit 30ab6dd568
2 changed files with 2 additions and 2 deletions

View File

@ -39,7 +39,7 @@ dib_os_element: "ubuntu"
dib_elements is a space-separated list of elements that will be dib_elements is a space-separated list of elements that will be
added to the resulting disk image. added to the resulting disk image.
dib_elements: "vm serial-console" dib_elements: "vm enable-serial-console"
dib_init_element is used to set the init tool that will be used to provision dib_init_element is used to set the init tool that will be used to provision
the installed OS. This is an argument that is passed to the installed OS. This is an argument that is passed to

View File

@ -77,7 +77,7 @@
# do not support ramdisk-image-create as they invoke steps to cleanup # do not support ramdisk-image-create as they invoke steps to cleanup
# the ramdisk which causes ramdisk-image-create to believe it failed. # the ramdisk which causes ramdisk-image-create to believe it failed.
- { role: bifrost-create-dib-image, dib_imagename: "{{ http_boot_folder }}/ipa", build_ramdisk: false, dib_os_element: "{{ ipa_dib_os_element|default('debian') }}", dib_os_release: "jessie", dib_elements: "ironic-agent {{ ipa_extra_dib_elements | default('') }}", when: create_ipa_image | bool == true } - { role: bifrost-create-dib-image, dib_imagename: "{{ http_boot_folder }}/ipa", build_ramdisk: false, dib_os_element: "{{ ipa_dib_os_element|default('debian') }}", dib_os_release: "jessie", dib_elements: "ironic-agent {{ ipa_extra_dib_elements | default('') }}", when: create_ipa_image | bool == true }
- { role: bifrost-create-dib-image, dib_imagetype: "qcow2", dib_imagename: "{{deploy_image}}", dib_os_element: "debian", dib_os_release: "jessie", dib_elements: "vm serial-console 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_imagetype: "qcow2", dib_imagename: "{{deploy_image}}", dib_os_element: "debian", dib_os_release: "jessie", dib_elements: "vm enable-serial-console simple-init {{ extra_dib_elements|default('') }}", when: create_image_via_dib | bool == true and transform_boot_image | bool == false }
- role: bifrost-keystone-client-config - role: bifrost-keystone-client-config
user: "{{ ansible_env.SUDO_USER }}" user: "{{ ansible_env.SUDO_USER }}"
clouds: clouds: