From 08e67b8ff02db3ccf82fd96a0c8ff2eb17a2988b Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Wed, 18 Jul 2018 15:21:42 -0400 Subject: [PATCH] Update manila environment file names to eliminate special 'docker' names. Containerized manila is now the standard way to deploy so we can avoid confusion by just using the regular manila environment file names for these rather than having some manila environment files with 'docker' in their names. Note that we are using the content of environments/manila-cephfsnative-config-docker.yaml for environments/manila-cephfsnative-config.yaml. This resolves an issue wherein the parameters in the latter file were not updated when support for the CephFS-NFS back end was added [1]. Closes-Bug: #1782622 [1] Ib408c7827e5fba0c1b01388db26363806fc64370 Change-Id: I08431d848158846a434fecc98d3bee838c7fad68 --- ....yaml => manila-cephfsganesha-config.yaml} | 0 .../manila-cephfsnative-config-docker.yaml | 19 ------------ environments/manila-cephfsnative-config.yaml | 12 +++++--- environments/manila-netapp-config-docker.yaml | 29 ------------------- ...l-manila-docker-envs-5a376db667ddfd1c.yaml | 7 +++++ 5 files changed, 15 insertions(+), 52 deletions(-) rename environments/{manila-cephfsganesha-config-docker.yaml => manila-cephfsganesha-config.yaml} (100%) delete mode 100644 environments/manila-cephfsnative-config-docker.yaml delete mode 100644 environments/manila-netapp-config-docker.yaml create mode 100644 releasenotes/notes/rm-special-manila-docker-envs-5a376db667ddfd1c.yaml diff --git a/environments/manila-cephfsganesha-config-docker.yaml b/environments/manila-cephfsganesha-config.yaml similarity index 100% rename from environments/manila-cephfsganesha-config-docker.yaml rename to environments/manila-cephfsganesha-config.yaml diff --git a/environments/manila-cephfsnative-config-docker.yaml b/environments/manila-cephfsnative-config-docker.yaml deleted file mode 100644 index d85109ec5a..0000000000 --- a/environments/manila-cephfsnative-config-docker.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# A Heat environment file which can be used to enable a -# a Manila CephFS Native driver backend. -resource_registry: - OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml - OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml - # Only manila-share is pacemaker managed: - OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml - OS::TripleO::Services::ManilaBackendCephFs: ../puppet/services/manila-backend-cephfs.yaml - - -parameter_defaults: - ManilaCephFSBackendName: cephfs - ManilaCephFSDriverHandlesShareServers: false - ManilaCephFSCephFSAuthId: 'manila' - ManilaCephFSCephFSEnableSnapshots: false - # manila cephfs driver supports either native cephfs backend - 'CEPHFS' - # (users mount shares directly from ceph cluster), or nfs-ganesha backend - - # 'NFS' (users mount shares through nfs-ganesha server) - ManilaCephFSCephFSProtocolHelperType: 'CEPHFS' diff --git a/environments/manila-cephfsnative-config.yaml b/environments/manila-cephfsnative-config.yaml index 35012f5a84..d85109ec5a 100644 --- a/environments/manila-cephfsnative-config.yaml +++ b/environments/manila-cephfsnative-config.yaml @@ -9,7 +9,11 @@ resource_registry: parameter_defaults: - ManilaCephFSNativeBackendName: cephfsnative - ManilaCephFSNativeDriverHandlesShareServers: false - ManilaCephFSNativeCephFSAuthId: 'manila' - ManilaCephFSNativeCephFSEnableSnapshots: false + ManilaCephFSBackendName: cephfs + ManilaCephFSDriverHandlesShareServers: false + ManilaCephFSCephFSAuthId: 'manila' + ManilaCephFSCephFSEnableSnapshots: false + # manila cephfs driver supports either native cephfs backend - 'CEPHFS' + # (users mount shares directly from ceph cluster), or nfs-ganesha backend - + # 'NFS' (users mount shares through nfs-ganesha server) + ManilaCephFSCephFSProtocolHelperType: 'CEPHFS' diff --git a/environments/manila-netapp-config-docker.yaml b/environments/manila-netapp-config-docker.yaml deleted file mode 100644 index a08a759c30..0000000000 --- a/environments/manila-netapp-config-docker.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# This environment file enables Manila with the Netapp backend. -resource_registry: - OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml - OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml - # Only manila-share is pacemaker managed: - OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml - OS::TripleO::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml - -parameter_defaults: - ManilaNetappBackendName: tripleo_netapp - ManilaNetappDriverHandlesShareServers: true - ManilaNetappLogin: '' - ManilaNetappPassword: '' - ManilaNetappServerHostname: '' - ManilaNetappTransportType: 'http' - ManilaNetappStorageFamily: 'ontap_cluster' - ManilaNetappServerPort: 80 - ManilaNetappVolumeNameTemplate: 'share_%(share_id)s' - ManilaNetappVserver: '' - ManilaNetappVserverNameTemplate: 'os_%s' - ManilaNetappLifNameTemplate: 'os_%(net_allocation_id)s' - ManilaNetappAggrNameSearchPattern: '(.*)' - ManilaNetappRootVolumeAggr: '' - ManilaNetappRootVolume: 'root' - ManilaNetappPortNameSearchPattern: '(.*)' - ManilaNetappTraceFlags: '' - ManilaNetappEnabledShareProtocols: 'nfs3, nfs4.0' - ManilaNetappVolumeSnapshotReservePercent: 5 - ManilaNetappSnapmirrorQuiesceTimeout: 3600 diff --git a/releasenotes/notes/rm-special-manila-docker-envs-5a376db667ddfd1c.yaml b/releasenotes/notes/rm-special-manila-docker-envs-5a376db667ddfd1c.yaml new file mode 100644 index 0000000000..d06fa3d40e --- /dev/null +++ b/releasenotes/notes/rm-special-manila-docker-envs-5a376db667ddfd1c.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + manila containerization was experimental in Pike and we had both bare + metal and docker versions of some of the manila environment files. Now + the docker environment files are fully supported so we keep them using the + standard manila environment file names, without any 'docker' in their name.