diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml index 9730c29c42..5c249dcdfc 100644 --- a/ci/environments/scenario007-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario008-multinode-containers.yaml b/ci/environments/scenario008-multinode-containers.yaml index ecfa55d299..a678474fba 100644 --- a/ci/environments/scenario008-multinode-containers.yaml +++ b/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 diff --git a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml index 27692694aa..04b405d085 100644 --- a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml +++ b/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} diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index d88b514f46..39bf22c682 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/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} diff --git a/puppet/services/neutron-base.yaml b/deployment/neutron/neutron-base.yaml similarity index 100% rename from puppet/services/neutron-base.yaml rename to deployment/neutron/neutron-base.yaml diff --git a/puppet/services/neutron-bigswitch-agent.yaml b/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml similarity index 100% rename from puppet/services/neutron-bigswitch-agent.yaml rename to deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml diff --git a/puppet/services/neutron-compute-plugin-midonet.yaml b/deployment/neutron/neutron-compute-plugin-midonet.yaml similarity index 100% rename from puppet/services/neutron-compute-plugin-midonet.yaml rename to deployment/neutron/neutron-compute-plugin-midonet.yaml diff --git a/puppet/services/neutron-compute-plugin-nuage.yaml b/deployment/neutron/neutron-compute-plugin-nuage.yaml similarity index 100% rename from puppet/services/neutron-compute-plugin-nuage.yaml rename to deployment/neutron/neutron-compute-plugin-nuage.yaml diff --git a/puppet/services/neutron-compute-plugin-plumgrid.yaml b/deployment/neutron/neutron-compute-plugin-plumgrid.yaml similarity index 100% rename from puppet/services/neutron-compute-plugin-plumgrid.yaml rename to deployment/neutron/neutron-compute-plugin-plumgrid.yaml diff --git a/puppet/services/neutron-controller-plugin-nuage.yaml b/deployment/neutron/neutron-controller-plugin-nuage.yaml similarity index 100% rename from puppet/services/neutron-controller-plugin-nuage.yaml rename to deployment/neutron/neutron-controller-plugin-nuage.yaml diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml index 8d617a5807..71084460b6 100644 --- a/deployment/neutron/neutron-dhcp-container-puppet.yaml +++ b/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} diff --git a/puppet/services/neutron-l3-compute-dvr.yaml b/deployment/neutron/neutron-l3-compute-dvr.yaml similarity index 100% rename from puppet/services/neutron-l3-compute-dvr.yaml rename to deployment/neutron/neutron-l3-compute-dvr.yaml diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml index 1ee233f431..db6f28b3ff 100644 --- a/deployment/neutron/neutron-l3-container-puppet.yaml +++ b/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} diff --git a/puppet/services/neutron-lbaas-agent.yaml b/deployment/neutron/neutron-lbaas-agent-baremetal-puppet.yaml similarity index 100% rename from puppet/services/neutron-lbaas-agent.yaml rename to deployment/neutron/neutron-lbaas-agent-baremetal-puppet.yaml diff --git a/puppet/services/neutron-linuxbridge-agent.yaml b/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml similarity index 100% rename from puppet/services/neutron-linuxbridge-agent.yaml rename to deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml diff --git a/deployment/neutron/neutron-metadata-container-puppet.yaml b/deployment/neutron/neutron-metadata-container-puppet.yaml index 0e205719ef..c33820a37e 100644 --- a/deployment/neutron/neutron-metadata-container-puppet.yaml +++ b/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} diff --git a/puppet/services/neutron-midonet.yaml b/deployment/neutron/neutron-midonet-baremetal-puppet.yaml similarity index 100% rename from puppet/services/neutron-midonet.yaml rename to deployment/neutron/neutron-midonet-baremetal-puppet.yaml diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml index 69bf2d97af..f3656a8c51 100644 --- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml +++ b/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} diff --git a/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml index a179db3e5f..6f0d10e4b4 100644 --- a/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml +++ b/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} diff --git a/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml index dfdc7c8861..ac7defffb5 100644 --- a/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml +++ b/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} diff --git a/puppet/services/neutron-plugin-ml2-fujitsu-cfab.yaml b/deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml similarity index 100% rename from puppet/services/neutron-plugin-ml2-fujitsu-cfab.yaml rename to deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml diff --git a/puppet/services/neutron-plugin-ml2-fujitsu-fossw.yaml b/deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml similarity index 100% rename from puppet/services/neutron-plugin-ml2-fujitsu-fossw.yaml rename to deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml diff --git a/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml index 5dd5ea217d..e8cc17ddbd 100644 --- a/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml +++ b/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} diff --git a/puppet/services/neutron-plugin-ml2-nuage.yaml b/deployment/neutron/neutron-plugin-ml2-nuage.yaml similarity index 100% rename from puppet/services/neutron-plugin-ml2-nuage.yaml rename to deployment/neutron/neutron-plugin-ml2-nuage.yaml diff --git a/puppet/services/neutron-plugin-ml2-odl.yaml b/deployment/neutron/neutron-plugin-ml2-odl.yaml similarity index 100% rename from puppet/services/neutron-plugin-ml2-odl.yaml rename to deployment/neutron/neutron-plugin-ml2-odl.yaml diff --git a/puppet/services/neutron-plugin-ml2-ovn.yaml b/deployment/neutron/neutron-plugin-ml2-ovn.yaml similarity index 100% rename from puppet/services/neutron-plugin-ml2-ovn.yaml rename to deployment/neutron/neutron-plugin-ml2-ovn.yaml diff --git a/puppet/services/neutron-plugin-ml2.yaml b/deployment/neutron/neutron-plugin-ml2.yaml similarity index 100% rename from puppet/services/neutron-plugin-ml2.yaml rename to deployment/neutron/neutron-plugin-ml2.yaml diff --git a/puppet/services/neutron-plugin-nuage.yaml b/deployment/neutron/neutron-plugin-nuage.yaml similarity index 100% rename from puppet/services/neutron-plugin-nuage.yaml rename to deployment/neutron/neutron-plugin-nuage.yaml diff --git a/puppet/services/neutron-plugin-plumgrid.yaml b/deployment/neutron/neutron-plugin-plumgrid.yaml similarity index 100% rename from puppet/services/neutron-plugin-plumgrid.yaml rename to deployment/neutron/neutron-plugin-plumgrid.yaml diff --git a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml index 32d46ad9fd..cecb98c6fd 100644 --- a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml +++ b/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} diff --git a/puppet/services/neutron-sriov-host-config.yaml b/deployment/neutron/neutron-sriov-host-config.yaml similarity index 100% rename from puppet/services/neutron-sriov-host-config.yaml rename to deployment/neutron/neutron-sriov-host-config.yaml diff --git a/puppet/services/neutron-vpp-agent.yaml b/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml similarity index 100% rename from puppet/services/neutron-vpp-agent.yaml rename to deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml index c8112b0fd3..78eb9ddd54 100644 --- a/deployment/ovn/ovn-metadata-container-puppet.yaml +++ b/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} diff --git a/environments/docker-uc-light.yaml b/environments/docker-uc-light.yaml index 7fd5b7f976..7f02c3b65a 100644 --- a/environments/docker-uc-light.yaml +++ b/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 diff --git a/environments/networking/neutron-midonet.yaml b/environments/networking/neutron-midonet.yaml index ad8da8cf62..964bc84774 100644 --- a/environments/networking/neutron-midonet.yaml +++ b/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 diff --git a/environments/neutron-linuxbridge.yaml b/environments/neutron-linuxbridge.yaml index bdc84f87f4..69c44512b1 100644 --- a/environments/neutron-linuxbridge.yaml +++ b/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'] diff --git a/environments/neutron-midonet.yaml b/environments/neutron-midonet.yaml index 64cea2a670..aac8befa4b 100644 --- a/environments/neutron-midonet.yaml +++ b/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 diff --git a/environments/neutron-ml2-bigswitch.yaml b/environments/neutron-ml2-bigswitch.yaml index 91664c3306..92f6f5ee65 100644 --- a/environments/neutron-ml2-bigswitch.yaml +++ b/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 diff --git a/environments/neutron-ml2-fujitsu-cfab.yaml b/environments/neutron-ml2-fujitsu-cfab.yaml index f14f7ee2d3..7777cf60ba 100644 --- a/environments/neutron-ml2-fujitsu-cfab.yaml +++ b/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 diff --git a/environments/neutron-ml2-fujitsu-fossw.yaml b/environments/neutron-ml2-fujitsu-fossw.yaml index 8db8da7595..8ce4a58ffd 100644 --- a/environments/neutron-ml2-fujitsu-fossw.yaml +++ b/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 diff --git a/environments/neutron-ml2-vpp.yaml b/environments/neutron-ml2-vpp.yaml index 292a52f659..e2c5a39017 100644 --- a/environments/neutron-ml2-vpp.yaml +++ b/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 diff --git a/environments/neutron-ovs-dvr.yaml b/environments/neutron-ovs-dvr.yaml index 8f1db82d7e..e099f190b9 100644 --- a/environments/neutron-ovs-dvr.yaml +++ b/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 diff --git a/environments/neutron-plumgrid.yaml b/environments/neutron-plumgrid.yaml index 8794621137..72638b084a 100644 --- a/environments/neutron-plumgrid.yaml +++ b/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 diff --git a/environments/neutron-sriov.yaml b/environments/neutron-sriov.yaml index 284f6afe17..bff16dc64c 100644 --- a/environments/neutron-sriov.yaml +++ b/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'] diff --git a/environments/services-baremetal/neutron-lbaasv2.yaml b/environments/services-baremetal/neutron-lbaasv2.yaml index f66d27958e..ea6dd25030 100644 --- a/environments/services-baremetal/neutron-lbaasv2.yaml +++ b/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: diff --git a/environments/services-baremetal/neutron-opendaylight-sriov.yaml b/environments/services-baremetal/neutron-opendaylight-sriov.yaml index 2355c51415..69b54a065e 100644 --- a/environments/services-baremetal/neutron-opendaylight-sriov.yaml +++ b/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: diff --git a/environments/services-baremetal/neutron-opendaylight.yaml b/environments/services-baremetal/neutron-opendaylight.yaml index f65b8bfde8..38ddfe3186 100644 --- a/environments/services-baremetal/neutron-opendaylight.yaml +++ b/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 diff --git a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml b/environments/services-baremetal/neutron-ovn-dvr-ha.yaml index 20d51c499c..aebf077f81 100644 --- a/environments/services-baremetal/neutron-ovn-dvr-ha.yaml +++ b/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 diff --git a/environments/services-baremetal/neutron-ovn-ha.yaml b/environments/services-baremetal/neutron-ovn-ha.yaml index 46a47301fe..6ebe4f4482 100644 --- a/environments/services-baremetal/neutron-ovn-ha.yaml +++ b/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 diff --git a/environments/services-baremetal/neutron-sriov.yaml b/environments/services-baremetal/neutron-sriov.yaml index 46b035d9f5..d7b16aa930 100644 --- a/environments/services-baremetal/neutron-sriov.yaml +++ b/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'] diff --git a/environments/services/neutron-opendaylight-sriov.yaml b/environments/services/neutron-opendaylight-sriov.yaml index ae987a4b8b..e5f68abef4 100644 --- a/environments/services/neutron-opendaylight-sriov.yaml +++ b/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'] diff --git a/environments/services/neutron-opendaylight.yaml b/environments/services/neutron-opendaylight.yaml index 5f8357e126..47504d4b4a 100644 --- a/environments/services/neutron-opendaylight.yaml +++ b/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 diff --git a/environments/services/neutron-ovn-dvr-ha.yaml b/environments/services/neutron-ovn-dvr-ha.yaml index ddf80822a8..9b97fbe441 100644 --- a/environments/services/neutron-ovn-dvr-ha.yaml +++ b/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 diff --git a/environments/services/neutron-ovn-ha.yaml b/environments/services/neutron-ovn-ha.yaml index a9100d2e5e..e76aa4948d 100644 --- a/environments/services/neutron-ovn-ha.yaml +++ b/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 diff --git a/environments/services/neutron-ovn-sriov.yaml b/environments/services/neutron-ovn-sriov.yaml index 27a3e5bd9a..ee8b494865 100644 --- a/environments/services/neutron-ovn-sriov.yaml +++ b/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: diff --git a/environments/services/neutron-ovn-standalone.yaml b/environments/services/neutron-ovn-standalone.yaml index d9028ebd67..82e9dff0f3 100644 --- a/environments/services/neutron-ovn-standalone.yaml +++ b/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 diff --git a/environments/services/neutron-ovs-dvr.yaml b/environments/services/neutron-ovs-dvr.yaml index e880ad77a6..ca72cea308 100644 --- a/environments/services/neutron-ovs-dvr.yaml +++ b/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 diff --git a/environments/services/neutron-ovs.yaml b/environments/services/neutron-ovs.yaml index 7ede6ecd72..22ad4970bb 100644 --- a/environments/services/neutron-ovs.yaml +++ b/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 diff --git a/environments/services/neutron-sriov.yaml b/environments/services/neutron-sriov.yaml index 46b035d9f5..d7b16aa930 100644 --- a/environments/services/neutron-sriov.yaml +++ b/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'] diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index 0f840a1d1c..9bdc08c104 100644 --- a/environments/undercloud.yaml +++ b/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 diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 5ec9b42f8b..6a5715f7fb 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/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 diff --git a/sample-env-generator/enable-services.yaml b/sample-env-generator/enable-services.yaml index 1aa0100e90..67cfa15c73 100644 --- a/sample-env-generator/enable-services.yaml +++ b/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: diff --git a/sample-env-generator/networking.yaml b/sample-env-generator/networking.yaml index 2cfc37ac9c..f7b58ba23b 100644 --- a/sample-env-generator/networking.yaml +++ b/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