@ -124,42 +124,42 @@ resource_registry:
OS::TripleO::Services::CephClient : OS::Heat::None
OS::TripleO::Services::CephNfs : OS::Heat::None
OS::TripleO::Services::CephExternal : OS::Heat::None
OS::TripleO::Services::CinderApi : puppet /services/cinder-api.yaml
OS::TripleO::Services::CinderApi : docker /services/cinder-api.yaml
OS::TripleO::Services::CinderBackup : OS::Heat::None
OS::TripleO::Services::CinderScheduler : puppet /services/cinder-scheduler.yaml
OS::TripleO::Services::CinderVolume : puppet /services/cinder-volume.yaml
OS::TripleO::Services::CinderScheduler : docker /services/cinder-scheduler.yaml
OS::TripleO::Services::CinderVolume : docker /services/cinder-volume.yaml
# undercloud cinder services
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::Congress : OS::Heat::None
OS::TripleO::Services::Keystone : puppet /services/keystone.yaml
OS::TripleO::Services::GlanceApi : puppet /services/glance-api.yaml
OS::TripleO::Services::Keystone : docker /services/keystone.yaml
OS::TripleO::Services::GlanceApi : docker /services/glance-api.yaml
OS::TripleO::Services::GlanceRegistry : puppet/services/disabled/glance-registry-disabled.yaml
OS::TripleO::Services::HeatApi : puppet /services/heat-api.yaml
OS::TripleO::Services::HeatApiCfn : puppet /services/heat-api-cfn.yaml
OS::TripleO::Services::HeatApi : docker /services/heat-api.yaml
OS::TripleO::Services::HeatApiCfn : docker /services/heat-api-cfn.yaml
OS::TripleO::Services::HeatApiCloudwatch : puppet/services/disabled/heat-api-cloudwatch-disabled.yaml
OS::TripleO::Services::HeatEngine : puppet /services/heat-engine.yaml
OS::TripleO::Services::HeatEngine : docker /services/heat-engine.yaml
OS::TripleO::Services::Kernel : puppet/services/kernel.yaml
OS::TripleO::Services::Kubernetes::Master : extraconfig/services/kubernetes-master.yaml
OS::TripleO::Services::Kubernetes::Worker : extraconfig/services/kubernetes-worker.yaml
OS::TripleO::Services::MySQL : puppet /services/database/mysql.yaml
OS::TripleO::Services::MySQL : docker /services/database/mysql.yaml
OS::TripleO::Services::NeutronBgpVpnApi : OS::Heat::None
OS::TripleO::Services::NeutronBgpVpnBagpipe : OS::Heat::None
OS::TripleO::Services::NeutronSfcApi : OS::Heat::None
OS::TripleO::Services::NeutronDhcpAgent : puppet /services/neutron-dhcp.yaml
OS::TripleO::Services::NeutronDhcpAgent : docker /services/neutron-dhcp.yaml
OS::TripleO::Services::NeutronL2gwApi : OS::Heat::None
OS::TripleO::Services::NeutronL3Agent : puppet /services/neutron-l3.yaml
OS::TripleO::Services::NeutronL3Agent : docker /services/neutron-l3.yaml
OS::TripleO::Services::NeutronL2gwAgent : OS::Heat::None
OS::TripleO::Services::NeutronLbaasv2Agent : OS::Heat::None
OS::TripleO::Services::NeutronMetadataAgent : puppet /services/neutron-metadata.yaml
OS::TripleO::Services::NeutronMetadataAgent : docker /services/neutron-metadata.yaml
OS::TripleO::Services::OVNMetadataAgent : OS::Heat::None
# FIXME(shardy) the duplicate NeutronServer line can be removed when we've updated
# the multinode job ControllerServices after this patch merges
OS::TripleO::Services::NeutronServer : puppet /services/neutron-api.yaml
OS::TripleO::Services::NeutronApi : puppet /services/neutron-api.yaml
OS::TripleO::Services::NeutronCorePlugin : puppet /services/neutron-plugin-ml2.yaml
OS::TripleO::Services::NeutronServer : docker /services/neutron-api.yaml
OS::TripleO::Services::NeutronApi : docker /services/neutron-api.yaml
OS::TripleO::Services::NeutronCorePlugin : docker /services/neutron-plugin-ml2.yaml
# can be the same as NeutronCorePlugin but some vendors install different
# things where VMs run
OS::TripleO::Services::ComputeNeutronCorePlugin : puppet/services/neutron-plugin-ml2.yaml
@ -175,48 +175,48 @@ resource_registry:
OS::TripleO::Services::NeutronCorePluginMidonet : puppet/services/neutron-midonet.yaml
OS::TripleO::Services::NeutronCorePluginVTS : puppet/services/neutron-plugin-ml2-cisco-vts.yaml
OS::TripleO::Services::NeutronOvsAgent : puppet /services/neutron-ovs-agent.yaml
OS::TripleO::Services::NeutronOvsAgent : docker /services/neutron-ovs-agent.yaml
OS::TripleO::Services::NeutronLinuxbridgeAgent : OS::Heat::None
OS::TripleO::Services::ComputeNeutronOvsAgent : puppet /services/neutron-ovs-agent.yaml
OS::TripleO::Services::ComputeNeutronOvsAgent : docker /services/neutron-ovs-agent.yaml
OS::TripleO::Services::ComputeNeutronOvsDpdk : OS::Heat::None
OS::TripleO::Services::Pacemaker : OS::Heat::None
OS::TripleO::Services::PacemakerRemote : OS::Heat::None
OS::TripleO::Services::NeutronSriovAgent : OS::Heat::None
OS::TripleO::Services::NeutronSriovHostConfig : OS::Heat::None
OS::TripleO::Services::RabbitMQ : puppet /services/rabbitmq.yaml
OS::TripleO::Services::Qdr : OS::Heat::None
OS::TripleO::Services::HAproxy : puppet /services/haproxy.yaml
OS::TripleO::Services::RabbitMQ : docker /services/rabbitmq.yaml
OS::TripleO::Services::Qdr : docker/services/qdrouterd.yaml
OS::TripleO::Services::HAproxy : docker /services/haproxy.yaml
OS::TripleO::Services::HAProxyPublicTLS : OS::Heat::None
OS::TripleO::Services::HAProxyInternalTLS : OS::Heat::None
OS::TripleO::Services::Iscsid : puppet /services/iscsid.yaml
OS::TripleO::Services::Iscsid : docker /services/iscsid.yaml
OS::TripleO::Services::Keepalived : puppet/services/keepalived.yaml
OS::TripleO::Services::Memcached : puppet /services/memcached.yaml
OS::TripleO::Services::Memcached : docker /services/memcached.yaml
OS::TripleO::Services::SaharaApi : OS::Heat::None
OS::TripleO::Services::SaharaEngine : OS::Heat::None
OS::TripleO::Services::Tuned : puppet/services/tuned.yaml
OS::TripleO::Services::Securetty : OS::Heat::None
OS::TripleO::Services::Sshd : puppet/services/sshd.yaml
OS::TripleO::Services::Redis : puppet/services/database/redis.yaml
OS::TripleO::Services::NovaConductor : puppet/services/nova-conductor.yaml
OS::TripleO::Services::Sshd : docker/services/sshd.yaml
OS::TripleO::Services::Redis : docker/services/database/redis.yaml
OS::TripleO::Services::MongoDb : puppet/services/disabled/mongodb-disabled.yaml
OS::TripleO::Services::NovaApi : puppet/services/nova-api.yaml
OS::TripleO::Services::NovaPlacement : puppet/services/nova-placement.yaml
OS::TripleO::Services::NovaMetadata : puppet/services/nova-metadata.yaml
OS::TripleO::Services::NovaScheduler : puppet/services/nova-scheduler.yaml
OS::TripleO::Services::NovaConsoleauth : puppet/services/nova-consoleauth.yaml
OS::TripleO::Services::NovaVncProxy : puppet/services/nova-vnc-proxy.yaml
OS::TripleO::Services::NovaCompute : puppet/services/nova-compute.yaml
OS::TripleO::Services::NovaLibvirt : puppet/services/nova-libvirt.yaml
OS::TripleO::Services::NovaMigrationTarget : puppet/services/nova-migration-target.yaml
OS::TripleO::Services::NovaApi : docker/services/nova-api.yaml
OS::TripleO::Services::NovaCompute : docker/services/nova-compute.yaml
OS::TripleO::Services::NovaConductor : docker/services/nova-conductor.yaml
OS::TripleO::Services::NovaConsoleauth : docker/services/nova-consoleauth.yaml
OS::TripleO::Services::NovaLibvirt : docker/services/nova-libvirt.yaml
OS::TripleO::Services::NovaMetadata : docker/services/nova-metadata.yaml
OS::TripleO::Services::NovaMigrationTarget : docker/services/nova-migration-target.yaml
OS::TripleO::Services::NovaPlacement : docker/services/nova-placement.yaml
OS::TripleO::Services::NovaScheduler : docker/services/nova-scheduler.yaml
OS::TripleO::Services::NovaVncProxy : docker/services/nova-vnc-proxy.yaml
OS::TripleO::Services::Ntp : puppet/services/time/ntp.yaml
OS::TripleO::Services::ContainersLogrotateCrond : OS::Heat::None
OS::TripleO::Services::ContainersLogrotateCrond : docker/services/logrotate-crond.yaml
OS::TripleO::Services::OpenShift::Master : OS::Heat::None
OS::TripleO::Services::OpenShift::Worker : OS::Heat::None
OS::TripleO::Services::SwiftProxy : puppet /services/swift-proxy.yaml
OS::TripleO::Services::SwiftDispersion : puppet/services/swift-dispersion.yaml
OS::TripleO::Services::SwiftProxy : docker /services/swift-proxy.yaml
OS::TripleO::Services::SwiftDispersion : OS::Heat::None
OS::TripleO::Services::ExternalSwiftProxy : OS::Heat::None
OS::TripleO::Services::SwiftStorage : puppet /services/swift-storage.yaml
OS::TripleO::Services::SwiftRingBuilder : puppet /services/swift-ringbuilder.yaml
OS::TripleO::Services::SwiftStorage : docker /services/swift-storage.yaml
OS::TripleO::Services::SwiftRingBuilder : docker /services/swift-ringbuilder.yaml
OS::TripleO::Services::Snmp : puppet/services/snmp.yaml
OS::TripleO::Services::Tacker : OS::Heat::None
OS::TripleO::Services::Timezone : puppet/services/time/timezone.yaml
@ -224,20 +224,20 @@ resource_registry:
OS::TripleO::Services::CeilometerApi : puppet/services/disabled/ceilometer-api-disabled.yaml
OS::TripleO::Services::CeilometerCollector : puppet/services/disabled/ceilometer-collector-disabled.yaml
OS::TripleO::Services::CeilometerExpirer : puppet/services/disabled/ceilometer-expirer-disabled.yaml
OS::TripleO::Services::CeilometerAgentCentral : puppet /services/ceilometer-agent-central.yaml
OS::TripleO::Services::CeilometerAgentNotification : puppet/services/ceilometer-agent-notification .yaml
OS::TripleO::Services::ComputeC eilometerAgent : puppet/services/ceilometer-agent-compute .yaml
OS::TripleO::Services::CeilometerAgentIpmi : puppet/services/ceilometer-agent-ipmi .yaml
OS::TripleO::Services::Horizon : puppet /services/horizon.yaml
OS::TripleO::Services::CeilometerAgentCentral : docker /services/ceilometer-agent-central.yaml
OS::TripleO::Services::CeilometerAgentIpmi : docker/services/ceilometer-agent-ipmi .yaml
OS::TripleO::Services::CeilometerAgentNotification : docker/services/ceilometer-agent-notification .yaml
OS::TripleO::Services::ComputeC eilometerAgent : docker/services/ceilometer-agent-compute .yaml
OS::TripleO::Services::Horizon : docker /services/horizon.yaml
# Undercloud Telemetry services
OS::TripleO::Services::UndercloudCeilometerAgentCentral : OS::Heat::None
OS::TripleO::Services::UndercloudCeilometerAgentNotification : OS::Heat::None
OS::TripleO::Services::UndercloudCeilometerAgentIpmi : OS::Heat::None
#Gnocchi services
OS::TripleO::Services::GnocchiApi : puppet /services/gnocchi-api.yaml
OS::TripleO::Services::GnocchiMetricd : puppet /services/gnocchi-metricd.yaml
OS::TripleO::Services::GnocchiStatsd : puppet /services/gnocchi-statsd.yaml
OS::TripleO::Services::GnocchiApi : docker /services/gnocchi-api.yaml
OS::TripleO::Services::GnocchiMetricd : docker /services/gnocchi-metricd.yaml
OS::TripleO::Services::GnocchiStatsd : docker /services/gnocchi-statsd.yaml
OS::TripleO::Services::UndercloudGnocchiApi : OS::Heat::None
OS::TripleO::Services::UndercloudGnocchiMetricd : OS::Heat::None
OS::TripleO::Services::UndercloudGnocchiStatsd : OS::Heat::None
@ -271,15 +271,15 @@ resource_registry:
OS::TripleO::Services::BarbicanBackendDogtag : OS::Heat::None
OS::TripleO::Services::BarbicanBackendKmip : OS::Heat::None
OS::TripleO::Services::BarbicanBackendPkcs11Crypto : OS::Heat::None
OS::TripleO::Services::AodhApi : puppet /services/aodh-api.yaml
OS::TripleO::Services::AodhEvaluator : puppet /services/aodh-evaluator.yaml
OS::TripleO::Services::AodhNotifier : puppet/services/aodh-notifi er.yaml
OS::TripleO::Services::AodhListener : puppet/services/aodh-listen er.yaml
OS::TripleO::Services::AodhApi : docker /services/aodh-api.yaml
OS::TripleO::Services::AodhEvaluator : docker /services/aodh-evaluator.yaml
OS::TripleO::Services::AodhListener : docker/services/aodh-listen er.yaml
OS::TripleO::Services::AodhNotifier : docker/services/aodh-notifi er.yaml
OS::TripleO::Services::UndercloudAodhApi : OS::Heat::None
OS::TripleO::Services::UndercloudAodhEvaluator : OS::Heat::None
OS::TripleO::Services::UndercloudAodhNotifier : OS::Heat::None
OS::TripleO::Services::UndercloudAodhListener : OS::Heat::None
OS::TripleO::Services::PankoApi : puppet /services/panko-api.yaml
OS::TripleO::Services::PankoApi : docker /services/panko-api.yaml
OS::TripleO::Services::UndercloudPankoApi : OS::Heat::None
OS::TripleO::Services::MistralEngine : OS::Heat::None
OS::TripleO::Services::MistralApi : OS::Heat::None
@ -319,7 +319,7 @@ resource_registry:
OS::TripleO::Services::MySQLClient : puppet/services/database/mysql-client.yaml
OS::TripleO::Services::Vpp : OS::Heat::None
OS::TripleO::Services::NeutronVppAgent : OS::Heat::None
OS::TripleO::Services::Docker : OS::Heat::None
OS::TripleO::Services::Docker : puppet/services/docker.yaml
OS::TripleO::Services::DockerRegistry : OS::Heat::None
OS::TripleO::Services::CertmongerUser : OS::Heat::None
OS::TripleO::Services::Clustercheck : OS::Heat::None
@ -331,6 +331,10 @@ resource_registry:
OS::TripleO::Services::ComputeInstanceHA : OS::Heat::None
OS::TripleO::Services::Ptp : OS::Heat::None
# Default Neutron ML2 puppet plugin to use when NeutronCorePlugin is set to ML2
OS::TripleO::Docker::NeutronMl2PluginBase : puppet/services/neutron-plugin-ml2.yaml
OS::TripleO::Services::Multipathd : docker/services/multipathd.yaml
# Logging
OS::TripleO::Services::Logging::BarbicanApi : docker/services/logging/files/barbican-api.yaml
OS::TripleO::Services::Logging::GlanceApi : docker/services/logging/files/glance-api.yaml