openstack
/
tripleo-heat-templates
Code Issues Proposed changes
Browse Source

Merge "Delete not-used services-docker files"

changes/96/560396/1
Zuul 4 years ago committed by Gerrit Code Review
parent
e9418e171c 6c5f2b8f69
commit
c83b38edb5
42 changed files with 13 additions and 475 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      environments/services-docker/barbican.yaml
  2. 4
      environments/services-docker/cinder-backup.yaml
  3. 2
      environments/services-docker/collectd.yaml
  4. 2
      environments/services-docker/congress.yaml
  5. 2
      environments/services-docker/ec2-api.yaml
  6. 2
      environments/services-docker/etcd.yaml
  7. 2
      environments/services-docker/fluentd.yaml
  8. 2
      environments/services-docker/ironic-inspector.yaml
  9. 7
      environments/services-docker/ironic.yaml
  10. 4
      environments/services-docker/manila.yaml
  11. 5
      environments/services-docker/mistral.yaml
  12. 12
      environments/services-docker/neutron-bgpvpn-opendaylight.yaml
  13. 18
      environments/services-docker/neutron-l2gw-opendaylight.yaml
  14. 37
      environments/services-docker/neutron-ml2-cisco-vts.yaml
  15. 37
      environments/services-docker/neutron-opendaylight-dpdk.yaml
  16. 31
      environments/services-docker/neutron-opendaylight-hw-offload.yaml
  17. 22
      environments/services-docker/neutron-opendaylight-sriov.yaml
  18. 16
      environments/services-docker/neutron-opendaylight.yaml
  19. 26
      environments/services-docker/neutron-ovn-dvr-ha.yaml
  20. 26
      environments/services-docker/neutron-ovn-dvr.yaml
  21. 33
      environments/services-docker/neutron-ovn-ha.yaml
  22. 44
      environments/services-docker/neutron-ovn-hw-offload.yaml
  23. 33
      environments/services-docker/neutron-ovn.yaml
  24. 11
      environments/services-docker/neutron-ovs-dpdk.yaml
  25. 24
      environments/services-docker/neutron-ovs-hw-offload.yaml
  26. 12
      environments/services-docker/neutron-sriov.yaml
  27. 16
      environments/services-docker/octavia.yaml
  28. 3
      environments/services-docker/sahara.yaml
  29. 3
      environments/services-docker/sensu-client.yaml
  30. 3
      environments/services-docker/skydive-environment.yaml
  31. 2
      environments/services-docker/tacker.yaml
  32. 5
      environments/services-docker/undercloud-aodh.yaml
  33. 4
      environments/services-docker/undercloud-ceilometer.yaml
  34. 4
      environments/services-docker/undercloud-cinder.yaml
  35. 5
      environments/services-docker/undercloud-gnocchi.yaml
  36. 2
      environments/services-docker/undercloud-haproxy.yaml
  37. 2
      environments/services-docker/undercloud-keepalived.yaml
  38. 2
      environments/services-docker/undercloud-panko.yaml
  39. 3
      environments/services-docker/zaqar.yaml
  40. 4
      environments/services/neutron-l2gw-opendaylight.yaml
  41. 2
      environments/services/tripleo-ui.yaml
  42. 10
      releasenotes/notes/containers-as-default-37bbe8afa0a60c2b.yaml

4
environments/services-docker/barbican.yaml
Unescape View File

@ -1,4 +0,0 @@
# A Heat environment file which can be used to enable
# Barbican with the default secret store backend.
resource_registry:
OS::TripleO::Services::BarbicanApi: ../../docker/services/barbican-api.yaml

4
environments/services-docker/cinder-backup.yaml
Unescape View File

@ -1,4 +0,0 @@
resource_registry:
OS::TripleO::Services::CinderBackup: ../../docker/services/pacemaker/cinder-backup.yaml
# For non-pcmk managed implementation
# OS::TripleO::Services::CinderBackup: ../../docker/services/cinder-backup.yaml

2
environments/services-docker/collectd.yaml
Unescape View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::Collectd: ../../docker/services/collectd.yaml

2
environments/services-docker/congress.yaml
Unescape View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::Congress: ../../docker/services/congress.yaml

2
environments/services-docker/ec2-api.yaml
Unescape View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::Ec2Api: ../../docker/services/ec2-api.yaml

2
environments/services-docker/etcd.yaml
Unescape View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::Etcd: ../../docker/services/etcd.yaml

2
environments/services-docker/fluentd.yaml
Unescape View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::Fluentd: ../../docker/services/fluentd.yaml

2
environments/services-docker/ironic-inspector.yaml
Unescape View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::IronicInspector: ../../docker/services/ironic-inspector.yaml

7
environments/services-docker/ironic.yaml
Unescape View File

@ -1,7 +0,0 @@
resource_registry:
OS::TripleO::Services::IronicApi: ../../docker/services/ironic-api.yaml
OS::TripleO::Services::IronicConductor: ../../docker/services/ironic-conductor.yaml
OS::TripleO::Services::IronicPxe: ../../docker/services/ironic-pxe.yaml
OS::TripleO::Services::NovaIronic: ../../docker/services/nova-ironic.yaml
parameter_defaults:
NovaSchedulerDiscoverHostsInCellsInterval: 15

4
environments/services-docker/manila.yaml
Unescape View File

@ -1,4 +0,0 @@
resource_registry:
OS::TripleO::Services::ManilaApi: ../../docker/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../../docker/services/manila-scheduler.yaml
OS::TripleO::Services::ManilaShare: ../../docker/services/manila-share.yaml

5
environments/services-docker/mistral.yaml
Unescape View File

@ -1,5 +0,0 @@
resource_registry:
OS::TripleO::Services::MistralEngine: ../../docker/services/mistral-engine.yaml
OS::TripleO::Services::MistralApi: ../../docker/services/mistral-api.yaml
OS::TripleO::Services::MistralExecutor: ../../docker/services/mistral-executor.yaml
OS::TripleO::Services::MistralEventEngine: ../../docker/services/mistral-event-engine.yaml

12
environments/services-docker/neutron-bgpvpn-opendaylight.yaml
Unescape View File

@ -1,12 +0,0 @@
# A Heat environment file that can be used to deploy Neutron BGPVPN service
#
# This environment file deploys Neutron BGPVPN service and configures
# Opendaylight as its service provider.
#
# - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default
resource_registry:
OS::TripleO::Services::NeutronBgpVpnApi: ../../docker/services/neutron-bgpvpn-api.yaml
parameter_defaults:
NeutronServicePlugins: 'odl-router_v2,trunk,bgpvpn'
BgpvpnServiceProvider: 'BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default'

18
environments/services-docker/neutron-l2gw-opendaylight.yaml
Unescape View File

@ -1,18 +0,0 @@
# A Heat environment file that can be used to deploy Neutron L2 Gateway service
#
# Currently there are only two service provider for Neutron L2 Gateway
# This file enables L2GW service with OpenDaylight as driver.
#
# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default
resource_registry:
OS::TripleO::Services::NeutronL2gwApi: ../../docker/services/neutron-l2gw-api.yaml
parameter_defaults:
NeutronServicePlugins: "odl-router_v2,trunk,l2gw"
L2gwServiceProvider: ['L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default']
# Optional
# L2gwServiceDefaultInterfaceName: "FortyGigE1/0/1"
# L2gwServiceDefaultDeviceName: "Switch1"
# L2gwServiceQuotaL2Gateway: 10
# L2gwServicePeriodicMonitoringInterval: 5

37
environments/services-docker/neutron-ml2-cisco-vts.yaml
Unescape View File

@ -1,37 +0,0 @@
# A docker enabled Heat environment file which can be used to enable Cisco VTS , configured via puppet
# By default the configuration has items required to deploy VPP/VPFA on all nodes + the cisco ML2 VTS driver
resource_registry:
OS::TripleO::Services::NeutronCorePluginVTS: ../../docker/services/neutron-plugin-ml2-cisco-vts.yaml
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginVTS
## Comment out below line when deploying VTS Agent on compute nodes instead of VPP/VPFA
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginVTS
parameter_defaults:
########################################
### Docker Cisco VTS Neutron images ###
########################################
DockerNeutronApiImage: 'repo/binary-neutron-cisco-vts'
DockerNeutronConfigImage: 'repo/binary-neutron-cisco-vts'
###################
### VTS General ###
###################
VTSUsername: 'admin'
#VTSPassword:
VTSServer: ''
VTSVMMID: ''
###################
### Neutron ML2 ###
###################
NeutronCorePlugin: 'neutron.plugins.ml2.plugin.Ml2Plugin'
NeutronMechanismDrivers: 'sriovnicswitch,cisco_vts'
NeutronTypeDrivers: 'vxlan,vlan,flat'
NeutronServicePlugins: 'cisco_vts_router,trunk'

37
environments/services-docker/neutron-opendaylight-dpdk.yaml
Unescape View File

@ -1,37 +0,0 @@
# A Heat environment that can be used to deploy OpenDaylight with L3 DVR and DPDK.
# This file is to be used with neutron-opendaylight.yaml
parameter_defaults:
NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
OpenDaylightSNATMechanism: 'controller'
ComputeOvsDpdkParameters:
OvsEnableDpdk: True
## Host configuration Parameters
#TunedProfileName: "cpu-partitioning"
#IsolCpusList: "" # Logical CPUs list to be isolated from the host process (applied via cpu-partitioning tuned).
# It is mandatory to provide isolated cpus for tuned to achive optimal performance.
# Example: "3-8,12-15,18"
#KernelArgs: "" # Space separated kernel args to configure hugepage and IOMMU.
# Deploying DPDK requires enabling hugepages for the overcloud compute nodes.
# It also requires enabling IOMMU when using the VFIO (vfio-pci) OvsDpdkDriverType.
# This should be done by configuring parameters via host-config-and-reboot.yaml environment file.
## Attempting to deploy DPDK without appropriate values for the below parameters may lead to unstable deployments
## due to CPU contention of DPDK PMD threads.
## It is highly recommended to to enable isolcpus (via KernelArgs) on compute overcloud nodes and set the following parameters:
#OvsDpdkSocketMemory: "" # Sets the amount of hugepage memory to assign per NUMA node.
# It is recommended to use the socket closest to the PCIe slot used for the
# desired DPDK NIC. Format should be comma separated per socket string such as:
# "<socket 0 mem MB>,<socket 1 mem MB>", for example: "1024,0".
#OvsDpdkDriverType: "vfio-pci" # Ensure the Overcloud NIC to be used for DPDK supports this UIO/PMD driver.
#OvsPmdCoreList: "" # List or range of CPU cores for PMD threads to be pinned to. Note, NIC
# location to cores on socket, number of hyper-threaded logical cores, and
# desired number of PMD threads can all play a role in configuring this setting.
# These cores should be on the same socket where OvsDpdkSocketMemory is assigned.
# If using hyperthreading then specify both logical cores that would equal the
# physical core. Also, specifying more than one core will trigger multiple PMD
# threads to be spawned, which may improve dataplane performance.
#NovaVcpuPinSet: "" # Cores to pin Nova instances to. For maximum performance, select cores
# on the same NUMA node(s) selected for previous settings.

31
environments/services-docker/neutron-opendaylight-hw-offload.yaml
Unescape View File

@ -1,31 +0,0 @@
# A Heat environment that can be used to deploy OpenDaylight with SRIOV
resource_registry:
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
OS::TripleO::Services::NeutronCorePlugin: ../../puppet/services/neutron-plugin-ml2-odl.yaml
OS::TripleO::Services::OpenDaylightApi: ../../docker/services/opendaylight-api.yaml
OS::TripleO::Services::OpenDaylightOvs: ../../puppet/services/opendaylight-ovs.yaml
OS::TripleO::Services::NeutronSriovHostConfig: ../../puppet/services/neutron-sriov-host-config.yaml
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
parameter_defaults:
NeutronEnableForceMetadata: true
NeutronPluginExtensions: 'port_security'
NeutronMechanismDrivers: ['opendaylight_v2']
NeutronServicePlugins: 'odl-router_v2,trunk'
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
# Kernel arguments for ComputeSriov node
ComputeSriovParameters:
KernelArgs: "intel_iommu=on iommu=pt"
OvsHwOffload: True
# Number of VFs that needs to be configured for a physical interface
#NeutronSriovNumVFs: ["ens3f0:4:switchdev"]
# Mapping of SR-IOV PF interface to neutron physical_network.
# In case of Vxlan/GRE physical_network should be null.
# In case of flat/vlan the physical_network should as configured in neutron.
#NovaPCIPassthrough:
# - devname: "ens3f0"
# physical_network: null

22
environments/services-docker/neutron-opendaylight-sriov.yaml
Unescape View File

@ -1,22 +0,0 @@
# A Heat environment that can be used to deploy OpenDaylight with SRIOV
# This file is to be used with neutron-opendaylight.yaml
resource_registry:
OS::TripleO::Services::ComputeNeutronCorePlugin: ../../docker/services/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronSriovAgent: ../../docker/services/neutron-sriov-agent.yaml
parameter_defaults:
NeutronMechanismDrivers: ['sriovnicswitch','opendaylight_v2']
# Add PciPassthroughFilter to the scheduler default filters
#NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
#NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
#NeutronPhysicalDevMappings: "datacentre:ens20f2"
# Number of VFs that needs to be configured for a physical interface
#NeutronSriovNumVFs: "ens20f2:5"
#NovaPCIPassthrough:
# - devname: "ens20f2"
# physical_network: "datacentre"

16
environments/services-docker/neutron-opendaylight.yaml
Unescape View File

@ -1,16 +0,0 @@
# A Heat environment that can be used to deploy OpenDaylight with L3 DVR using Docker containers
resource_registry:
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
OS::TripleO::Services::OpenDaylightApi: ../../docker/services/opendaylight-api.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
parameter_defaults:
NeutronEnableForceMetadata: true
NeutronPluginExtensions: 'port_security'
NeutronMechanismDrivers: 'opendaylight_v2'
NeutronServicePlugins: 'odl-router_v2,trunk'
OpenDaylightLogMechanism: 'console'

26
environments/services-docker/neutron-ovn-dvr-ha.yaml
Unescape View File

@ -1,26 +0,0 @@
# 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::Services::OVNController: ../../docker/services/ovn-controller.yaml
OS::TripleO::Services::OVNDBs: ../../docker/services/pacemaker/ovn-dbs.yaml
# Disabling Neutron services that overlap with OVN
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
parameter_defaults:
NeutronMechanismDrivers: ovn
OVNVifType: ovs
OVNNeutronSyncMode: log
OVNQosDriver: ovn-qos
OVNTunnelEncapType: geneve
NeutronEnableDHCPAgent: false
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: 'geneve'
NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ]
NeutronEnableDVR: true

26
environments/services-docker/neutron-ovn-dvr.yaml
Unescape View File

@ -1,26 +0,0 @@
# 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::Services::OVNController: ../../docker/services/ovn-controller.yaml
OS::TripleO::Services::OVNDBs: ../../docker/services/ovn-dbs.yaml
# Disabling Neutron services that overlap with OVN
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
parameter_defaults:
NeutronMechanismDrivers: ovn
OVNVifType: ovs
OVNNeutronSyncMode: log
OVNQosDriver: ovn-qos
OVNTunnelEncapType: geneve
NeutronEnableDHCPAgent: false
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: 'geneve'
NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ]
NeutronEnableDVR: true

33
environments/services-docker/neutron-ovn-ha.yaml
Unescape View File

@ -1,33 +0,0 @@
# 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::Services::OVNController: ../../docker/services/ovn-controller.yaml
OS::TripleO::Services::OVNDBs: ../../docker/services/pacemaker/ovn-dbs.yaml
OS::TripleO::Services::OVNMetadataAgent: ../../docker/services/ovn-metadata.yaml
# Disabling Neutron services that overlap with OVN
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
parameter_defaults:
NeutronMechanismDrivers: ovn
OVNVifType: ovs
OVNNeutronSyncMode: log
OVNQosDriver: ovn-qos
OVNTunnelEncapType: geneve
NeutronEnableDHCPAgent: false
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: 'geneve'
NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ]
NeutronPluginExtensions: "qos,port_security,dns"
ComputeParameters:
NeutronBridgeMappings: ""
ControllerParameters:
OVNCMSOptions: "enable-chassis-as-gw"
NetworkerParameters:
OVNCMSOptions: "enable-chassis-as-gw"

44
environments/services-docker/neutron-ovn-hw-offload.yaml
Unescape View File

@ -1,44 +0,0 @@
# 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::Services::OVNController: ../../docker/services/ovn-controller.yaml
OS::TripleO::Services::OVNDBs: ../../docker/services/ovn-dbs.yaml
OS::TripleO::Services::OVNMetadataAgent: ../../docker/services/ovn-metadata.yaml
OS::TripleO::Services::NeutronSriovHostConfig: ../../puppet/services/neutron-sriov-host-config.yaml
# Disabling Neutron services that overlap with OVN
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
parameter_defaults:
NeutronMechanismDrivers: ovn
OVNVifType: ovs
OVNNeutronSyncMode: log
OVNQosDriver: ovn-qos
OVNTunnelEncapType: geneve
NeutronEnableDHCPAgent: false
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: 'geneve'
NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ]
NeutronPluginExtensions: "qos,port_security,dns"
ComputeParameters:
NeutronBridgeMappings: ""
ControllerParameters:
OVNCMSOptions: "enable-chassis-as-gw"
ComputeSriovParameters:
KernelArgs: "intel_iommu=on iommu=pt"
OvsHwOffload: True
# Number of VFs that needs to be configured for a physical interface
#NeutronSriovNumVFs: ["enp2s0f0:4:switchdev"]
# Mapping of SR-IOV PF interface to neutron physical_network.
# In case of GENEVE physical_network should be null.
# In case of flat/vlan the physical_network should as configured in neutron.
#NovaPCIPassthrough:
# - devname: "enp2s0f0"
# physical_network: "datacentre"

33
environments/services-docker/neutron-ovn.yaml
Unescape View File

@ -1,33 +0,0 @@
# 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::Services::OVNController: ../../docker/services/ovn-controller.yaml
OS::TripleO::Services::OVNDBs: ../../docker/services/ovn-dbs.yaml
OS::TripleO::Services::OVNMetadataAgent: ../../docker/services/ovn-metadata.yaml
# Disabling Neutron services that overlap with OVN
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
parameter_defaults:
NeutronMechanismDrivers: ovn
OVNVifType: ovs
OVNNeutronSyncMode: log
OVNQosDriver: ovn-qos
OVNTunnelEncapType: geneve
NeutronEnableDHCPAgent: false
NeutronTypeDrivers: 'geneve,vlan,flat'
NeutronNetworkType: 'geneve'
NeutronServicePlugins: 'qos,ovn-router,trunk'
NeutronVniRanges: ['1:65536', ]
NeutronPluginExtensions: "qos,port_security,dns"
ComputeParameters:
NeutronBridgeMappings: ""
ControllerParameters:
OVNCMSOptions: "enable-chassis-as-gw"
NetworkerParameters:
OVNCMSOptions: "enable-chassis-as-gw"

11
environments/services-docker/neutron-ovs-dpdk.yaml
Unescape View File

@ -1,11 +0,0 @@
# A Heat environment that can be used to deploy DPDK with OVS
# Deploying DPDK requires enabling hugepages for the overcloud nodes
resource_registry:
OS::TripleO::Services::ComputeNeutronOvsDpdk: ../../docker/services/neutron-ovs-dpdk-agent.yaml
parameter_defaults:
NeutronDatapathType: "netdev"
NeutronVhostuserSocketDir: "/var/lib/vhost_sockets"
NovaSchedulerDefaultFilters: "RamFilter,ComputeFilter,AvailabilityZoneFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,NUMATopologyFilter"
OvsDpdkDriverType: "vfio-pci"

24
environments/services-docker/neutron-ovs-hw-offload.yaml
Unescape View File

@ -1,24 +0,0 @@
# A Heat environment file that enables OVS Hardware Offload in the overcloud.
# This works by configuring SR-IOV NIC with switchdev and OVS Hardware Offload on
# compute nodes. The feature supported in OVS 2.8.0
resource_registry:
OS::TripleO::Services::NeutronSriovHostConfig: ../../puppet/services/neutron-sriov-host-config.yaml
parameter_defaults:
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]
# Kernel arguments for ComputeSriov node
ComputeSriovParameters:
KernelArgs: "intel_iommu=on iommu=pt"
OvsHwOffload: True
# Number of VFs that needs to be configured for a physical interface
#NeutronSriovNumVFs: ["ens3f0:4:switchdev"]
# Mapping of SR-IOV PF interface to neutron physical_network.
# In case of Vxlan/GRE physical_network should be null.
# In case of flat/vlan the physical_network should as configured in neutron.
#NovaPCIPassthrough:
# - devname: "ens3f0"
# physical_network: null

12
environments/services-docker/neutron-sriov.yaml
Unescape View File

@ -1,12 +0,0 @@
# EXPERIMENTAL: The configuration enabled by this environment is not considered
# production-ready.
#
# A Heat environment that can be used to enable SR-IOV support in neutron.
resource_registry:
OS::TripleO::Services::NeutronSriovAgent: ../../docker/services/neutron-sriov-agent.yaml
OS::TripleO::Services::NeutronSriovHostConfig: ../../puppet/services/neutron-sriov-host-config.yaml
parameter_defaults:
NeutronMechanismDrivers: ['sriovnicswitch','openvswitch']
NovaSchedulerDefaultFilters: ['RetryFilter','AvailabilityZoneFilter','RamFilter','ComputeFilter','ComputeCapabilitiesFilter','ImagePropertiesFilter','ServerGroupAntiAffinityFilter','ServerGroupAffinityFilter','PciPassthroughFilter']
NovaSchedulerAvailableFilters: ["nova.scheduler.filters.all_filters","nova.scheduler.filters.pci_passthrough_filter.PciPassthroughFilter"]

16
environments/services-docker/octavia.yaml
Unescape View File

@ -1,16 +0,0 @@
resource_registry:
OS::TripleO::Services::OctaviaApi: ../../docker/services/octavia-api.yaml
OS::TripleO::Services::OctaviaHousekeeping: ../../docker/services/octavia-housekeeping.yaml
OS::TripleO::Services::OctaviaHealthManager: ../../docker/services/octavia-health-manager.yaml
OS::TripleO::Services::OctaviaWorker: ../../docker/services/octavia-worker.yaml
OS::TripleO::Services::OctaviaDeploymentConfig: ../../docker/services/octavia/octavia-deployment-config.yaml
parameter_defaults:
NeutronServicePlugins: "qos,router,trunk"
NeutronEnableForceMetadata: true
# This flag enables internal generation of certificates for communication
# with amphorae. Use OctaviaCaCert, OctaviaCaKey, OctaviaCaKeyPassphrase
# and OctaviaClient cert to configure secure production environments.
OctaviaGenerateCerts: true

3
environments/services-docker/sahara.yaml
Unescape View File

@ -1,3 +0,0 @@
resource_registry:
OS::TripleO::Services::SaharaApi: ../../docker/services/sahara-api.yaml
OS::TripleO::Services::SaharaEngine: ../../docker/services/sahara-engine.yaml

3
environments/services-docker/sensu-client.yaml
Unescape View File

@ -1,3 +0,0 @@
resource_registry:
OS::TripleO::Services::SensuClient: ../../docker/services/sensu-client.yaml

3
environments/services-docker/skydive-environment.yaml
Unescape View File

@ -1,3 +0,0 @@
resource_registry:
OS::TripleO::Services::SkydiveAgent: ../../docker/services/skydive/skydive-agent.yaml
OS::TripleO::Services::SkydiveAnalyzer: ../../docker/services/skydive/skydive-analyzer.yaml

2
environments/services-docker/tacker.yaml
Unescape View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::Tacker: ../../docker/services/tacker.yaml

5
environments/services-docker/undercloud-aodh.yaml
Unescape View File

@ -1,5 +0,0 @@
resource_registry:
OS::TripleO::Services::UndercloudAodhApi: ../../docker/services/aodh-api.yaml
OS::TripleO::Services::UndercloudAodhEvaluator: ../../docker/services/aodh-evaluator.yaml
OS::TripleO::Services::UndercloudAodhNotifier: ../../docker/services/aodh-notifier.yaml
OS::TripleO::Services::UndercloudAodhListener: ../../docker/services/aodh-listener.yaml

4
environments/services-docker/undercloud-ceilometer.yaml
Unescape View File

@ -1,4 +0,0 @@
resource_registry:
OS::TripleO::Services::UndercloudCeilometerAgentCentral: ../../docker/services/ceilometer-agent-central.yaml
OS::TripleO::Services::UndercloudCeilometerAgentNotification: ../../docker/services/ceilometer-agent-notification.yaml
OS::TripleO::Services::UndercloudCeilometerAgentIpmi: ../../docker/services/ceilometer-agent-ipmi.yaml

4
environments/services-docker/undercloud-cinder.yaml
Unescape View File

@ -1,4 +0,0 @@
resource_registry:
OS::TripleO::Services::UndercloudCinderApi: ../../docker/services/cinder-api.yaml
OS::TripleO::Services::UndercloudCinderScheduler: ../../docker/services/cinder-scheduler.yaml
OS::TripleO::Services::UndercloudCinderVolume: ../../docker/services/cinder-volume.yaml

5
environments/services-docker/undercloud-gnocchi.yaml
Unescape View File

@ -1,5 +0,0 @@
resource_registry:
OS::TripleO::Services::UndercloudGnocchiApi: ../../docker/services/gnocchi-api.yaml
OS::TripleO::Services::UndercloudGnocchiMetricd: ../../docker/services/gnocchi-metricd.yaml
OS::TripleO::Services::UndercloudGnocchiStatsd: ../../docker/services/gnocchi-statsd.yaml
OS::TripleO::Services::UndercloudRedis: ../../docker/services/database/redis.yaml

2
environments/services-docker/undercloud-haproxy.yaml
Unescape View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::UndercloudHAProxy: ../../docker/services/haproxy.yaml

2
environments/services-docker/undercloud-keepalived.yaml
Unescape View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::UndercloudKeepalived: ../../docker/services/keepalived.yaml

2
environments/services-docker/undercloud-panko.yaml
Unescape View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::UndercloudPankoApi: ../../docker/services/panko-api.yaml

3
environments/services-docker/zaqar.yaml
Unescape View File

@ -1,3 +0,0 @@
resource_registry:
OS::TripleO::Services::Zaqar: ../../docker/services/zaqar.yaml
OS::TripleO::Services::Redis : ../../docker/services/database/redis.yaml

4
environments/services/neutron-l2gw-opendaylight.yaml
Unescape View File

@ -3,13 +3,13 @@
# Currently there are only two service provider for Neutron L2 Gateway
# This file enables L2GW service with OpenDaylight as driver.
#
# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default
# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default
resource_registry:
OS::TripleO::Services::NeutronL2gwApi: ../../docker/services/neutron-l2gw-api.yaml
parameter_defaults:
NeutronServicePlugins: "odl-router_v2,trunk,l2gw"
L2gwServiceProvider: ['L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default']
L2gwServiceProvider: ['L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default']
# Optional
# L2gwServiceDefaultInterfaceName: "FortyGigE1/0/1"

2
environments/services/tripleo-ui.yaml
Unescape View File

@ -1,2 +1,2 @@
resource_registry:
OS::TripleO::Services::TripleoUI: ../../puppet/services/tripleo-ui.yaml
OS::TripleO::Services::TripleoUI: ../../docker/services/tripleo-ui.yaml

10
releasenotes/notes/containers-as-default-37bbe8afa0a60c2b.yaml
Unescape View File

@ -4,3 +4,13 @@ features:
Containers are now the default way of deploying. There is still a way to
deploy the baremetal services in environments/baremetal-services.yaml, but
this is expected to eventually disappear.
upgrade:
- |
Environment files originally referenced from `environments/services-docker`
should be altered to the `environments/services` paths. If some of the
deployed baremetal services need to be retained as non-containerized,
update its references to `environments/services-baremetal` instead of
`environments/services`.
.. note:: Starting from Rocky, overcloud upgrades to baremetal services
(non-containerized), or mixed services is no more tested nor verified.

Write Preview
Loading…
Cancel
Save