Move neutron base, plugins to deployment

Depends-On: Ic7c1817671467f4ec2ef823f52e165c2c1f230ca
Change-Id: I94998e5885fae927a5637ef67a7930e2dd19a8ee
Related-Blueprint: services-yaml-flattening

ci/environments/scenario007-multinode-containers.yaml

@@ -1,7 +1,7 @@
 resource_registry:
   OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml
   OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
   OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml
   OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml

ci/environments/scenario008-multinode-containers.yaml

@@ -3,7 +3,7 @@ resource_registry:
   OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
   OS::TripleO::Services::OpenDaylightApi: ../../deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml
   OS::TripleO::Services::OpenDaylightOvs: ../../puppet/services/opendaylight-ovs.yaml
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-odl.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-odl.yaml
   # Disable OVN services
   OS::TripleO::Services::OVNController: OS::Heat::None
   OS::TripleO::Services::OVNDBs: OS::Heat::None

deployment/ironic/ironic-neutron-agent-container-puppet.yaml

@@ -50,9 +50,8 @@ resources:
   ContainersCommon:
     type: ../containers-common.yaml
 
-  # TODO() Point to the right neutron-base once neutron is flat
   NeutronBase:
-    type: ../../puppet/services/neutron-base.yaml
+    type: ../neutron/neutron-base.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

deployment/neutron/neutron-api-container-puppet.yaml

@@ -163,7 +163,7 @@ resources:
     type: ../database/mysql-client.yaml
 
   NeutronBase:
-    type: ../../puppet/services/neutron-base.yaml
+    type: ./neutron-base.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}

deployment/neutron/neutron-dhcp-container-puppet.yaml

@@ -142,7 +142,7 @@ resources:
     type: ../containers-common.yaml
 
   NeutronBase:
-    type: ../../puppet/services/neutron-base.yaml
+    type: ./neutron-base.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}

deployment/neutron/neutron-l3-container-puppet.yaml

@@ -130,7 +130,7 @@ resources:
     type: ../containers-common.yaml
 
   NeutronBase:
-    type: ../../puppet/services/neutron-base.yaml
+    type: ./neutron-base.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}

deployment/neutron/neutron-metadata-container-puppet.yaml

@@ -89,7 +89,7 @@ resources:
     type: ../containers-common.yaml
 
   NeutronBase:
-    type: ../../puppet/services/neutron-base.yaml
+    type: ./neutron-base.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}

deployment/neutron/neutron-ovs-agent-container-puppet.yaml

@@ -152,7 +152,7 @@ resources:
               OvsDisableEMC: {get_param: OvsDisableEMC}
 
   NeutronBase:
-    type: ../../puppet/services/neutron-base.yaml
+    type: ./neutron-base.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}

deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml

@@ -40,7 +40,7 @@ parameters:
 resources:
 
   NeutronMl2Base:
-    type: ../../puppet/services/neutron-plugin-ml2.yaml
+    type: ./neutron-plugin-ml2.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}

deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml

@@ -62,7 +62,7 @@ parameters:
 resources:
 
   NeutronMl2Base:
-    type: ../../puppet/services/neutron-plugin-ml2.yaml
+    type: ./neutron-plugin-ml2.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}

deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml

@@ -52,7 +52,7 @@ parameters:
 resources:
 
   NeutronMl2Base:
-    type: ../../puppet/services/neutron-plugin-ml2.yaml
+    type: ./neutron-plugin-ml2.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

deployment/neutron/neutron-sriov-agent-container-puppet.yaml

@@ -110,7 +110,7 @@ resources:
     type: ../containers-common.yaml
 
   NeutronBase:
-    type: ../../puppet/services/neutron-base.yaml
+    type: ./neutron-base.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}

deployment/ovn/ovn-metadata-container-puppet.yaml

@@ -116,7 +116,7 @@ resources:
     type: ../containers-common.yaml
 
   NeutronBase:
-    type: ../../puppet/services/neutron-base.yaml
+    type: ../neutron/neutron-base.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
       ServiceData: {get_param: ServiceData}

environments/docker-uc-light.yaml

@@ -4,7 +4,7 @@ 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.openstack.org/#/c/563443
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
 
   OS::TripleO::Services::ContainersLogrotateCrond: ../deployment/logrotate/logrotate-crond-container-puppet.yaml
   OS::TripleO::Services::HeatApi: ../deployment/heat/heat-api-container-puppet.yaml

environments/networking/neutron-midonet.yaml

@@ -59,7 +59,7 @@ parameter_defaults:
 resource_registry:
   OS::TripleO::AllNodesExtraConfig: ../../puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml
   OS::TripleO::Controller::Net::SoftwareConfig: ../../net-config-linux-bridge.yaml
-  OS::TripleO::Services::ComputeNeutronCorePlugin: ../../puppet/services/neutron-compute-plugin-midonet.yaml
+  OS::TripleO::Services::ComputeNeutronCorePlugin: ../../deployment/neutron/neutron-compute-plugin-midonet.yaml
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginMidonet
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None

environments/neutron-linuxbridge.yaml

@@ -2,8 +2,7 @@
 resource_registry:
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
-  # FIXME(bogdando): switch it, once it is containerized
-  OS::TripleO::Services::NeutronLinuxbridgeAgent: ../puppet/services/neutron-linuxbridge-agent.yaml
+  OS::TripleO::Services::NeutronLinuxbridgeAgent: ../deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml
 
 parameter_defaults:
   NeutronMechanismDrivers: ['linuxbridge']

environments/neutron-midonet.yaml

@@ -11,7 +11,7 @@ resource_registry:
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   # Override the NeutronCorePlugin to use Nuage
   OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginMidonet
-  OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-midonet.yaml
+  OS::TripleO::Services::ComputeNeutronCorePlugin: ../deployment/neutron/neutron-compute-plugin-midonet.yaml
 
 parameter_defaults:
   EnableZookeeperOnController: true

environments/neutron-ml2-bigswitch.yaml

@@ -3,8 +3,7 @@
 resource_registry:
   OS::TripleO::ControllerExtraConfigPre: ../puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml
   OS::TripleO::ComputeExtraConfigPre: ../puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml
-  # FIXME(bogdando): switch it, once it is containerized
-  OS::TripleO::NeutronBigswitchAgent: ../puppet/services/neutron-bigswitch-agent.yaml
+  OS::TripleO::NeutronBigswitchAgent: ../deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
 

environments/neutron-ml2-fujitsu-cfab.yaml

@@ -1,7 +1,7 @@
 # A Heat environment file which can be used to enable Fujitsu C-Fabric
 # plugin, configured via puppet
 resource_registry:
-  OS::TripleO::Services::NeutronML2FujitsuCfab: ../puppet/services/neutron-plugin-ml2-fujitsu-cfab.yaml
+  OS::TripleO::Services::NeutronML2FujitsuCfab: ../deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml
 
 parameter_defaults:
   # Fixed

environments/neutron-ml2-fujitsu-fossw.yaml

@@ -1,7 +1,7 @@
 # A Heat environment file which can be used to enable Fujitsu fossw
 # plugin, configured via puppet
 resource_registry:
-  OS::TripleO::Services::NeutronML2FujitsuFossw: ../puppet/services/neutron-plugin-ml2-fujitsu-fossw.yaml
+  OS::TripleO::Services::NeutronML2FujitsuFossw: ../deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml
 
 parameter_defaults:
   # Fixed

environments/neutron-ml2-vpp.yaml

@@ -3,8 +3,7 @@
 resource_registry:
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
-  # FIXME(bogdando): switch it, once it is containerized
-  OS::TripleO::Services::NeutronVppAgent: ../puppet/services/neutron-vpp-agent.yaml
+  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

environments/neutron-ovs-dvr.yaml

@@ -5,7 +5,7 @@ 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.openstack.org/#/c/563443
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
 
   OS::TripleO::Services::NeutronServer: ../deployment/neutron/neutron-api-container-puppet.yaml
   OS::TripleO::Services::NeutronApi: ../deployment/neutron/neutron-api-container-puppet.yaml

environments/neutron-plumgrid.yaml

@@ -9,7 +9,7 @@ resource_registry:
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   # Override the Neutron core plugin to use PLUMgrid
   OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginPlumgrid
-  OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-plumgrid.yaml
+  OS::TripleO::Services::ComputeNeutronCorePlugin: ../deployment/neutron/neutron-compute-plugin-plumgrid.yaml
 
 parameter_defaults:
   NeutronCorePlugin: networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2

environments/neutron-sriov.yaml

@@ -5,7 +5,7 @@
 ## A Heat environment that can be used to deploy SR-IOV
 resource_registry:
   OS::TripleO::Services::NeutronSriovAgent: ../deployment/neutron/neutron-sriov-agent-container-puppet.yaml
-  OS::TripleO::Services::NeutronSriovHostConfig: ../puppet/services/neutron-sriov-host-config.yaml
+  OS::TripleO::Services::NeutronSriovHostConfig: ../deployment/neutron/neutron-sriov-host-config.yaml
 
 parameter_defaults:
   NeutronMechanismDrivers: ['sriovnicswitch', 'openvswitch']

environments/services-baremetal/neutron-lbaasv2.yaml

@@ -8,7 +8,7 @@
 # - OVS: neutron.agent.linux.interface.OVSInterfaceDriver
 # - LinuxBridges: neutron.agent.linux.interface.BridgeInterfaceDriver
 resource_registry:
-  OS::TripleO::Services::NeutronLbaasv2Agent: ../../puppet/services/neutron-lbaas-agent.yaml
+  OS::TripleO::Services::NeutronLbaasv2Agent: ../../deployment/neutron/neutron-lbaas-agent-baremetal-puppet.yaml
   OS::TripleO::Services::NeutronLbaasv2Api: ../../deployment/neutron/neutron-lbaas-api-container-puppet.yaml
 
 parameter_defaults:

environments/services-baremetal/neutron-opendaylight-sriov.yaml

@@ -2,7 +2,7 @@
 # This file is to be used with neutron-opendaylight.yaml
 
 resource_registry:
-  OS::TripleO::Services::ComputeNeutronCorePlugin: ../../puppet/services/neutron-plugin-ml2.yaml
+  OS::TripleO::Services::ComputeNeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2.yaml
   OS::TripleO::Services::NeutronSriovAgent: ../../deployment/neutron/neutron-sriov-agent-container-puppet.yaml
 
 parameter_defaults:

environments/services-baremetal/neutron-opendaylight.yaml

@@ -8,7 +8,7 @@ resource_registry:
   OS::TripleO::Services::OpenDaylightApi: ../../deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml
   OS::TripleO::Services::OpenDaylightOvs: ../../puppet/services/opendaylight-ovs.yaml
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-odl.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-odl.yaml
 
 parameter_defaults:
   NeutronEnableForceMetadata: true

environments/services-baremetal/neutron-ovn-dvr-ha.yaml

@@ -1,6 +1,6 @@
 # A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-ovn.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::OVNController: ../../puppet/services/ovn-controller.yaml
   OS::TripleO::Services::OVNDBs: ../../puppet/services/pacemaker/ovn-dbs.yaml
 # Disabling Neutron services that overlap with OVN

environments/services-baremetal/neutron-ovn-ha.yaml

@@ -1,6 +1,6 @@
 # A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-ovn.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
   OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
   OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml

environments/services-baremetal/neutron-sriov.yaml

@@ -1,7 +1,7 @@
 # A Heat environment that can be used to enable SR-IOV support in neutron.
 resource_registry:
   OS::TripleO::Services::NeutronSriovAgent: ../../deployment/neutron/neutron-sriov-agent-container-puppet.yaml
-  OS::TripleO::Services::NeutronSriovHostConfig: ../../puppet/services/neutron-sriov-host-config.yaml
+  OS::TripleO::Services::NeutronSriovHostConfig: ../../deployment/neutron/neutron-sriov-host-config.yaml
 
 parameter_defaults:
   NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']

environments/services/neutron-opendaylight-sriov.yaml

@@ -4,7 +4,7 @@
 resource_registry:
   OS::TripleO::Services::ComputeNeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
   OS::TripleO::Services::NeutronSriovAgent: ../../deployment/neutron/neutron-sriov-agent-container-puppet.yaml
-  OS::TripleO::Services::NeutronSriovHostConfig: ../../puppet/services/neutron-sriov-host-config.yaml
+  OS::TripleO::Services::NeutronSriovHostConfig: ../../deployment/neutron/neutron-sriov-host-config.yaml
 
 parameter_defaults:
   NeutronMechanismDrivers: ['sriovnicswitch','opendaylight_v2']

environments/services/neutron-opendaylight.yaml

@@ -9,7 +9,7 @@ resource_registry:
   # FIXME(bogdando): switch it, once it is containerized
   OS::TripleO::Services::OpenDaylightOvs: ../../puppet/services/opendaylight-ovs.yaml
   OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-odl.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-odl.yaml
 
 parameter_defaults:
   NeutronEnableForceMetadata: true

environments/services/neutron-ovn-dvr-ha.yaml

@@ -1,6 +1,6 @@
 # A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-ovn.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
   OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
   OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml

environments/services/neutron-ovn-ha.yaml

@@ -1,6 +1,6 @@
 # A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-ovn.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
   OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
   OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml

environments/services/neutron-ovn-sriov.yaml

@@ -8,7 +8,7 @@
 
 resource_registry:
   OS::TripleO::Services::NeutronSriovAgent: ../../deployment/neutron/neutron-sriov-agent-container-puppet.yaml
-  OS::TripleO::Services::NeutronSriovHostConfig: ../../puppet/services/neutron-sriov-host-config.yaml
+  OS::TripleO::Services::NeutronSriovHostConfig: ../../deployment/neutron/neutron-sriov-host-config.yaml
   OS::TripleO::Services::NeutronDhcpAgent: ../../deployment/neutron/neutron-dhcp-container-puppet.yaml
 
 parameter_defaults:

environments/services/neutron-ovn-standalone.yaml

@@ -1,6 +1,6 @@
 # A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
 resource_registry:
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-ovn.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
   OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-container-puppet.yaml
   OS::TripleO::Services::OVNMetadataAgent: ../../deployment/ovn/ovn-metadata-container-puppet.yaml

environments/services/neutron-ovs-dvr.yaml

@@ -3,7 +3,7 @@ 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.openstack.org/#/c/563443
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
 
   OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml
   OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml

environments/services/neutron-ovs.yaml

@@ -6,7 +6,7 @@ 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.openstack.org/#/c/563443
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
 
   OS::TripleO::Services::NeutronServer: ../../deployment/neutron/neutron-api-container-puppet.yaml
   OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml

environments/services/neutron-sriov.yaml

@@ -1,7 +1,7 @@
 # A Heat environment that can be used to enable SR-IOV support in neutron.
 resource_registry:
   OS::TripleO::Services::NeutronSriovAgent: ../../deployment/neutron/neutron-sriov-agent-container-puppet.yaml
-  OS::TripleO::Services::NeutronSriovHostConfig: ../../puppet/services/neutron-sriov-host-config.yaml
+  OS::TripleO::Services::NeutronSriovHostConfig: ../../deployment/neutron/neutron-sriov-host-config.yaml
 
 parameter_defaults:
   NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']

environments/undercloud.yaml

@@ -19,7 +19,7 @@ resource_registry:
   OS::TripleO::Services::NeutronDhcpAgent: ../deployment/neutron/neutron-dhcp-container-puppet.yaml
   OS::TripleO::Services::NeutronL3Agent: ../deployment/neutron/neutron-l3-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePlugin: ../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
-  OS::TripleO::Docker::NeutronMl2PluginBase: ../puppet/services/neutron-plugin-ml2.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: ../deployment/neutron/neutron-plugin-ml2.yaml
 
   OS::TripleO::Services::OpenStackClients: ../deployment/clients/openstack-clients-baremetal-puppet.yaml
 

overcloud-resource-registry-puppet.j2.yaml

@@ -151,21 +151,21 @@ resource_registry:
   # can be the same as NeutronCorePlugin but some vendors install different
   # things where VMs run
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
-  OS::TripleO::Services::ComputeNeutronCorePluginNuage: puppet/services/neutron-compute-plugin-nuage.yaml
+  OS::TripleO::Services::ComputeNeutronCorePluginNuage: deployment/neutron/neutron-compute-plugin-nuage.yaml
   # Neutron Core Plugin Vendors (these typically override NeutronCorePlugin)
-  OS::TripleO::Services::NeutronCorePluginML2OVN: puppet/services/neutron-plugin-ml2-ovn.yaml
-  OS::TripleO::Services::NeutronCorePluginPlumgrid: puppet/services/neutron-plugin-plumgrid.yaml
-  OS::TripleO::Services::NeutronCorePluginNuage: puppet/services/neutron-plugin-nuage.yaml
-  OS::TripleO::Services::NeutronCorePluginML2Nuage: puppet/services/neutron-plugin-ml2-nuage.yaml
+  OS::TripleO::Services::NeutronCorePluginML2OVN: deployment/neutron/neutron-plugin-ml2-ovn.yaml
+  OS::TripleO::Services::NeutronCorePluginPlumgrid: deployment/neutron/neutron-plugin-plumgrid.yaml
+  OS::TripleO::Services::NeutronCorePluginNuage: deployment/neutron/neutron-plugin-nuage.yaml
+  OS::TripleO::Services::NeutronCorePluginML2Nuage: deployment/neutron/neutron-plugin-ml2-nuage.yaml
   OS::TripleO::Services::NeutronCorePluginNSX: deployment/neutron/neutron-plugin-nsx-container-puppet.yaml
   OS::TripleO::Services::OVNDBs: deployment/ovn/ovn-dbs-container-puppet.yaml
   OS::TripleO::Services::OVNController: deployment/ovn/ovn-controller-container-puppet.yaml
 
   OS::TripleO::Services::NeutronCorePluginMLNXSDN: deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml
-  OS::TripleO::Services::NeutronCorePluginMidonet: puppet/services/neutron-midonet.yaml
+  OS::TripleO::Services::NeutronCorePluginMidonet: deployment/neutron/neutron-midonet-baremetal-puppet.yaml
   OS::TripleO::Services::NeutronCorePluginVTS: deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePluginML2Ansible: deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml
-  OS::TripleO::Services::NeutronNuageVrs: puppet/services/neutron-controller-plugin-nuage.yaml
+  OS::TripleO::Services::NeutronNuageVrs: deployment/neutron/neutron-controller-plugin-nuage.yaml
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
@@ -337,7 +337,7 @@ 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.openstack.org/#/c/563443
-  OS::TripleO::Docker::NeutronMl2PluginBase: puppet/services/neutron-plugin-ml2-ovn.yaml
+  OS::TripleO::Docker::NeutronMl2PluginBase: deployment/neutron/neutron-plugin-ml2-ovn.yaml
   OS::TripleO::Services::Multipathd: deployment/multipathd/multipathd-container.yaml
 
   # Logging

sample-env-generator/enable-services.yaml

@@ -23,7 +23,7 @@ environments:
       Sample configuration parameters for Designate.  Requires the
       enable-designate environment.
     files:
-      puppet/services/neutron-plugin-ml2.yaml:
+      deployment/neutron/neutron-plugin-ml2.yaml:
         parameters:
           - NeutronPluginExtensions
       deployment/neutron/neutron-dhcp-container-puppet.yaml:

sample-env-generator/networking.yaml

@@ -6,7 +6,7 @@ environments:
     files:
       puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml:
         parameters: all
-      puppet/services/neutron-base.yaml:
+      deployment/neutron/neutron-base.yaml:
         parameters:
           - NeutronCorePlugin
       deployment/neutron/neutron-dhcp-container-puppet.yaml:
@@ -29,4 +29,4 @@ environments:
       OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
       OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
       OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginMidonet
-      OS::TripleO::Services::ComputeNeutronCorePlugin: ../../puppet/services/neutron-compute-plugin-midonet.yaml
+      OS::TripleO::Services::ComputeNeutronCorePlugin: ../../deployment/neutron/neutron-compute-plugin-midonet.yaml