diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index 20d7a76818..b213c9b674 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -189,6 +189,7 @@ parameter_defaults: CephMsgrSecureMode: true CephAnsibleSkipClient: false CephConfigPath: "/etc/ceph" + DisableCephadm: true LVMFilterEnabled: true LVMFilterAllowlist: - /dev/loop2 diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index 60d525e629..b0304aff26 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -76,6 +76,7 @@ parameter_defaults: # Workaround for https://bugs.launchpad.net/tripleo/+bug/1911022 ExtraConfig: ganesha_vip: 192.168.24.3 + DisableCephadm: true CephClusterName: ceph0 CephConfigPath: "/etc/ceph" CephClientConfigVars: "{{ playbook_dir }}/cephadm/ceph_client.yml" diff --git a/deployment/cephadm/ceph-base.yaml b/deployment/cephadm/ceph-base.yaml index b1c7602175..1964846445 100644 --- a/deployment/cephadm/ceph-base.yaml +++ b/deployment/cephadm/ceph-base.yaml @@ -375,6 +375,10 @@ parameters: with haproxy, etc), then this parameter should be set to true. Set this parameter to false to have cephadm deploy the ceph cluster during overcloud deployment. DeployedCeph and CephDynamicSpec are mutually exclusive. + DisableCephadm: + default: false + type: boolean + description: Disable cephadm after Ceph is deployed parameter_groups: - label: deprecated @@ -621,6 +625,17 @@ outputs: name: tripleo_run_cephadm when: groups['ceph_mon'] | default([]) | length > 0 or groups['ceph_nfs'] | default([]) | length > 0 + - name: ceph_base_external_deploy_task + when: + - (step | int) == 3 + - {get_param: DisableCephadm} + tags: + - ceph + block: + - name: Pause cephadm + include_role: + name: tripleo_run_cephadm + tasks_from: disable_cephadm.yml post_upgrade_tasks: - name: Clean puppet-ceph package when: