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 <jslagle@redhat.com> Change-Id: I2703ec683a2fd5b965433cd453af3a0d2357610d
This commit is contained in:
parent
a7b0b5e456
commit
abfedf303f
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue