From a72604a4411c355f0c0e15e8b54044a55718b639 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 12 Feb 2018 09:13:21 -0800 Subject: [PATCH] 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 Signed-off-by: Bogdan Dobrelya --- .../templates/overcloud-prep-images.sh.j2 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/roles/overcloud-prep-images/templates/overcloud-prep-images.sh.j2 b/roles/overcloud-prep-images/templates/overcloud-prep-images.sh.j2 index c82058c5a..57422c3f2 100644 --- a/roles/overcloud-prep-images/templates/overcloud-prep-images.sh.j2 +++ b/roles/overcloud-prep-images/templates/overcloud-prep-images.sh.j2 @@ -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 %}