openstack/tripleo-common
Code Issues Proposed changes

Use the default ContainerImagePrepare if not provided

Browse Source 
Previously before we enabled ovn by default, you didn't actually have to
specify a ContainerImagePrepare statement for a basic deploy to work.
Now that we have enabled ovn by default, we need to properly evaluate
the environment to determine which neutron related containers will be
needed.

Change-Id: I2147dcbe1c0247c49f13dbe5538694124886041b
This commit is contained in:
Alex Schultz 2019-02-20 15:50:56 -07:00
parent 759e8d37db
commit 3208261450
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleo_common/image/kolla_builder.py
View File

@ -152,9 +152,11 @@ def container_images_prepare_multi(environment, roles_data, dry_run=False,
pd = environment.get('parameter_defaults', {}) pd = environment.get('parameter_defaults', {})
cip = pd.get('ContainerImagePrepare') cip = pd.get('ContainerImagePrepare')
# if user does not provide a ContainerImagePrepare, use the defaults.
if not cip: if not cip:
LOG.info(_("No ContainerImagePrepare parameter defined.")) LOG.info(_("No ContainerImagePrepare parameter defined. Using "
return "the defaults."))
cip = CONTAINER_IMAGE_PREPARE_PARAM
mirrors = {} mirrors = {}
mirror = pd.get('DockerRegistryMirror') mirror = pd.get('DockerRegistryMirror')