commit 5b0982a989752ace44fb2b8891a6a8faab4f5e77
Author: Purandhar Sairam Mannidi <pmannidi@redhat.com>
Date:   Wed Sep 30 21:27:32 2020 +1000

    Fixed Neutron environment file service descriptions
    
    Change-Id: Ifa86588b1a7e63621194c55c208268d65ee2a28b

diff --git a/environments/services/neutron-ovn-dvr-ha.yaml b/environments/services/neutron-ovn-dvr-ha.yaml
index f3cfc7e..85f4bec 100644
--- a/environments/services/neutron-ovn-dvr-ha.yaml
+++ b/environments/services/neutron-ovn-dvr-ha.yaml
@@ -1,4 +1,4 @@
-# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
+# A Heat environment that can be used to deploy OVN services with DVR and HA OVN DB servers.
 resource_registry:
   OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
diff --git a/environments/services/neutron-ovn-ha.yaml b/environments/services/neutron-ovn-ha.yaml
index a9ce872..49828de 100644
--- a/environments/services/neutron-ovn-ha.yaml
+++ b/environments/services/neutron-ovn-ha.yaml
@@ -1,4 +1,4 @@
-# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
+# A Heat environment that can be used to deploy OVN services with non-DVR and HA OVN DB servers.
 resource_registry:
   OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
diff --git a/environments/services/neutron-ovs-dvr.yaml b/environments/services/neutron-ovs-dvr.yaml
index c3630a3..1bba2dc 100644
--- a/environments/services/neutron-ovs-dvr.yaml
+++ b/environments/services/neutron-ovs-dvr.yaml
@@ -1,8 +1,8 @@
-# A Heat environment file that deploys ML2/OVS in the overcloud.
+# A Heat environment file that deploys ML2/OVS with DVR in the overcloud.
+# Used with Compute DVR role. Note that the network configuration is
+# consistent with the default tripleo network templates so some customization
+# is likely required for production deployments.
 resource_registry:
-  # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
-  # FIXME(bogdando): can not be switched yet due to puppet-base issues
-  # see https://review.opendev.org/#/c/563443
   OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
 
   OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
diff --git a/environments/services/neutron-ovs.yaml b/environments/services/neutron-ovs.yaml
index f80ae90..a4a76be 100644
--- a/environments/services/neutron-ovs.yaml
+++ b/environments/services/neutron-ovs.yaml
@@ -1,11 +1,5 @@
-# A Heat environment file that enables DVR in the overcloud. Used with Compute
-# DVR role. Note that the network configuration is consistent with the default
-# tripleo network templates so some customization is likely required for
-# production deployments.
+# A Heat environment file that deploys ML2/OVS in the overcloud.
 resource_registry:
-  # Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
-  # FIXME(bogdando): can not be switched yet due to puppet-base issues
-  # see https://review.opendev.org/#/c/563443
   OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
 
   OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml