From fbb3dd9f9cdc07cb9db7320be09ebedfffb58b08 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 23 Nov 2017 13:25:38 +0100 Subject: [PATCH] Set the default CephAnsiblePlaybook to use into the env files This will make sure that any scale up attempt is executed using the site-docker.yml playbook. Change-Id: I54796b70d4dbb26c41651171fae937a50852ef7d Closes-Bug: #1734114 --- environments/ceph-ansible/ceph-ansible-external.yaml | 4 +--- environments/ceph-ansible/ceph-ansible.yaml | 1 + environments/storage-environment.yaml | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/environments/ceph-ansible/ceph-ansible-external.yaml b/environments/ceph-ansible/ceph-ansible-external.yaml index ed3bedbdeb..92adb92078 100644 --- a/environments/ceph-ansible/ceph-ansible-external.yaml +++ b/environments/ceph-ansible/ceph-ansible-external.yaml @@ -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==' diff --git a/environments/ceph-ansible/ceph-ansible.yaml b/environments/ceph-ansible/ceph-ansible.yaml index 950f95813e..3b2eae8e8c 100644 --- a/environments/ceph-ansible/ceph-ansible.yaml +++ b/environments/ceph-ansible/ceph-ansible.yaml @@ -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 diff --git a/environments/storage-environment.yaml b/environments/storage-environment.yaml index 4a7ef5d1fc..8b096d006d 100644 --- a/environments/storage-environment.yaml +++ b/environments/storage-environment.yaml @@ -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 ####