Merge "Remove CephAnsiblePlaybook parameter reset from ceph-ansible env files"
This commit is contained in:
commit
8566458b6b
|
@ -2,7 +2,6 @@ resource_registry:
|
|||
OS::TripleO::Services::CephExternal: ../../docker/services/ceph-ansible/ceph-external.yaml
|
||||
|
||||
parameter_defaults:
|
||||
CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
|
||||
# NOTE: These example parameters are required when using CephExternal
|
||||
#CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
|
||||
#CephClientKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
|
||||
|
|
|
@ -5,7 +5,6 @@ resource_registry:
|
|||
OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
|
||||
|
||||
parameter_defaults:
|
||||
CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
|
||||
CinderEnableIscsiBackend: false
|
||||
CinderEnableRbdBackend: true
|
||||
CinderBackupBackend: ceph
|
||||
|
|
|
@ -12,8 +12,6 @@ resource_registry:
|
|||
OS::TripleO::Services::CephClient: ../docker/services/ceph-ansible/ceph-client.yaml
|
||||
|
||||
parameter_defaults:
|
||||
CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
|
||||
|
||||
#### BACKEND SELECTION ####
|
||||
|
||||
## Whether to enable iscsi backend for Cinder.
|
||||
|
|
Loading…
Reference in New Issue