Move vpp, and veritas-hyperscale into deployment

Change-Id: I5fbd66958a912db29c3e8fee025eaecebc067b71
Related-Blueprint: services-yaml-flattening

environments/neutron-ml2-vpp.yaml

@@ -6,7 +6,7 @@ resource_registry:
   OS::TripleO::Services::NeutronVppAgent: ../deployment/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: ../puppet/services/vpp.yaml
+  OS::TripleO::Services::Vpp: ../deployment/vpp/vpp-baremetal-puppet.yaml
 
 parameter_defaults:
   #Comma delimited list of <physical_network>:<VPP Interface>.

environments/services/vpp.yaml

@@ -1,6 +1,5 @@
 resource_registry:
-  # FIXME(bogdando): switch it, once it is containerized
-  OS::TripleO::Services::Vpp: ../../puppet/services/vpp.yaml
+  OS::TripleO::Services::Vpp: ../../deployment/vpp/vpp-baremetal-puppet.yaml
 
 #parameter_defaults:
   #VPP main thread core pinning

environments/veritas-hyperscale/veritas-hyperscale-config.yaml

@@ -16,7 +16,7 @@
 # Veritas HyperScale packages for controller.
 resource_registry:
   # FIXME(bogdando): switch it, once it is containerized
-  OS::TripleO::Services::VRTSHyperScale: ../../puppet/services/veritas-hyperscale-controller.yaml
+  OS::TripleO::Services::VRTSHyperScale: ../../deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml
 
 parameter_defaults:
   EnablePackageInstall: true