From abfedf303fba3f844b81cca8325900bd4fc32618 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Tue, 23 Mar 2021 18:12:17 -0400 Subject: [PATCH] Wire up --disable-container-prepare --disable-container-prepare was not being honored within overcloud deploy. Even though kolla_builder..container_images_prepare_multi is called with dry_run=True, it should still be skipped when --disable-container-prepare is passed. Signed-off-by: James Slagle Change-Id: I2703ec683a2fd5b965433cd453af3a0d2357610d --- tripleoclient/v1/overcloud_deploy.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index f09153a14..7e2d588e3 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -105,9 +105,11 @@ class DeployOvercloud(command.Command): cleanup=(not args.no_cleanup)) default_image_params = plan_utils.default_image_params() - image_params = kolla_builder.container_images_prepare_multi( - env, roles.get_roles_data(args.roles_file, - tht_root), dry_run=True) + image_params = {} + if not args.disable_container_prepare: + image_params = kolla_builder.container_images_prepare_multi( + env, roles.get_roles_data(args.roles_file, + tht_root), dry_run=True) if image_params: default_image_params.update(image_params) parameters.update(default_image_params)