Merge "Expose tripleo_cephadm_default_container boolean"

This commit is contained in:
Zuul 2022-02-17 12:01:18 +00:00 committed by Gerrit Code Review
commit 41356e407c
1 changed files with 7 additions and 0 deletions

View File

@ -426,6 +426,12 @@ parameters:
description: |
The interval applied to the rbd trash purge scheduler, that can be
expressed in minutes.
CephadmDefaultContainer:
default: false
type: boolean
description: |
Use the default continer defined in cephadm instead of
the one defined in container_image_prepare_defaults.yaml.
parameter_groups:
- label: deprecated
@ -528,6 +534,7 @@ resources:
tripleo_cephadm_verbose: {get_param: CephAdmVerbose}
tripleo_cephadm_rbd_trash: {get_param: CephRbdTrashPurgeInterval}
tripleo_cephadm_apply_ceph_conf_overrides_on_update: {get_param: ApplyCephConfigOverridesOnUpdate}
tripleo_cephadm_default_container: {get_param: CephadmDefaultContainer}
ceph_container_registry_auth:
if:
- ceph_authenticated_registry