From ab8bdfaa3839b0c78dec5cdcbd958eae132dbfc7 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 31 Aug 2017 16:42:16 +0200 Subject: Add CephExternal role for ceph-ansible Previously it was only possible to configure the overcloud with an external Ceph cluster via puppet-ceph-external. This submission adds a CephExternal implementation which uses ceph-ansible. Change-Id: Id0d375f88e27e91e9d89f25a0cd7388b6e45df8b Depends-On: Ifc57c9cf6ca8017a2abc78d6320c0675ad49ca9f Closes-Bug: #1714271 (cherry picked from commit 01e55c314de74579196518d958bf5be30e390409) --- .../ceph-ansible/ceph-ansible-external.yaml | 30 ++++++++++++++++++++++ environments/puppet-ceph-external.yaml | 1 + 2 files changed, 31 insertions(+) create mode 100644 environments/ceph-ansible/ceph-ansible-external.yaml (limited to 'environments') diff --git a/environments/ceph-ansible/ceph-ansible-external.yaml b/environments/ceph-ansible/ceph-ansible-external.yaml new file mode 100644 index 00000000..ed3bedbd --- /dev/null +++ b/environments/ceph-ansible/ceph-ansible-external.yaml @@ -0,0 +1,30 @@ +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: + # NOTE: These example parameters are required when using CephExternal + #CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19' + #CephClientKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' + #CephExternalMonHost: '172.16.1.7, 172.16.1.8' + + # the following parameters enable Ceph backends for Cinder, Glance, Gnocchi and Nova + NovaEnableRbdBackend: true + CinderEnableRbdBackend: true + CinderBackupBackend: ceph + GlanceBackend: rbd + GnocchiBackend: rbd + # If the Ceph pools which host VMs, Volumes and Images do not match these + # names OR the client keyring to use is not named 'openstack', edit the + # following as needed. + NovaRbdPoolName: vms + CinderRbdPoolName: volumes + CinderBackupRbdPoolName: backups + GlanceRbdPoolName: images + GnocchiRbdPoolName: metrics + CephClientUserName: openstack + + # finally we disable the Cinder LVM backend + CinderEnableIscsiBackend: false diff --git a/environments/puppet-ceph-external.yaml b/environments/puppet-ceph-external.yaml index 7718b821..65bbc3e4 100644 --- a/environments/puppet-ceph-external.yaml +++ b/environments/puppet-ceph-external.yaml @@ -27,6 +27,7 @@ parameter_defaults: # following as needed. NovaRbdPoolName: vms CinderRbdPoolName: volumes + CinderBackupRbdPoolName: backups GlanceRbdPoolName: images GnocchiRbdPoolName: metrics CephClientUserName: openstack -- cgit 1.2.3-korg