Merge "Deprecate VPP service and Neutron ML2/VPP agent"

environments/neutron-ml2-vpp.yaml

@@ -3,10 +3,10 @@
 resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
-  OS::TripleO::Services::NeutronVppAgent: ../deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml
+  OS::TripleO::Services::NeutronVppAgent: ../deployment/deprecated/neutron/neutron-vpp-agent-baremetal-puppet.yaml
   OS::TripleO::Services::Etcd: ../deployment/etcd/etcd-container-puppet.yaml
   # FIXME(bogdando): switch it, once it is containerized
-  OS::TripleO::Services::Vpp: ../deployment/vpp/vpp-baremetal-puppet.yaml
+  OS::TripleO::Services::Vpp: ../deployment/deprecated/vpp/vpp-baremetal-puppet.yaml
 
 parameter_defaults:
   #Comma delimited list of <physical_network>:<VPP Interface>.

environments/services/vpp.yaml

@@ -1,5 +1,5 @@
 resource_registry:
-  OS::TripleO::Services::Vpp: ../../deployment/vpp/vpp-baremetal-puppet.yaml
+  OS::TripleO::Services::Vpp: ../../deployment/deprecated/vpp/vpp-baremetal-puppet.yaml
 
 #parameter_defaults:
   #VPP main thread core pinning

releasenotes/notes/deprecate-vpp-2911807152cd4b62.yaml

@@ -0,0 +1,7 @@
+---
+deprecations:
+  - VPP service and Neutron ML2/VPP plugin are deprecated in Xena
+    release. VPP service relies on puppet project which isn't
+    maintained for a while. Neutron ML2/VPP plugin is not actively
+    supported in TripleO. Both services would be disabled in future
+    releases.