6687758c7a
The NeutronServer service mapping has been outdated for a while in favor of using the NeutronApi service name. Previously, the 2 service mappings just pointed at the same service template. This patch properly cleans up any old files still using NeutronServer, and adds a deprecation for the old mapping. An environment file is added to enable the old mapping if needed. This patch will be backported to train, and then the environment file can be removed in ussuri in a subsequent patch. Also cleans up an outdated FIXME comment in overcloud-resource-registry.j2.yaml. Change-Id: I48b969941c3c6cb1a5b39c8292f461c61b3dabd7
62 lines
2.6 KiB
YAML
62 lines
2.6 KiB
YAML
resource_registry:
|
|
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
|
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
|
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
|
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
|
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
|
OS::TripleO::Services::Keystone: OS::Heat::None
|
|
OS::TripleO::Services::GlanceApi: OS::Heat::None
|
|
OS::TripleO::Services::MySQL: OS::Heat::None
|
|
OS::TripleO::Services::MySQLClient: OS::Heat::None
|
|
OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
|
|
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
|
|
OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
|
|
OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
|
|
OS::TripleO::Services::NeutronApi: OS::Heat::None
|
|
OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None
|
|
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
|
|
OS::TripleO::Services::RabbitMQ: OS::Heat::None
|
|
OS::TripleO::Services::HAproxy: OS::Heat::None
|
|
OS::TripleO::Services::Keepalived: OS::Heat::None
|
|
OS::TripleO::Services::Memcached: OS::Heat::None
|
|
OS::TripleO::Services::NovaConductor: OS::Heat::None
|
|
OS::TripleO::Services::NovaApi: OS::Heat::None
|
|
OS::TripleO::Services::PlacementApi: OS::Heat::None
|
|
OS::TripleO::Services::NovaMetadata: OS::Heat::None
|
|
OS::TripleO::Services::NovaScheduler: OS::Heat::None
|
|
OS::TripleO::Services::NovaCompute: OS::Heat::None
|
|
OS::TripleO::Services::NovaLibvirt: OS::Heat::None
|
|
|
|
|
|
|
|
parameter_defaults:
|
|
# NOTE: CI envs have swap, which by default blocks Kubespray and Kubelet.
|
|
# https://github.com/kubernetes-incubator/kubespray/issues/1787#issuecomment-336155007
|
|
KubesprayIgnoreAssertErrors: true
|
|
|
|
ControllerServices:
|
|
- OS::TripleO::Services::CACerts
|
|
- OS::TripleO::Services::ContainerImagePrepare
|
|
- OS::TripleO::Services::Docker
|
|
- OS::TripleO::Services::Kernel
|
|
- OS::TripleO::Services::Snmp
|
|
- OS::TripleO::Services::Timesync
|
|
- OS::TripleO::Services::Timezone
|
|
- OS::TripleO::Services::TripleoPackages
|
|
- OS::TripleO::Services::TripleoFirewall
|
|
- OS::TripleO::Services::Sshd
|
|
- OS::TripleO::Services::Kubernetes::Master
|
|
- OS::TripleO::Services::Kubernetes::Worker
|
|
ComputeServices:
|
|
- OS::TripleO::Services::CACerts
|
|
- OS::TripleO::Services::Docker
|
|
- OS::TripleO::Services::Kernel
|
|
- OS::TripleO::Services::Snmp
|
|
- OS::TripleO::Services::Timesync
|
|
- OS::TripleO::Services::Timezone
|
|
- OS::TripleO::Services::TripleoPackages
|
|
- OS::TripleO::Services::TripleoFirewall
|
|
- OS::TripleO::Services::Sshd
|
|
- OS::TripleO::Services::Kubernetes::Worker
|
|
Debug: true
|