openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Change type of CephAnsiblePlaybook from string to comma_delimited_list"

This commit is contained in:
Zuul 2018-02-15 13:57:10 +00:00 committed by Gerrit Code Review
parent 5a5d1a745c 56038f39a0
commit da9d3e3a31
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/services/ceph-ansible/ceph-base.yaml
View File

@ -50,9 +50,9 @@ parameters:
description: Name of the Mistral workflow to execute
default: tripleo.storage.v1.ceph-install
CephAnsiblePlaybook:
type: string
description: Path to the ceph-ansible playbook to execute
default: /usr/share/ceph-ansible/site-docker.yml.sample
type: comma_delimited_list
description: List of paths to the ceph-ansible playbooks to execute
default: ['/usr/share/ceph-ansible/site-docker.yml.sample']
CephAnsibleUpgradePlaybook:
type: string
description: Path to the ceph-ansible playbook to execute on upgrade

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

@ -2,7 +2,7 @@ resource_registry:
OS::TripleO::Services::CephExternal: ../../docker/services/ceph-ansible/ceph-external.yaml
parameter_defaults:
CephAnsiblePlaybook: /usr/share/ceph-ansible/site-docker.yml.sample
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=='

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

@ -5,7 +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
CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
CinderEnableIscsiBackend: false
CinderEnableRbdBackend: true
CinderBackupBackend: ceph

2
environments/storage-environment.yaml
View File

@ -12,7 +12,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
CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample']
#### BACKEND SELECTION ####