openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Skip cephadm playbook when there is no mon or nfs group"

This commit is contained in:
Zuul 2021-05-26 21:26:14 +00:00 committed by Gerrit Code Review
parent 90f3f42736 9642f034bd
commit 1dcd52e51a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployment/cephadm/ceph-base.yaml
View File

@ -579,10 +579,6 @@ outputs:
ms_client_mode: secure
- {get_attr: [DefaultCephConfigOverrides, value, vars]}
cephadm_extra_vars: {get_attr: [CephAdmVars, value, vars]}
- name: Prepare cephadm user and keys
include_role:
name: tripleo_run_cephadm
tasks_from: enable_ceph_admin_user.yml
# This is supposed to run a playbook which is responsible to
# deploy Ceph using cephadm.
# The storage network is supposed to be available since we are
@ -590,6 +586,14 @@ outputs:
# TODO: (fpantano) Remove this section when --network-ports is
# available and Ceph deployment can be moved **before**
# the overcloud.
- name: Prepare cephadm user and keys
include_role:
name: tripleo_run_cephadm
tasks_from: enable_ceph_admin_user.yml
when: groups['ceph_mon'] | default([]) | length > 0 or
groups['ceph_nfs'] | default([]) | length > 0
- name: Deploy the ceph cluster using cephadm
include_role:
name: tripleo_run_cephadm
when: groups['ceph_mon'] | default([]) | length > 0 or
groups['ceph_nfs'] | default([]) | length > 0