openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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>
This commit is contained in:
Bogdan Dobrelya 2018-04-11 16:13:29 +02:00 committed by Emilien Macchi
parent c2b6211f6c
commit 041251d473
49 changed files with 107 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
environments/auditd.yaml
View File

@ -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
View File

@ -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
View File

@ -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

2
environments/collectd-environment.yaml
View File

@ -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:
#

4
environments/compute-instanceha.yaml
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

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

2
environments/enable_tempest.yaml
View File

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

2
environments/logging-environment.yaml
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -5,7 +5,7 @@
#
# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.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
View File

@ -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_v2.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
View File

@ -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
View File

@ -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

6
environments/neutron-ml2-ovn-dvr-ha.yaml
View File

@ -1,9 +1,9 @@
# 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: ../puppet/services/ovn-controller.yaml
OS::TripleO::Services::OVNDBs: ../puppet/services/pacemaker/ovn-dbs.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

6
environments/neutron-ml2-ovn-dvr.yaml
View File

@ -1,9 +1,9 @@
# 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: ../puppet/services/ovn-controller.yaml
OS::TripleO::Services::OVNDBs: ../puppet/services/ovn-dbs.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

8
environments/neutron-ml2-ovn-ha.yaml
View File

@ -1,10 +1,10 @@
# 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: ../puppet/services/ovn-controller.yaml
OS::TripleO::Services::OVNDBs: ../puppet/services/pacemaker/ovn-dbs.yaml
OS::TripleO::Services::OVNMetadataAgent: ../puppet/services/ovn-metadata.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

4
environments/neutron-ml2-ovn-hw-offload.yaml
View File

@ -2,8 +2,8 @@
# extensions, configured via puppet
resource_registry:
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN
OS::TripleO::Services::OVNController: ../puppet/services/ovn-controller.yaml
OS::TripleO::Services::OVNDBs: ../puppet/services/ovn-dbs.yaml
OS::TripleO::Services::OVNController: ../docker/services/ovn-controller.yaml
OS::TripleO::Services::OVNDBs: ../docker/services/ovn-dbs.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

8
environments/neutron-ml2-ovn.yaml
View File

@ -1,10 +1,10 @@
# 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: ../puppet/services/ovn-controller.yaml
OS::TripleO::Services::OVNDBs: ../puppet/services/ovn-dbs.yaml
OS::TripleO::Services::OVNMetadataAgent: ../puppet/services/ovn-metadata.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

4
environments/neutron-ml2-vpp.yaml
View File

@ -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:

3
environments/neutron-opendaylight-hw-offload.yaml
View File

@ -4,7 +4,8 @@ resource_registry:
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::NeutronSriovHostConfig: ../puppet/services/neutron-sriov-host-config.yaml
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None

4
environments/neutron-opendaylight-sriov.yaml
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -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/neutron-opendaylight-hw-offload.yaml
View File

@ -5,6 +5,7 @@ resource_registry:
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
# FIXME(bogdando): switch it, once it is containerized
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

1
environments/services/neutron-opendaylight.yaml
View File

@ -4,6 +4,7 @@ resource_registry:
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
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
OS::TripleO::Docker::NeutronMl2PluginBase: ../../puppet/services/neutron-plugin-ml2-odl.yaml

1
environments/services/ptp.yaml
View File

@ -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
View File

@ -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
View File

@ -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
View File

@ -119,7 +119,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
@ -163,7 +163,7 @@ resource_registry:
OS::TripleO::Services::NeutronCorePluginMLNXSDN: puppet/services/neutron-plugin-ml2-mlnx-sdn-assist.yaml
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
@ -180,7 +180,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
@ -336,6 +336,8 @@ resource_registry:
OS::TripleO::Services::DesignateSink: 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
View File

@ -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.