From f3fcdaf2cefee7544640d5388d7883f2ed63fa78 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Tue, 14 May 2019 14:19:15 +0200 Subject: [PATCH] Add curl to the default heat image curl was apparently forgotten in the refactor to have images built in zuul automatically. This is a problem, as the heat image is used in glance to fetch the CirrOS image, which would fail if curl is absent. Change-Id: Ia1a84766865ea5c4e4a26516c9e8faa2e0daf9b2 --- openstack/loci/build.sh | 3 +++ zuul.d/openstack-loci.yaml | 1 + 2 files changed, 4 insertions(+) diff --git a/openstack/loci/build.sh b/openstack/loci/build.sh index ceae3436..fc849ec3 100755 --- a/openstack/loci/build.sh +++ b/openstack/loci/build.sh @@ -181,6 +181,9 @@ keystone_profiles=${keystone_profiles:-"'fluent apache ldap'"} keystone_pip_packages=${keystone_pip_packages:-"'pycrypto python-openstackclient'"} heat_profiles=${heat_profiles:-"'fluent apache'"} heat_pip_packages=${heat_pip_packages:-"pycrypto"} +# Heat image is used as a helper, and needs curl for fetching images in glance +# for example +heat_dist_packages=${heat_dist_packages:-"curl"} barbican_profiles=${barbican_profiles:-"fluent"} barbican_pip_packages=${barbican_pip_packages:-"pycrypto"} glance_profiles=${glance_profiles:-"'fluent ceph'"} diff --git a/zuul.d/openstack-loci.yaml b/zuul.d/openstack-loci.yaml index c7fe91ae..d3fbe635 100644 --- a/zuul.d/openstack-loci.yaml +++ b/zuul.d/openstack-loci.yaml @@ -97,6 +97,7 @@ - "PROJECT_REF={{ branchname }}" - "PROFILES='fluent apache'" - "WHEELS='{{ wheels_location }}'" + - "DIST_PACKAGES='curl'" tags: *imagetag - &barbican_project context: "."