Merge "Disable the Mon/OSD/Client resources in puppet-ceph-external"
This commit is contained in:
commit
0ecb075814
@ -2,6 +2,9 @@
|
||||
# use of an externally managed Ceph cluster.
|
||||
resource_registry:
|
||||
OS::TripleO::Services::CephExternal: ../puppet/services/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
|
||||
@ -26,3 +29,6 @@ parameter_defaults:
|
||||
|
||||
# finally we disable the Cinder LVM backend
|
||||
CinderEnableIscsiBackend: false
|
||||
|
||||
# Backward compatibility setting, will be removed in the future
|
||||
CephAdminKey: ''
|
||||
|
@ -4,7 +4,9 @@ description: >
|
||||
Ceph base service. Shared by all Ceph services.
|
||||
|
||||
parameters:
|
||||
# NOTE(gfidente): needs a default to cope with external Ceph deployments were we don't pass (and need) an Admin key
|
||||
CephAdminKey:
|
||||
default: ''
|
||||
description: The Ceph admin client key. Can be created with ceph-authtool --gen-print-key.
|
||||
type: string
|
||||
hidden: true
|
||||
|
Loading…
x
Reference in New Issue
Block a user