Fix unused DEFAULT_CONTAINER_TAG

The DEFAULT_CONTAINER_TAG constant is unused but the hard-coded value
is used instead of the constants. This change ensures the constant is
used to gather all default values in a single place.

Also, this replaces the hard-coded name prefix by the constant so that
we all define default values for container image detection as
constants.

Change-Id: I4a3b2c2943680afde67f13daefd7aaf8258132cc
This commit is contained in:
Takashi Kajinami
2022-05-30 09:16:23 +09:00
parent 71b89f4387
commit 9b03cf1d6a

View File

@@ -41,6 +41,7 @@ ANSIBLE_CWL = "tripleo_dense,tripleo_profile_tasks,tripleo_states"
CONTAINER_IMAGE_PREPARE_LOG_FILE = "container_image_prepare.log"
DEFAULT_CONTAINER_REGISTRY = "quay.io"
DEFAULT_CONTAINER_NAMESPACE = "tripleomastercentos9"
DEFAULT_CONTAINER_NAME_PREFIX = "openstack-"
DEFAULT_CONTAINER_TAG = "current-tripleo"
DEFAULT_RESOURCE_REGISTRY = 'overcloud-resource-registry-puppet.yaml'
@@ -53,8 +54,8 @@ else:
DEFAULT_CONTAINER_REGISTRY,
DEFAULT_CONTAINER_NAMESPACE
),
'name_prefix': 'openstack-',
'tag': 'current-tripleo'
'name_prefix': DEFAULT_CONTAINER_NAME_PREFIX,
'tag': DEFAULT_CONTAINER_TAG
}
DEFAULT_HEAT_CONTAINER = ('{}/{}heat-all:{}'.format(
DEFAULT_CONTAINER_IMAGE_PARAMS['namespace'],