From 68aeef8e00add1ba81ee61ccacdd2c1b16e44eb6 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Tue, 3 Sep 2019 12:48:12 +0200 Subject: [PATCH] Migrate building IPA to ironic-python-agent-builder We're switching the building process to a new project that is governed and supported by the ironic team. Change-Id: Ib05ccaaddad105c27024ca5ee4d8ca0a0452bddf --- heat_docker_agent/configure_container.sh | 1 + image-yaml/overcloud-images.yaml | 2 +- tripleo_common/image/image_builder.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/heat_docker_agent/configure_container.sh b/heat_docker_agent/configure_container.sh index ee56bd7bb..3eaa40ff9 100755 --- a/heat_docker_agent/configure_container.sh +++ b/heat_docker_agent/configure_container.sh @@ -48,6 +48,7 @@ yum install -y \ initscripts \ jq \ puppet-tripleo \ + openstack-ironic-python-agent-builder \ openstack-tripleo-image-elements \ openstack-tripleo-puppet-elements \ openvswitch \ diff --git a/image-yaml/overcloud-images.yaml b/image-yaml/overcloud-images.yaml index 806ce569d..a5c394ab7 100644 --- a/image-yaml/overcloud-images.yaml +++ b/image-yaml/overcloud-images.yaml @@ -44,7 +44,7 @@ disk_images: # So we just override the extension instead imageext: initramfs elements: - - ironic-agent + - ironic-python-agent-ramdisk - ironic-agent-multipath - dynamic-login - element-manifest diff --git a/tripleo_common/image/image_builder.py b/tripleo_common/image/image_builder.py index 2a876534f..9c4d8cd25 100644 --- a/tripleo_common/image/image_builder.py +++ b/tripleo_common/image/image_builder.py @@ -82,6 +82,7 @@ class DibImageBuilder(ImageBuilder): env['ELEMENTS_PATH'] = os.pathsep.join([ "/usr/share/tripleo-puppet-elements", '/usr/share/tripleo-image-elements', + '/usr/share/ironic-python-agent-builder/dib', ]) os.environ.update(env)