openstack/python-tripleoclient
Code Issues Proposed changes

Update heat container location

Browse Source 
We recently renamed the container prefixes from centos-binary to
openstack. Additionally this moves the version information of this into
constants that can be updated in stable branches if needed.

Blueprint: bp/switch-to-heat-all-container
Change-Id: I208a6ae5b314e8482ca5fc8d3e5695dbd7da5f1b
This commit is contained in:
Alex Schultz 2020-10-13 14:41:07 -06:00
parent d2f665ef6c
commit 5f06f693aa
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tripleoclient/config/standalone.py
View File

@ -18,6 +18,7 @@ import copy
from osc_lib.i18n import _
from oslo_config import cfg
from tripleoclient.config.base import BaseConfig
from tripleoclient.constants import DEFAULT_HEAT_CONTAINER
NETCONFIG_TAGS_EXAMPLE = """
"network_config": [
@ -167,10 +168,16 @@ class StandaloneConfig(BaseConfig):
'binaries be installed locally on this machine.'
' This option is enabled by default which means'
' heat-all is executed on the host OS '
' directly.')),
' directly If this is set to false, a '
'containerized version of heat-all is used.')),
cfg.StrOpt('heat_container_image',
default='',
help=_('URL for the heat container image to use.')
help=_('Custom URL for the heat-all container image to '
'use as part of the undercloud deployment. If '
'not specified, the default "%s" is used. '
'If this location requires authentication, '
'run podman login prior to running the '
'undercloud install.' % DEFAULT_HEAT_CONTAINER)
),
cfg.StrOpt('container_images_file',
default='',

9
tripleoclient/constants.py
View File

@ -42,6 +42,15 @@ UNDERCLOUD_NETWORKS_FILE = "network_data_undercloud.yaml"
ANSIBLE_HOSTS_FILENAME = "hosts.yaml"
ANSIBLE_CWL = "tripleo_dense,tripleo_profile_tasks,tripleo_states"
CONTAINER_IMAGE_PREPARE_LOG_FILE = "container_image_prepare.log"
DEFAULT_CONTAINER_REGISTRY = "docker.io"
DEFAULT_CONTAINER_NAMESPACE = "tripleomaster"
DEFAULT_CONTAINER_TAG = "current-tripleo"
DEFAULT_HEAT_CONTAINER = ('{}/{}/openstack-heat-all:{}'.format(
DEFAULT_CONTAINER_REGISTRY,
DEFAULT_CONTAINER_NAMESPACE,
DEFAULT_CONTAINER_TAG))
# The name of the file which holds the plan environment contents
PLAN_ENVIRONMENT = 'plan-environment.yaml'
USER_ENVIRONMENT = 'user-environment.yaml'

6
tripleoclient/v1/tripleo_deploy.py
View File

@ -1016,10 +1016,10 @@ class Deploy(command.Command):
parser.add_argument(
'--heat-container-image', metavar='<HEAT_CONTAINER_IMAGE>',
dest='heat_container_image',
default='tripleomaster/centos-binary-heat-all:current-tripleo',
default=constants.DEFAULT_HEAT_CONTAINER,
help=_('The container image to use when launching the heat-all '
'process. Defaults to: '
'tripleomaster/centos-binary-heat-all:current-tripleo')
'process. Defaults to: {}'.format(
constants.DEFAULT_HEAT_CONTAINER))
)
parser.add_argument(
'--heat-native',

6
tripleoclient/v1/tripleo_launch_heat.py
View File

@ -21,6 +21,7 @@ import os
from cliff import command
from osc_lib.i18n import _
from tripleoclient.constants import DEFAULT_HEAT_CONTAINER
from tripleoclient import exceptions
from tripleoclient import heat_launcher
@ -94,10 +95,9 @@ class LaunchHeat(command.Command):
parser.add_argument(
'--heat-container-image', metavar='<HEAT_CONTAINER_IMAGE>',
dest='heat_container_image',
default='tripleomaster/centos-binary-heat-all:current-tripleo',
default=DEFAULT_HEAT_CONTAINER,
help=_('The container image to use when launching the heat-all '
'process. Defaults to: '
'tripleomaster/centos-binary-heat-all:current-tripleo')
'process. Defaults to: {}'.format(DEFAULT_HEAT_CONTAINER))
)
parser.add_argument(
'--heat-native',