From 63c5a94f83a6d8d9f9cc3e342265002e2e708d81 Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Fri, 8 Jan 2021 09:54:55 -0500 Subject: [PATCH] Use Ceph-NFS for Manila in scenario004 CephFS gatewayed by NFS is more generally suitable for multi-tenant OpenStack deployments than native CephFS since the latter requires that VMs belonging to regular members of Keystone projects be exposed to the Ceph infrastructure and run client software with capabilities that are not appropriate for untrusted cloud tenants. Depends-on: https://review.opendev.org/c/openstack/puppet-tripleo/+/769906 Depends-on: https://review.opendev.org/c/openstack/tripleo-ci/+/770049 Change-Id: I269607d43f45f65efcbce33dd776e7eb4f475311 --- ci/environments/scenario004-standalone.yaml | 5 +++++ roles/Standalone.yaml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index dc06559410..075c537bb0 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -10,6 +10,7 @@ resource_registry: OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml OS::TripleO::Services::CephGrafana: ../../deployment/ceph-ansible/ceph-grafana.yaml OS::TripleO::Services::CephMds: ../../deployment/ceph-ansible/ceph-mds.yaml + OS::TripleO::Services::CephNfs: ../../deployment/ceph-ansible/ceph-nfs.yaml OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml OS::TripleO::Services::SwiftProxy: OS::Heat::None @@ -94,3 +95,7 @@ parameter_defaults: CephConfigOverrides: globalkey: globalvalue anotherkey: anothervalue + ManilaCephFSCephFSProtocolHelperType: 'NFS' + # Workaround for https://bugs.launchpad.net/tripleo/+bug/1911022 + ExtraConfig: + ganesha_vip: 192.168.24.3 \ No newline at end of file diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index 55ae99f284..25e4f06e85 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -25,6 +25,8 @@ subnet: storage_subnet StorageMgmt: subnet: storage_mgmt_subnet + StorageNFS: + subnet: storage_nfs_subnet Tenant: subnet: tenant_subnet ServicesDefault: @@ -48,6 +50,7 @@ - OS::TripleO::Services::CephMds - OS::TripleO::Services::CephMgr - OS::TripleO::Services::CephMon + - OS::TripleO::Services::CephNfs - OS::TripleO::Services::CephRbdMirror - OS::TripleO::Services::CephRgw - OS::TripleO::Services::CephOSD