Browse Source

Switch remaining env files to containers defaults

Mark regular non-containerized services with FIXME
to be switched, once it is containerized

Do not mark yet an external/backend/plugin/host-config
related puppet services templates with that FIXME

Mark puppet/services/ceph- related templates as TODO
switch it to containerized ceph-ansible eventually, maybe.

Change-Id: Ib9fbad05eeb57dc641499fbf411cb5870da7a8e9
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
(cherry picked from commit 041251d473)
changes/13/567813/11
Bogdan Dobrelya 3 years ago
parent
commit
ed63b473c8
  1. 1
      environments/auditd.yaml
  2. 3
      environments/cavium-liquidio.yaml
  3. 4
      environments/cinder-backup.yaml
  4. 10
      environments/collectd-environment.yaml
  5. 4
      environments/compute-instanceha.yaml
  6. 2
      environments/docker-ha.yaml
  7. 2
      environments/docker-uc-light.yaml
  8. 2
      environments/docker.yaml
  9. 2
      environments/enable-internal-tls.yaml
  10. 2
      environments/enable_congress.yaml
  11. 2
      environments/enable_tacker.yaml
  12. 2
      environments/logging-environment.yaml
  13. 6
      environments/manila-cephfsnative-config.yaml
  14. 6
      environments/manila-isilon-config.yaml
  15. 6
      environments/manila-netapp-config.yaml
  16. 6
      environments/manila-unity-config.yaml
  17. 6
      environments/manila-vmax-config.yaml
  18. 6
      environments/manila-vnx-config.yaml
  19. 2
      environments/monitoring-environment.yaml
  20. 3
      environments/neutron-bgpvpn-bagpipe.yaml
  21. 2
      environments/neutron-bgpvpn-opendaylight.yaml
  22. 2
      environments/neutron-bgpvpn.yaml
  23. 2
      environments/neutron-l2gw-opendaylight.yaml
  24. 3
      environments/neutron-l2gw.yaml
  25. 1
      environments/neutron-linuxbridge.yaml
  26. 1
      environments/neutron-ml2-bigswitch.yaml
  27. 2
      environments/neutron-ml2-ovn-dvr-ha.yaml
  28. 2
      environments/neutron-ml2-ovn-ha.yaml
  29. 4
      environments/neutron-ml2-vpp.yaml
  30. 4
      environments/neutron-opendaylight-sriov.yaml
  31. 4
      environments/neutron-opendaylight.yaml
  32. 2
      environments/neutron-ovs-dpdk.yaml
  33. 3
      environments/neutron-ovs-dvr.yaml
  34. 4
      environments/neutron-sfc-opendaylight.yaml
  35. 1
      environments/neutron-sfc.yaml
  36. 2
      environments/neutron-sriov.yaml
  37. 10
      environments/nonha-arch.yaml
  38. 1
      environments/services/ptp.yaml
  39. 1
      environments/services/vpp.yaml
  40. 1
      environments/veritas-hyperscale/veritas-hyperscale-config.yaml
  41. 8
      overcloud-resource-registry-puppet.j2.yaml
  42. 2
      sample-env-generator/ssl.yaml

1
environments/auditd.yaml

@ -1,4 +1,5 @@
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::AuditD: ../puppet/services/auditd.yaml
parameter_defaults:

3
environments/cavium-liquidio.yaml

@ -1,6 +1,7 @@
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::LiquidioCompute: ../puppet/services/liquidio-compute-config.yaml
OS::TripleO::Services::NeutronMetadataAgent: ../puppet/services/neutron-metadata.yaml
OS::TripleO::Services::NeutronMetadataAgent: ../docker/services/neutron-metadata.yaml
parameter_defaults:
LiquidioSriovVfNum: 4

4
environments/cinder-backup.yaml

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

10
environments/collectd-environment.yaml

@ -1,5 +1,5 @@
resource_registry:
OS::TripleO::Services::Collectd: ../puppet/services/metrics/collectd.yaml
OS::TripleO::Services::Collectd: ../docker/services/collectd.yaml
# parameter_defaults:
#
@ -8,9 +8,9 @@ resource_registry:
#
################
#### Other config parameters, the values shown here are the defaults
################
################
#
# CollectdServerPort: 25826
# CollectdServerPort: 25826
# CollectdSecurityLevel: None
#
################
@ -21,7 +21,7 @@ resource_registry:
# CollectdUsername: user
# CollectdPassword: password
#
## CollectdDefaultPlugins, These are the default plugins used by collectd
## CollectdDefaultPlugins, These are the default plugins used by collectd
#
# CollectdDefaultPlugins:
# - disk
@ -30,7 +30,7 @@ resource_registry:
# - memory
# - processes
# - tcpconns
#
#
## Extra plugins can be enabled by the CollectdExtraPlugins parameter:
## All the plugins availables are:
#

4
environments/compute-instanceha.yaml

@ -1,8 +1,10 @@
# An environment which enables instance HA
# Needs to be combined with environments/puppet-pacemaker.yaml
# Needs to be combined with environments/services-baremetal/puppet-pacemaker.yaml
# or environments/docker-ha.yaml
# The ComputeInstanceHA *and* PacemakerRemote services need to be added
# to your Compute role
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::ComputeInstanceHA: ../puppet/services/pacemaker/compute-instanceha.yaml
parameter_defaults:

2
environments/docker-ha.yaml

@ -3,7 +3,9 @@
# ...deploy..-e docker.yaml -e docker-ha.yaml
resource_registry:
# Pacemaker runs on the host
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::Pacemaker: ../puppet/services/pacemaker.yaml
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::PacemakerRemote: ../puppet/services/pacemaker_remote.yaml
OS::TripleO::Tasks::ControllerPreConfig: OS::Heat::None
OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None

2
environments/docker-uc-light.yaml

@ -2,6 +2,8 @@
resource_registry:
OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
# 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::Services::ContainersLogrotateCrond: ../docker/services/logrotate-crond.yaml

2
environments/docker.yaml

@ -1,6 +1,8 @@
resource_registry:
OS::TripleO::Services::Docker: ../puppet/services/docker.yaml
# 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
#NOTE (dprince) add roles to be docker enabled as we support them

2
environments/enable-internal-tls.yaml

@ -13,11 +13,13 @@ parameter_defaults:
ipa_enroll: True
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::CertmongerUser: ../puppet/services/certmonger-user.yaml
OS::TripleO::Services::HAProxyInternalTLS: ../puppet/services/haproxy-internal-tls-certmonger.yaml
# We use apache as a TLS proxy
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::TLSProxyBase: ../puppet/services/apache.yaml
# Creates nova metadata that will create the extra service principals per

2
environments/enable_congress.yaml

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

2
environments/enable_tacker.yaml

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

2
environments/logging-environment.yaml

@ -2,7 +2,7 @@
## logging agents
resource_registry:
OS::TripleO::Services::Fluentd: ../puppet/services/logging/fluentd.yaml
OS::TripleO::Services::Fluentd: ../docker/services/fluentd.yaml
#parameter_defaults:

6
environments/manila-cephfsnative-config.yaml

@ -1,10 +1,10 @@
# A Heat environment file which can be used to enable a
# a Manila CephFS Native driver backend.
resource_registry:
OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml
# Only manila-share is pacemaker managed:
OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaBackendCephFs: ../puppet/services/manila-backend-cephfs.yaml

6
environments/manila-isilon-config.yaml

@ -1,9 +1,9 @@
# This environment file enables Manila with the Isilon backend.
resource_registry:
OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml
# Only manila-share is pacemaker managed:
OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaBackendIsilon: ../puppet/services/manila-backend-isilon.yaml
parameter_defaults:

6
environments/manila-netapp-config.yaml

@ -1,9 +1,9 @@
# This environment file enables Manila with the Netapp backend.
resource_registry:
OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml
# Only manila-share is pacemaker managed:
OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml
parameter_defaults:

6
environments/manila-unity-config.yaml

@ -1,9 +1,9 @@
# This environment file enables Manila with the Unity backend.
resource_registry:
OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml
# Only manila-share is pacemaker managed:
OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaBackendUnity: ../puppet/services/manila-backend-unity.yaml
parameter_defaults:

6
environments/manila-vmax-config.yaml

@ -1,9 +1,9 @@
# This environment file enables Manila with the VMAX backend.
resource_registry:
OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml
# Only manila-share is pacemaker managed:
OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaBackendVMAX: ../puppet/services/manila-backend-vmax.yaml
parameter_defaults:

6
environments/manila-vnx-config.yaml

@ -1,9 +1,9 @@
# This environment file enables Manila with the VNX backend.
resource_registry:
OS::TripleO::Services::ManilaApi: ../puppet/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../puppet/services/manila-scheduler.yaml
OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml
# Only manila-share is pacemaker managed:
OS::TripleO::Services::ManilaShare: ../puppet/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaBackendVNX: ../puppet/services/manila-backend-vnx.yaml
parameter_defaults:

2
environments/monitoring-environment.yaml

@ -1,7 +1,7 @@
## A Heat environment file which can be used to set up monitoring agents
resource_registry:
OS::TripleO::Services::SensuClient: ../puppet/services/monitoring/sensu-client.yaml
OS::TripleO::Services::SensuClient: ../docker/services/sensu-client.yaml
#parameter_defaults:
# MonitoringRabbitHost: 10.10.10.10

3
environments/neutron-bgpvpn-bagpipe.yaml

@ -7,7 +7,8 @@
# in OpenVSwitch.
#
resource_registry:
OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml
OS::TripleO::Services::NeutronBgpVpnApi: ../docker/services/neutron-bgpvpn-api.yaml
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::NeutronBgpVpnBagpipe: ../puppet/services/neutron-bgpvpn-bagpipe.yaml
parameter_defaults:

2
environments/neutron-bgpvpn-opendaylight.yaml

@ -5,7 +5,7 @@
#
# - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default
resource_registry:
OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml
OS::TripleO::Services::NeutronBgpVpnApi: ../docker/services/neutron-bgpvpn-api.yaml
parameter_defaults:
NeutronServicePlugins: 'odl-router_v2,trunk,bgpvpn'

2
environments/neutron-bgpvpn.yaml

@ -9,7 +9,7 @@
# - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default
# - Nuage: BGPVPN:Nuage:nuage_neutron.bgpvpn.services.service_drivers.driver.NuageBGPVPNDriver:default
resource_registry:
OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml
OS::TripleO::Services::NeutronBgpVpnApi: ../docker/services/neutron-bgpvpn-api.yaml
parameter_defaults:
NeutronServicePlugins: 'router,bgpvpn'

2
environments/neutron-l2gw-opendaylight.yaml

@ -5,7 +5,7 @@
#
# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default
resource_registry:
OS::TripleO::Services::NeutronL2gwApi: ../puppet/services/neutron-l2gw-api.yaml
OS::TripleO::Services::NeutronL2gwApi: ../docker/services/neutron-l2gw-api.yaml
parameter_defaults:
NeutronServicePlugins: "odl-router_v2,trunk,l2gw"

3
environments/neutron-l2gw.yaml

@ -7,7 +7,8 @@
# - L2 gateway agent: L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.rpc_l2gw.L2gwRpcDriver:default
# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default
resource_registry:
OS::TripleO::Services::NeutronL2gwApi: ../puppet/services/neutron-l2gw-api.yaml
OS::TripleO::Services::NeutronL2gwApi: ../docker/services/neutron-l2gw-api.yaml
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::NeutronL2gwAgent: ../puppet/services/neutron-l2gw-agent.yaml
parameter_defaults:

1
environments/neutron-linuxbridge.yaml

@ -2,6 +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
parameter_defaults:

1
environments/neutron-ml2-bigswitch.yaml

@ -3,6 +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::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None

2
environments/neutron-ml2-ovn-dvr-ha.yaml

@ -1,5 +1,5 @@
# A Heat environment file which can be used to enable OVN
# extensions, configured via puppet
# extensions, configured via docker
resource_registry:
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN
OS::TripleO::Services::OVNController: ../docker/services/ovn-controller.yaml

2
environments/neutron-ml2-ovn-ha.yaml

@ -1,5 +1,5 @@
# A Heat environment file which can be used to enable OVN
# extensions, configured via puppet
# extensions, configured via docker
resource_registry:
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN
OS::TripleO::Services::OVNController: ../docker/services/ovn-controller.yaml

4
environments/neutron-ml2-vpp.yaml

@ -3,8 +3,10 @@
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::Etcd: ../puppet/services/etcd.yaml
OS::TripleO::Services::Etcd: ../docker/services/etcd.yaml
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::Vpp: ../puppet/services/vpp.yaml
parameter_defaults:

4
environments/neutron-opendaylight-sriov.yaml

@ -1,7 +1,9 @@
# A Heat environment that can be used to deploy OpenDaylight with SRIOV
resource_registry:
# FIXME(bogdando): can not be switched yet due to puppet-base issues
# see https://review.openstack.org/#/c/563443
OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronSriovAgent: ../puppet/services/neutron-sriov-agent.yaml
OS::TripleO::Services::NeutronSriovAgent: ../docker/services/neutron-sriov-agent.yaml
parameter_defaults:
NeutronMechanismDrivers: ['sriovnicswitch','opendaylight_v2']

4
environments/neutron-opendaylight.yaml

@ -3,8 +3,10 @@ resource_registry:
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::NeutronCorePlugin: ../puppet/services/neutron-plugin-ml2-odl.yaml
OS::TripleO::Services::OpenDaylightApi: ../puppet/services/opendaylight-api.yaml
OS::TripleO::Services::OpenDaylightApi: ../docker/services/opendaylight-api.yaml
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None

2
environments/neutron-ovs-dpdk.yaml

@ -1,7 +1,7 @@
# 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: ../puppet/services/neutron-ovs-dpdk-agent.yaml
OS::TripleO::Services::ComputeNeutronOvsDpdk: ../docker/services/neutron-ovs-dpdk-agent.yaml
parameter_defaults:
NeutronDatapathType: "netdev"

3
environments/neutron-ovs-dvr.yaml

@ -2,8 +2,9 @@
# This works by configuring L3 and Metadata agents on the
# compute nodes.
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::ComputeNeutronL3Agent: ../puppet/services/neutron-l3-compute-dvr.yaml
OS::TripleO::Services::ComputeNeutronMetadataAgent: ../puppet/services/neutron-metadata.yaml
OS::TripleO::Services::ComputeNeutronMetadataAgent: ../docker/services/neutron-metadata.yaml
# With DVR enabled, the Compute nodes also need the br-ex bridge to be
# connected to a physical network.

4
environments/neutron-sfc-opendaylight.yaml

@ -1,11 +1,13 @@
# A Heat environment file that can be used to deploy Neutron SFC service with OpenDaylight
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::NeutronSfcApi: ../puppet/services/neutron-sfc-api.yaml
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: ../puppet/services/opendaylight-api.yaml
OS::TripleO::Services::OpenDaylightApi: ../docker/services/opendaylight-api.yaml
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::OpenDaylightOvs: ../puppet/services/opendaylight-ovs.yaml
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None

1
environments/neutron-sfc.yaml

@ -1,5 +1,6 @@
# A Heat environment file that can be used to deploy Neutron SFC service
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::NeutronSfcApi: ../puppet/services/neutron-sfc-api.yaml
parameter_defaults:

2
environments/neutron-sriov.yaml

@ -1,6 +1,6 @@
## A Heat environment that can be used to deploy SR-IOV
resource_registry:
OS::TripleO::Services::NeutronSriovAgent: ../puppet/services/neutron-sriov-agent.yaml
OS::TripleO::Services::NeutronSriovAgent: ../docker/services/neutron-sriov-agent.yaml
parameter_defaults:
NeutronMechanismDrivers: ['sriovnicswitch', 'openvswitch']

10
environments/nonha-arch.yaml

@ -5,11 +5,11 @@ resource_registry:
OS::TripleO::Tasks::ControllerPostConfig: OS::Heat::None
OS::TripleO::Tasks::ControllerPostPuppetRestart: OS::Heat::None
OS::TripleO::Services::CinderVolume: ../puppet/services/cinder-volume.yaml
OS::TripleO::Services::RabbitMQ: ../puppet/services/rabbitmq.yaml
OS::TripleO::Services::HAproxy: ../puppet/services/haproxy.yaml
OS::TripleO::Services::Redis: ../puppet/services/database/redis.yaml
OS::TripleO::Services::MySQL: ../puppet/services/database/mysql.yaml
OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml
OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.yaml
OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml
OS::TripleO::Services::Redis: ../docker/services/database/redis.yaml
OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml
OS::TripleO::Services::Keepalived: OS::Heat::None
OS::TripleO::Services::Pacemaker: OS::Heat::None
OS::TripleO::Services::PacemakerRemote: OS::Heat::None

1
environments/services/ptp.yaml

@ -2,6 +2,7 @@
resource_registry:
OS::TripleO::Services::Ntp: OS::Heat::None
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::Ptp: ../../puppet/services/time/ptp.yaml
parameter_defaults:

1
environments/services/vpp.yaml

@ -1,4 +1,5 @@
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::Vpp: ../../puppet/services/vpp.yaml
#parameter_defaults:

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

@ -15,6 +15,7 @@
# A Heat environment file which can be used to install
# Veritas HyperScale packages for controller.
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::VRTSHyperScale: ../../puppet/services/veritas-hyperscale-controller.yaml
parameter_defaults:

8
overcloud-resource-registry-puppet.j2.yaml

@ -129,7 +129,7 @@ resource_registry:
OS::TripleO::Services::UndercloudCinderApi: OS::Heat::None
OS::TripleO::Services::UndercloudCinderScheduler: OS::Heat::None
OS::TripleO::Services::UndercloudCinderVolume: OS::Heat::None
OS::TripleO::Services::BlockStorageCinderVolume: puppet/services/cinder-volume.yaml
OS::TripleO::Services::BlockStorageCinderVolume: docker/services/cinder-volume.yaml
OS::TripleO::Services::Congress: OS::Heat::None
OS::TripleO::Services::Keystone: docker/services/keystone.yaml
OS::TripleO::Services::GlanceApi: docker/services/glance-api.yaml
@ -172,7 +172,7 @@ resource_registry:
OS::TripleO::Services::OVNController: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginMidonet: puppet/services/neutron-midonet.yaml
OS::TripleO::Services::NeutronCorePluginVTS: puppet/services/neutron-plugin-ml2-cisco-vts.yaml
OS::TripleO::Services::NeutronCorePluginVTS: docker/services/neutron-plugin-ml2-cisco-vts.yaml
OS::TripleO::Services::NeutronOvsAgent: docker/services/neutron-ovs-agent.yaml
OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent: docker/services/neutron-ovs-agent.yaml
@ -187,7 +187,7 @@ resource_registry:
OS::TripleO::Services::HAProxyPublicTLS: OS::Heat::None
OS::TripleO::Services::HAProxyInternalTLS: OS::Heat::None
OS::TripleO::Services::Iscsid: docker/services/iscsid.yaml
OS::TripleO::Services::Keepalived: puppet/services/keepalived.yaml
OS::TripleO::Services::Keepalived: docker/services/keepalived.yaml
OS::TripleO::Services::Memcached: docker/services/memcached.yaml
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
@ -332,6 +332,8 @@ resource_registry:
OS::TripleO::Services::Ptp: OS::Heat::None
# 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::Services::Multipathd: docker/services/multipathd.yaml

2
sample-env-generator/ssl.yaml

@ -49,9 +49,11 @@ environments:
ipa_enroll: True
resource_registry:
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::CertmongerUser: ../../puppet/services/certmonger-user.yaml
OS::TripleO::Services::HAProxyInternalTLS: ../../puppet/services/haproxy-internal-tls-certmonger.yaml
# We use apache as a TLS proxy
# FIXME(bogdando): switch it, once it is containerized
OS::TripleO::Services::TLSProxyBase: ../../puppet/services/apache.yaml
# Creates nova metadata that will create the extra service principals per
# node.

Loading…
Cancel
Save