Remove Deprecated Ceph Environment Files
hyperconverged-ceph.yaml has been deprecated since Nov 2017. storage-environment.yaml has been deprecated since Jan 2018. storage-environment-external.yaml has been deprecated since Jan 2018. tuned-ceph-filestore-hci.yaml is only for Filestore, though Bluestore has been the default for multiple Ceph releases. update-from-ceph-newton.yaml is not needed for Wallaby. Change-Id: Icb0d1fe6c3e67d99a5152b62572d7d2a2798a124
This commit is contained in:
parent
310844289a
commit
2c97817266
|
@ -1,63 +0,0 @@
|
|||
# DEPRECATED: use the following steps instead for hyperconverged
|
||||
#
|
||||
# Rather than use "-e environments/hyperconverged-ceph.yaml" use the
|
||||
# "openstack overcloud role" command to make a ComputeHCI role along
|
||||
# with the other roles that are being deployed, for example:
|
||||
#
|
||||
# openstack overcloud roles generate -o roles_data.yaml Controller ComputeHCI
|
||||
#
|
||||
# Then deploy with "-r roles_data.yaml" in place of this file.
|
||||
#
|
||||
# Alternatively, enable the StorageMgmt network in the compute role.
|
||||
resource_registry:
|
||||
OS::TripleO::Compute::Ports::StorageMgmtPort: ../network/ports/storage_mgmt.yaml
|
||||
|
||||
parameter_defaults:
|
||||
ComputeServices:
|
||||
- OS::TripleO::Services::Aide
|
||||
- OS::TripleO::Services::BootParams
|
||||
- OS::TripleO::Services::CACerts
|
||||
- OS::TripleO::Services::CephClient
|
||||
- OS::TripleO::Services::CephExternal
|
||||
- OS::TripleO::Services::Timesync
|
||||
- OS::TripleO::Services::Timezone
|
||||
- OS::TripleO::Services::ContainersLogrotateCrond
|
||||
- OS::TripleO::Services::Snmp
|
||||
- OS::TripleO::Services::Sshd
|
||||
- OS::TripleO::Services::Securetty
|
||||
- OS::TripleO::Services::NeutronBgpVpnBagpipe
|
||||
- OS::TripleO::Services::NovaAZConfig
|
||||
- OS::TripleO::Services::NovaCompute
|
||||
- OS::TripleO::Services::NovaLibvirt
|
||||
- OS::TripleO::Services::NovaLibvirtGuests
|
||||
- OS::TripleO::Services::NovaMigrationTarget
|
||||
- OS::TripleO::Services::Kernel
|
||||
- OS::TripleO::Services::ComputeNeutronCorePlugin
|
||||
- OS::TripleO::Services::ComputeNeutronOvsAgent
|
||||
- OS::TripleO::Services::NeutronLinuxbridgeAgent
|
||||
- OS::TripleO::Services::ComputeCeilometerAgent
|
||||
- OS::TripleO::Services::ComputeNeutronL3Agent
|
||||
- OS::TripleO::Services::ComputeNeutronMetadataAgent
|
||||
- OS::TripleO::Services::TripleoPackages
|
||||
- OS::TripleO::Services::TripleoFirewall
|
||||
- OS::TripleO::Services::Tuned
|
||||
- OS::TripleO::Services::IpaClient
|
||||
- OS::TripleO::Services::Ipsec
|
||||
- OS::TripleO::Services::AuditD
|
||||
- OS::TripleO::Services::Collectd
|
||||
- OS::TripleO::Services::MetricsQdr
|
||||
- OS::TripleO::Services::CephOSD
|
||||
- OS::TripleO::Services::Vpp
|
||||
- OS::TripleO::Services::NeutronVppAgent
|
||||
- OS::TripleO::Services::MySQLClient
|
||||
- OS::TripleO::Services::Iscsid
|
||||
- OS::TripleO::Services::Multipathd
|
||||
- OS::TripleO::Services::OVNController
|
||||
- OS::TripleO::Services::OVNMetadataAgent
|
||||
- OS::TripleO::Services::Rsyslog
|
||||
- OS::TripleO::Services::RsyslogSidecar
|
||||
- OS::TripleO::Services::LoginDefs
|
||||
- OS::TripleO::Services::Rear
|
||||
- OS::TripleO::Services::Rhsm
|
||||
- OS::TripleO::Services::Podman
|
||||
- OS::TripleO::Services::Frr
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
deprecations:
|
||||
- enviornments/hyperconverged-ceph.yaml has been deprecated since Nov 2017 so it has been removed.
|
||||
- enviornments/storage-environment.yaml has been deprecated since Jan 2018 so it has been removed.
|
||||
- enviornments/storage-environment-external.yaml has been deprecated since Jan 2018 so it has been removed.
|
||||
- enviornments/tuned-ceph-filestore-hci.yaml is only for Filestore, though Bluestore has been the default for multiple Ceph releases, so it has been removed.
|
||||
- environments/updates/update-from-ceph-newton.yaml was only to be used when updating Ceph from the storage-environment template from Newton so Wallaby does not need to provide this file.
|
|
@ -1,40 +0,0 @@
|
|||
# ******************************************************************************
|
||||
# DEPRECATED: Use ./ceph-ansible/ceph-ansible-external.yaml
|
||||
# ******************************************************************************
|
||||
# A Heat environment file which can be used to enable the
|
||||
# use of an externally managed Ceph cluster.
|
||||
resource_registry:
|
||||
OS::TripleO::Services::CephExternal: ../deployment/ceph-ansible/ceph-external.yaml
|
||||
OS::TripleO::Services::CephMon: OS::Heat::None
|
||||
OS::TripleO::Services::CephClient: OS::Heat::None
|
||||
OS::TripleO::Services::CephOSD: OS::Heat::None
|
||||
|
||||
parameter_defaults:
|
||||
# NOTE: These example parameters are required when using CephExternal
|
||||
#CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
|
||||
#CephClientKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
|
||||
#CephExternalMonHost: '172.16.1.7, 172.16.1.8'
|
||||
|
||||
# the following parameters enable Ceph backends for Cinder, Glance, Gnocchi and Nova
|
||||
NovaEnableRbdBackend: true
|
||||
CinderEnableRbdBackend: true
|
||||
CinderBackupBackend: ceph
|
||||
GlanceBackend: rbd
|
||||
## Uncomment below if enabling legacy telemetry
|
||||
# GnocchiBackend: rbd
|
||||
# If the Ceph pools which host VMs, Volumes and Images do not match these
|
||||
# names OR the client keyring to use is not named 'openstack', edit the
|
||||
# following as needed.
|
||||
NovaRbdPoolName: vms
|
||||
CinderRbdPoolName: volumes
|
||||
CinderBackupRbdPoolName: backups
|
||||
GlanceRbdPoolName: images
|
||||
CephClientUserName: openstack
|
||||
## Uncomment below if enabling legacy telemetry
|
||||
# GnocchiRbdPoolName: metrics
|
||||
|
||||
# finally we disable the Cinder LVM backend
|
||||
CinderEnableIscsiBackend: false
|
||||
|
||||
# Uncomment if connecting to a pre-Jewel or RHCS1.3 Ceph Cluster
|
||||
# RbdDefaultFeatures: 1
|
|
@ -1,86 +0,0 @@
|
|||
# ******************************************************************************
|
||||
# This file will not enable the deployment of Ceph in future releases.
|
||||
# Use ./ceph-ansible/ceph-ansible.yaml for this purpose instead.
|
||||
# ******************************************************************************
|
||||
## A Heat environment file which can be used to set up storage
|
||||
## backends. Defaults to Ceph used as a backend for Cinder, Glance and
|
||||
## Nova ephemeral storage.
|
||||
resource_registry:
|
||||
OS::TripleO::Services::CephMgr: ../deployment/ceph-ansible/ceph-mgr.yaml
|
||||
OS::TripleO::Services::CephMon: ../deployment/ceph-ansible/ceph-mon.yaml
|
||||
OS::TripleO::Services::CephOSD: ../deployment/ceph-ansible/ceph-osd.yaml
|
||||
OS::TripleO::Services::CephClient: ../deployment/ceph-ansible/ceph-client.yaml
|
||||
|
||||
parameter_defaults:
|
||||
#### BACKEND SELECTION ####
|
||||
|
||||
## Whether to enable iscsi backend for Cinder.
|
||||
CinderEnableIscsiBackend: false
|
||||
## Whether to enable rbd (Ceph) backend for Cinder.
|
||||
CinderEnableRbdBackend: true
|
||||
## Cinder Backup backend can be either 'ceph', 'swift' or 'nfs'.
|
||||
CinderBackupBackend: ceph
|
||||
## Whether to enable NFS backend for Cinder.
|
||||
# CinderEnableNfsBackend: false
|
||||
## Whether to enable rbd (Ceph) backend for Nova ephemeral storage.
|
||||
NovaEnableRbdBackend: true
|
||||
## Glance backend can be either 'rbd' (Ceph), 'swift' or 'file'.
|
||||
GlanceBackend: rbd
|
||||
## Gnocchi backend can be either 'rbd' (Ceph), 'swift' or 'file'.
|
||||
## Uncomment below if enabling legacy telemetry
|
||||
# GnocchiBackend: rbd
|
||||
|
||||
|
||||
#### CINDER NFS SETTINGS ####
|
||||
|
||||
## NFS mount options
|
||||
# CinderNfsMountOptions: 'context=system_u:object_r:container_file_t:s0'
|
||||
## NFS mount point, e.g. '192.168.122.1:/export/cinder'
|
||||
# CinderNfsServers: ''
|
||||
|
||||
|
||||
#### GLANCE NFS SETTINGS ####
|
||||
|
||||
## Make sure to set `GlanceBackend: file` when enabling NFS
|
||||
##
|
||||
## Whether to make Glance 'file' backend a NFS mount
|
||||
# GlanceNfsEnabled: false
|
||||
## NFS share for image storage, e.g. '192.168.122.1:/export/glance'
|
||||
## (If using IPv6, use both double- and single-quotes,
|
||||
## e.g. "'[fdd0::1]:/export/glance'")
|
||||
# GlanceNfsShare: ''
|
||||
## Mount options for the NFS image storage mount point
|
||||
# GlanceNfsOptions: 'intr,context=system_u:object_r:container_file_t:s0'
|
||||
|
||||
|
||||
#### NOVA NFS SETTINGS ####
|
||||
# NovaNfsEnabled: false
|
||||
## NFS share for nova instance file storage, e.g. '192.168.122.1:/export/nova'
|
||||
## (If using IPv6, use both double and single-quotes,
|
||||
## e.g. "'[fdd0::1]:/export/nova'")
|
||||
# NovaNfsShare: ''
|
||||
## Mount options for the NFS instance file storage mount point
|
||||
# NovaNfsOptions: 'context=system_u:object_r:nfs_t:s0'
|
||||
## NFS version to be used to mount the NovaNfsShare. Default 4
|
||||
# NovaNfsVersion: '4.2'
|
||||
|
||||
|
||||
#### CEPH SETTINGS ####
|
||||
|
||||
## When deploying Ceph Nodes through the oscplugin CLI, the following
|
||||
## parameters are set automatically by the CLI. When deploying via
|
||||
## heat stack-create or ceph on the controller nodes only,
|
||||
## they need to be provided manually.
|
||||
|
||||
## Number of Ceph storage nodes to deploy
|
||||
# CephStorageCount: 0
|
||||
## Ceph FSID, e.g. '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
|
||||
# CephClusterFSID: ''
|
||||
## Ceph monitor key, e.g. 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
|
||||
# CephClientKey: ''
|
||||
## OSDs configuration
|
||||
## See https://github.com/ceph/ceph-ansible/blob/stable-3.0/docs/source/osds/scenarios.rst
|
||||
# CephAnsibleDisksConfig:
|
||||
# devices:
|
||||
# - /dev/vdb
|
||||
# osd_scenario: collocated
|
|
@ -1,13 +0,0 @@
|
|||
parameter_defaults:
|
||||
# Reduce memory contention when collocating Nova compute and Ceph
|
||||
# OSD services (HCI). For use with Ceph filestore, not bluestore.
|
||||
TunedCustomProfile: |
|
||||
[main]
|
||||
summary=ceph-osd Filestore tuned profile
|
||||
include=throughput-performance
|
||||
[sysctl]
|
||||
vm.dirty_ratio = 10
|
||||
vm.dirty_background_ratio = 3
|
||||
[sysfs]
|
||||
/sys/kernel/mm/ksm/run=0
|
||||
TunedProfileName: ceph-filestore-osd-hci
|
|
@ -13,6 +13,3 @@ Contents
|
|||
|
||||
**update-from-deloyed-server-newton.yaml**
|
||||
To be used when updating from the deployed-server template from Newton.
|
||||
|
||||
**update-from-ceph-newton.yaml**
|
||||
To be used when updating Ceph from the storage-environment template from Newton.
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
parameter_defaults:
|
||||
CephAnsiblePlaybook:
|
||||
- /usr/share/ceph-ansible/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
|
||||
- /usr/share/ceph-ansible/infrastructure-playbooks/rolling_update.yml
|
Loading…
Reference in New Issue