diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index 028ebdae45..03c0ed0508 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -58,11 +58,7 @@ parameter_defaults: ManageEventPipeline: true ManagePipeline: true Debug: true - CephSpecFqdn: true - CephOsdSpec: - data_devices: - paths: - - /dev/ceph_vg/ceph_lv_data + DeployedCeph: true CephPoolDefaultPgNum: 8 CephPoolDefaultSize: 1 CephEnableDashboard: true @@ -77,7 +73,6 @@ parameter_defaults: #NOTE: These ID's and keys should be regenerated for # a production deployment. What is here is suitable for # developer and CI testing only. - CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' CephExtraKeys: - name: "client.glance" diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index 1f05e99143..5b7d4307f2 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -39,7 +39,7 @@ parameter_defaults: CephDashboardPort: 8445 CephAdmVerbose: true GrafanaDashboardPort: 3200 - CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' + DeployedCeph: true CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' CephRgwKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' NovaEnableRbdBackend: true @@ -85,11 +85,5 @@ parameter_defaults: mon_warn_on_insecure_global_id_reclaim_allowed: false ManilaCephFSCephFSProtocolHelperType: 'NFS' DisableCephadm: true - CephClusterName: ceph0 CephConfigPath: "/etc/ceph" CephClientConfigVars: "{{ playbook_dir }}/cephadm/ceph_client.yml" - CephSpecFqdn: true - CephOsdSpec: - data_devices: - paths: - - /dev/ceph_vg/ceph_lv_data diff --git a/ci/environments/scenario010-standalone.yaml b/ci/environments/scenario010-standalone.yaml index c0bbef6527..87ffd2d7aa 100644 --- a/ci/environments/scenario010-standalone.yaml +++ b/ci/environments/scenario010-standalone.yaml @@ -38,7 +38,7 @@ parameter_defaults: #NOTE: These ID's and keys should be regenerated for # a production deployment. What is here is suitable for # developer and CI testing only. - CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' + DeployedCeph: true CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' NovaEnableRbdBackend: true CinderEnableRbdBackend: true @@ -70,8 +70,3 @@ parameter_defaults: ContainerCli: podman CephConfigPath: "/etc/ceph" CephClientConfigVars: "{{ playbook_dir }}/cephadm/ceph_client.yml" - CephSpecFqdn: true - CephOsdSpec: - data_devices: - paths: - - /dev/ceph_vg/ceph_lv_data