THT cleanup of scenario001/004/010 for Deployed Ceph

Remove parameters which are not used when "deployed ceph"
is used. The CephClusterFSID, "DeployedCeph: true", and
data_devices (from the soon to be deprecated CephOsdSpec)
will be set in the deployed_ceph.yaml environment file
which is generated and passed to the overcloud deployment
by I982dedb53582fbd76391165c3ca72954c129b84a.

Change-Id: Id6d0699123b9e9b75011ee94949ec4a69012f9af
This commit is contained in:
John Fulton 2022-03-18 16:33:08 -04:00
parent edd31ba8ba
commit be7f55bdf6
3 changed files with 3 additions and 19 deletions

View File

@ -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"

View File

@ -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

View File

@ -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