openstack/tripleo-heat-templates
Code Issues Proposed changes

Set the default CephAnsiblePlaybook to use into the env files

Browse Source 
This will make sure that any scale up attempt is executed using
the site-docker.yml playbook.

Change-Id: I54796b70d4dbb26c41651171fae937a50852ef7d
Closes-Bug: #1734114
This commit is contained in:
Giulio Fidente 2017-11-23 13:25:38 +01:00
parent 7984be92db
commit fbb3dd9f9c
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,8 @@
resource_registry:
OS::TripleO::Services::CephExternal: ../../docker/services/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:
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=='

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

@ -5,6 +5,7 @@ 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

2
environments/storage-environment.yaml
View File

@ -2,11 +2,13 @@
## backends. Defaults to Ceph used as a backend for Cinder, Glance and
## Nova ephemeral storage.
resource_registry:
OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../docker/services/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../docker/services/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephClient: ../docker/services/ceph-ansible/ceph-client.yaml
parameter_defaults:
CephAnsiblePlaybook: /usr/share/ceph-ansible/site-docker.yml.sample
#### BACKEND SELECTION ####