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

environments/manila-cephfsnative-config-docker.yaml

@@ -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'

environments/manila-cephfsnative-config.yaml

@@ -9,7 +9,11 @@ resource_registry:
 
 
 parameter_defaults:
-  ManilaCephFSNativeBackendName: cephfsnative
+  ManilaCephFSBackendName: cephfs
-  ManilaCephFSNativeDriverHandlesShareServers: false
+  ManilaCephFSDriverHandlesShareServers: false
-  ManilaCephFSNativeCephFSAuthId: 'manila'
+  ManilaCephFSCephFSAuthId: 'manila'
-  ManilaCephFSNativeCephFSEnableSnapshots: false
+  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'

environments/manila-netapp-config-docker.yaml

@@ -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

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.