Browse Source

Change type of CephAnsiblePlaybook from string to comma_delimited_list

Enables users to run more than one CephAnsiblePlaybook during deployment
if desired. Change is backwards compatible in case string is passed.

Depends-On: I70786ab7b81f9985ddf1148b14ef803c327752b9
Change-Id: Ie0e6e53ed08a22b1453ab1230c7c6d46104716fa
changes/17/539717/1
John Fulton 4 years ago
parent
commit
56038f39a0
  1. 6
      docker/services/ceph-ansible/ceph-base.yaml
  2. 2
      environments/ceph-ansible/ceph-ansible-external.yaml
  3. 2
      environments/ceph-ansible/ceph-ansible.yaml
  4. 2
      environments/storage-environment.yaml

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

@ -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

@ -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

@ -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

@ -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 ####

Loading…
Cancel
Save