openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Fix overcloud image upload for containerized UC 

Use overcloud image upload --http-boot only for containerized
undercloud.

Until we figure out a better way of managing http-boot argument when
preparing the image, let's add a conditional so we only use it for a
containerized undercloud and not for the OVB jobs which seems to not
work as of today.

Change-Id: I52cdcabc420276d05827e361d4189522fed57176
Related-Bug: #1748921
Closes-Bug: #1669186
Co-authored-by: Emilien Macchi <emilien@redhat.com>
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
This commit is contained in:
Emilien Macchi 2018-02-12 09:13:21 -08:00 committed by Bogdan Dobrelya
parent c85ac306e7
commit a72604a441
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
roles/overcloud-prep-images/templates/overcloud-prep-images.sh.j2
View File

@ -32,7 +32,16 @@ tar xvfp {{ overcloud_full_tar_name }}
## * Upload images to glance.
## ::
openstack overcloud image upload {% if bash_deploy_ramdisk|bool %}--old-deploy-image{% endif %} {% if whole_disk_images|bool %}--whole-disk{% endif %}
openstack overcloud image upload
{%- if containerized_undercloud|bool %}
--http-boot=/var/lib/ironic/httpboot
{%- endif %}
{%- if bash_deploy_ramdisk|bool %}
--old-deploy-image
{%- endif %}
{%- if whole_disk_images|bool %}
--whole-disk
{%- endif %}
{% endif %}
{% if step_glance_upload|bool %}