Browse Source
Default resource registry points to containerized services too, we shouldn't use docker.yaml anymore. Change-Id: I6106e223d9c1e399d396d745ad28274107074b06changes/54/611554/2
2 changed files with 10 additions and 71 deletions
@ -1,71 +1,3 @@
|
||||
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 |
||||
OS::TripleO::Services::NovaLibvirt: ../docker/services/nova-libvirt.yaml |
||||
OS::TripleO::Services::ComputeNeutronOvsAgent: ../docker/services/neutron-ovs-agent.yaml |
||||
OS::TripleO::Services::NovaCompute: ../docker/services/nova-compute.yaml |
||||
OS::TripleO::Services::Keystone: ../docker/services/keystone.yaml |
||||
OS::TripleO::Services::GlanceApi: ../docker/services/glance-api.yaml |
||||
OS::TripleO::Services::HeatApi: ../docker/services/heat-api.yaml |
||||
OS::TripleO::Services::HeatApiCfn: ../docker/services/heat-api-cfn.yaml |
||||
OS::TripleO::Services::HeatEngine: ../docker/services/heat-engine.yaml |
||||
OS::TripleO::Services::NovaApi: ../docker/services/nova-api.yaml |
||||
OS::TripleO::Services::NovaPlacement: ../docker/services/nova-placement.yaml |
||||
OS::TripleO::Services::NovaConductor: ../docker/services/nova-conductor.yaml |
||||
OS::TripleO::Services::NovaConsoleauth: ../docker/services/nova-consoleauth.yaml |
||||
OS::TripleO::Services::NovaMetadata: ../docker/services/nova-metadata.yaml |
||||
OS::TripleO::Services::NovaMigrationTarget: ../docker/services/nova-migration-target.yaml |
||||
OS::TripleO::Services::NovaScheduler: ../docker/services/nova-scheduler.yaml |
||||
OS::TripleO::Services::NovaVncProxy: ../docker/services/nova-vnc-proxy.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 |
||||
OS::TripleO::Services::NeutronMetadataAgent: ../docker/services/neutron-metadata.yaml |
||||
OS::TripleO::Services::NeutronOvsAgent: ../docker/services/neutron-ovs-agent.yaml |
||||
OS::TripleO::Services::NeutronDhcpAgent: ../docker/services/neutron-dhcp.yaml |
||||
OS::TripleO::Services::NeutronL3Agent: ../docker/services/neutron-l3.yaml |
||||
OS::TripleO::Services::HAproxy: ../docker/services/haproxy.yaml |
||||
OS::TripleO::Services::Keepalived: ../docker/services/keepalived.yaml |
||||
OS::TripleO::Services::MySQL: ../docker/services/database/mysql.yaml |
||||
OS::TripleO::Services::OsloMessagingRpc: ../docker/services/messaging/rpc-rabbitmq.yaml |
||||
OS::TripleO::Services::OsloMessagingNotify: ../docker/services/messaging/notify-rabbitmq-shared.yaml |
||||
OS::TripleO::Services::Qdr: ../docker/services/qdrouterd.yaml |
||||
OS::TripleO::Services::RabbitMQ: ../docker/services/rabbitmq.yaml |
||||
OS::TripleO::Services::Redis: ../docker/services/database/redis.yaml |
||||
OS::TripleO::Services::Memcached: ../docker/services/memcached.yaml |
||||
OS::TripleO::Services::Sshd: ../docker/services/sshd.yaml |
||||
OS::TripleO::Services::SwiftProxy: ../docker/services/swift-proxy.yaml |
||||
OS::TripleO::Services::SwiftStorage: ../docker/services/swift-storage.yaml |
||||
OS::TripleO::Services::SwiftRingBuilder: ../docker/services/swift-ringbuilder.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::AodhApi: ../docker/services/aodh-api.yaml |
||||
OS::TripleO::Services::AodhEvaluator: ../docker/services/aodh-evaluator.yaml |
||||
OS::TripleO::Services::AodhNotifier: ../docker/services/aodh-notifier.yaml |
||||
OS::TripleO::Services::AodhListener: ../docker/services/aodh-listener.yaml |
||||
OS::TripleO::Services::PankoApi: ../docker/services/panko-api.yaml |
||||
OS::TripleO::Services::CeilometerAgentCentral: ../docker/services/ceilometer-agent-central.yaml |
||||
OS::TripleO::Services::CeilometerAgentIpmi: ../docker/services/ceilometer-agent-ipmi.yaml |
||||
OS::TripleO::Services::ComputeCeilometerAgent: ../docker/services/ceilometer-agent-compute.yaml |
||||
OS::TripleO::Services::CeilometerAgentNotification: ../docker/services/ceilometer-agent-notification.yaml |
||||
OS::TripleO::Services::Horizon: ../docker/services/horizon.yaml |
||||
OS::TripleO::Services::Iscsid: ../docker/services/iscsid.yaml |
||||
OS::TripleO::Services::Multipathd: ../docker/services/multipathd.yaml |
||||
OS::TripleO::Services::ContainersLogrotateCrond: ../docker/services/logrotate-crond.yaml |
||||
OS::TripleO::Services::CinderApi: ../docker/services/cinder-api.yaml |
||||
OS::TripleO::Services::CinderScheduler: ../docker/services/cinder-scheduler.yaml |
||||
OS::TripleO::Services::CinderVolume: ../docker/services/cinder-volume.yaml |
||||
OS::TripleO::Services::Tempest: ../docker/services/tempest.yaml |
||||
# FIXME: Note we explicitely disable SwiftDispersion until a containerized version of it is merged |
||||
OS::TripleO::Services::SwiftDispersion: OS::Heat::None |
||||
|
||||
|
||||
# If SR-IOV is enabled on the compute nodes, it will need the SR-IOV |
||||
# host configuration. |
||||
OS::TripleO::Services::NeutronSriovHostConfig: OS::Heat::None |
||||
# DEPRECATED: Containerized deployments are now default. This file |
||||
# will be removed. |
||||
resource_registry: {} |
||||
|
@ -0,0 +1,7 @@
|
||||
--- |
||||
deprecations: |
||||
- | |
||||
The environments/docker.yaml is no longer necessary as the default |
||||
registry points to containerized services too. The environment |
||||
file is now deprecated (and emptied) and will be removed in the |
||||
future. |
Loading…
Reference in new issue