openstack/python-tripleoclient
Code Issues Proposed changes

Update default images for "tripleo launch heat"

Browse Source 
Currently we have different defaults for `--heat-container-api-image`
and  `--heat-container-engine-image` in "openstack overcloud deploy"
vs "openstack tripleo launch heat" command.

Updating these defaults to be in sync with
"openstack overcloud deploy"[1]

[1] https://opendev.org/openstack/python-tripleoclient/src/branch/master/tripleoclient/v1/overcloud_deploy.py#L972-L990

Change-Id: Ibb8da41d9c916b794c148cbebe648b9c05c54a0a
(cherry picked from commit 3652fb4174)
This commit is contained in:
Sandeep Yadav
2021-08-27 19:49:20 +05:30
parent e21af29b8e
commit 3351ef1c71
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tripleoclient/v1/tripleo_launch_heat.py
View File

@@ -21,9 +21,9 @@ import os
from cliff import command
from osc_lib.i18n import _
from tripleoclient.constants import (DEFAULT_HEAT_CONTAINER,
DEFAULT_HEAT_API_CONTAINER,
DEFAULT_HEAT_ENGINE_CONTAINER)
from tripleoclient.constants import (DEFAULT_EPHEMERAL_HEAT_CONTAINER,
DEFAULT_EPHEMERAL_HEAT_API_CONTAINER,
DEFAULT_EPHEMERAL_HEAT_ENGINE_CONTAINER)
from tripleoclient import exceptions
from tripleoclient import utils
@@ -88,27 +88,30 @@ class LaunchHeat(command.Command):
parser.add_argument(
'--heat-container-image', metavar='<HEAT_CONTAINER_IMAGE>',
dest='heat_container_image',
default=DEFAULT_HEAT_CONTAINER,
default=DEFAULT_EPHEMERAL_HEAT_CONTAINER,
help=_('The container image to use when launching the heat-all '
'process. Defaults to: {}'.format(DEFAULT_HEAT_CONTAINER))
'process. Defaults to: {}'.format(
DEFAULT_EPHEMERAL_HEAT_CONTAINER))
)
parser.add_argument(
'--heat-container-api-image',
metavar='<HEAT_CONTAINER_API_IMAGE>',
dest='heat_container_api_image',
default=DEFAULT_HEAT_API_CONTAINER,
default=DEFAULT_EPHEMERAL_HEAT_API_CONTAINER,
help=_('The container image to use when launching the heat-api '
'process. Only used when --heat-type=pod. '
'Defaults to: {}'.format(DEFAULT_HEAT_API_CONTAINER))
'Defaults to: {}'.format(
DEFAULT_EPHEMERAL_HEAT_API_CONTAINER))
)
parser.add_argument(
'--heat-container-engine-image',
metavar='<HEAT_CONTAINER_ENGINE_IMAGE>',
dest='heat_container_engine_image',
default=DEFAULT_HEAT_ENGINE_CONTAINER,
default=DEFAULT_EPHEMERAL_HEAT_ENGINE_CONTAINER,
help=_('The container image to use when launching the heat-engine '
'process. Only used when --heat-type=pod. '
'Defaults to: {}'.format(DEFAULT_HEAT_ENGINE_CONTAINER))
'Defaults to: {}'.format(
DEFAULT_EPHEMERAL_HEAT_ENGINE_CONTAINER))
)
parser.add_argument(
'--kill', '-k',