Move scenario004 to cephadm
This patch changes the template references from ceph-ansible to cephadm, using the new role provided by tripleo-ansible. Since the Ceph dashboard requires a new -stable Ceph container which is not yet released, the monitoring stack deployment is disabled. Depends-On: Ief63794bebf1050744e1a54e554f5234d6337373 Depends-On: Ifaa37eebf0759ec8861de86266c0a0dd686cc6b3 Change-Id: Id33995996d930d06b65b51f72466120eb74ca467
This commit is contained in:
parent
14aa81dd73
commit
fb67c2da9f
@ -5,14 +5,14 @@ resource_registry:
|
||||
OS::TripleO::Services::CinderVolume: OS::Heat::None
|
||||
OS::TripleO::Services::Redis: OS::Heat::None
|
||||
OS::TripleO::Services::Horizon: OS::Heat::None
|
||||
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::CephGrafana: ../../deployment/ceph-ansible/ceph-grafana.yaml
|
||||
OS::TripleO::Services::CephMds: ../../deployment/ceph-ansible/ceph-mds.yaml
|
||||
OS::TripleO::Services::CephNfs: ../../deployment/ceph-ansible/ceph-nfs.yaml
|
||||
OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml
|
||||
OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
|
||||
OS::TripleO::Services::CephMgr: ../../deployment/cephadm/ceph-mgr.yaml
|
||||
OS::TripleO::Services::CephMon: ../../deployment/cephadm/ceph-mon.yaml
|
||||
OS::TripleO::Services::CephOSD: ../../deployment/cephadm/ceph-osd.yaml
|
||||
OS::TripleO::Services::CephGrafana: ../../deployment/cephadm/ceph-grafana.yaml
|
||||
OS::TripleO::Services::CephMds: ../../deployment/cephadm/ceph-mds.yaml
|
||||
OS::TripleO::Services::CephNfs: ../../deployment/cephadm/ceph-nfs.yaml
|
||||
OS::TripleO::Services::CephRgw: ../../deployment/cephadm/ceph-rgw.yaml
|
||||
OS::TripleO::Services::CephClient: ../../deployment/cephadm/ceph-client.yaml
|
||||
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
||||
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
||||
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
||||
@ -32,40 +32,14 @@ resource_registry:
|
||||
parameter_defaults:
|
||||
ManagePolling: true
|
||||
Debug: true
|
||||
CephAnsibleDisksConfig:
|
||||
osd_objectstore: bluestore
|
||||
osd_scenario: lvm
|
||||
lvm_volumes:
|
||||
- data: ceph_lv_data
|
||||
data_vg: ceph_vg
|
||||
db: ceph_lv_db
|
||||
db_vg: ceph_vg
|
||||
wal: ceph_lv_wal
|
||||
wal_vg: ceph_vg
|
||||
CephPoolDefaultPgNum: 32
|
||||
CephPoolDefaultPgNum: 8
|
||||
CephPoolDefaultSize: 1
|
||||
CephEnableDashboard: true
|
||||
CephEnableDashboard: false
|
||||
CephDashboardPort: 8445
|
||||
GrafanaDashboardPort: 3200
|
||||
CephAnsibleExtraConfig:
|
||||
centos_package_dependencies: []
|
||||
ceph_osd_docker_memory_limit: '1g'
|
||||
ceph_mds_docker_memory_limit: '1g'
|
||||
mon_host_v1: { 'enabled': False }
|
||||
handler_health_mon_check_retries: 10
|
||||
handler_health_mon_check_delay: 20
|
||||
delegate_fact_host: false
|
||||
#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=='
|
||||
CephRgwKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
|
||||
CephAnsiblePlaybookVerbosity: 1
|
||||
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
|
||||
CephAnsibleEnvironmentVariables:
|
||||
ANSIBLE_SSH_RETRIES: 4
|
||||
DEFAULT_FORKS: 3
|
||||
NovaEnableRbdBackend: true
|
||||
GlanceBackend: rbd
|
||||
CeilometerEnableGnocchi: true
|
||||
@ -96,7 +70,17 @@ parameter_defaults:
|
||||
CephConfigOverrides:
|
||||
globalkey: globalvalue
|
||||
anotherkey: anothervalue
|
||||
mon:
|
||||
mon_warn_on_pool_no_redundancy: false
|
||||
mon_warn_on_insecure_global_id_reclaim_allowed: false
|
||||
ManilaCephFSCephFSProtocolHelperType: 'NFS'
|
||||
# Workaround for https://bugs.launchpad.net/tripleo/+bug/1911022
|
||||
ExtraConfig:
|
||||
ganesha_vip: 192.168.24.3
|
||||
CephConfigPath: "/etc/ceph"
|
||||
CephClientConfigVars: "{{ playbook_dir }}/cephadm/ceph_client.yml"
|
||||
CephSpecFqdn: true
|
||||
CephOsdSpec:
|
||||
data_devices:
|
||||
paths:
|
||||
- /dev/ceph_vg/ceph_lv_data
|
||||
|
Loading…
Reference in New Issue
Block a user