diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index b4b2c0f17f..26181e1364 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/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 diff --git a/environments/ceph-ansible/ceph-ansible-external.yaml b/environments/ceph-ansible/ceph-ansible-external.yaml index 92adb92078..a959c79051 100644 --- a/environments/ceph-ansible/ceph-ansible-external.yaml +++ b/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==' diff --git a/environments/ceph-ansible/ceph-ansible.yaml b/environments/ceph-ansible/ceph-ansible.yaml index 3b2eae8e8c..a862b96120 100644 --- a/environments/ceph-ansible/ceph-ansible.yaml +++ b/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 diff --git a/environments/storage-environment.yaml b/environments/storage-environment.yaml index 8042062c8b..a2147a81c2 100644 --- a/environments/storage-environment.yaml +++ b/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 ####