openstack/tripleo-heat-templates
Code Issues Proposed changes

Remove CephAnsiblePlaybook parameter reset from ceph-ansible env files

Browse Source 
With the changes in environments/lifecycle to set/reset the default
CephAnsiblePlaybook value, we do not need to have it in the
ceph-ansible environment files anymore.

Closes-Bug: 1772650
Change-Id: I3004feda52cd03f982c359a027e68514c25ca893
This commit is contained in:
Giulio Fidente 2018-05-22 11:56:25 +02:00
parent 4106121954
commit f96dbd0610
3 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
environments/ceph-ansible/ceph-ansible-external.yaml
View File

@ -2,7 +2,6 @@ resource_registry:
OS::TripleO::Services::CephExternal: ../../docker/services/ceph-ansible/ceph-external.yaml OS::TripleO::Services::CephExternal: ../../docker/services/ceph-ansible/ceph-external.yaml
parameter_defaults: parameter_defaults:
CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
# NOTE: These example parameters are required when using CephExternal # NOTE: These example parameters are required when using CephExternal
#CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' #CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
#CephClientKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' #CephClientKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='

1
environments/ceph-ansible/ceph-ansible.yaml
View File

@ -5,7 +5,6 @@ resource_registry:
OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
parameter_defaults: parameter_defaults:
CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
CinderEnableIscsiBackend: false CinderEnableIscsiBackend: false
CinderEnableRbdBackend: true CinderEnableRbdBackend: true
CinderBackupBackend: ceph CinderBackupBackend: ceph

2
environments/storage-environment.yaml
View File

@ -12,8 +12,6 @@ resource_registry:
OS::TripleO::Services::CephClient: ../docker/services/ceph-ansible/ceph-client.yaml OS::TripleO::Services::CephClient: ../docker/services/ceph-ansible/ceph-client.yaml
parameter_defaults: parameter_defaults:
CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
#### BACKEND SELECTION #### #### BACKEND SELECTION ####
## Whether to enable iscsi backend for Cinder. ## Whether to enable iscsi backend for Cinder.