Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Expose tripleo_cephadm_default_container boolean
Browse files Browse the repository at this point in the history
Even if Ceph is deployed before Heat runs, the Ceph
Dashboard downloads Ceph containers. If the user opts
to get Ceph contianers based on the default in cephadm
and not from container_image_prepare_defaults.yaml,
then the same choice should be applied during the
overcloud deployment when the dashboard is deployed.

The deployed_ceph.yaml environment file generated
by 'openstack overcloud ceph deploy' will set this
parameter this patch introduces so the user will not
need to set it more than once.

Depends-On: Ic4f626ebbe1a5332f9f285e5ea6aaa9f24a400b8
Change-Id: I0f64c8738d65c08561a22b09dc9f5ed48af0935c
(cherry picked from commit d72a237)
  • Loading branch information
fultonj authored and fmount committed Mar 1, 2022
1 parent 3ad4133 commit 684ef97
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions deployment/cephadm/ceph-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,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
Expand Down Expand Up @@ -531,6 +537,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
Expand Down

0 comments on commit 684ef97

Please sign in to comment.