5f313f27c9
Presently the ovn-controller service (puppet/services/neutron-compute-plugin-ovn.yaml) is started only on compute nodes. But for the cases where the controller nodes provide the north/south traffic, we need ovn-controller service runninng in controller nodes as well. This patch - Renames the neutron-compute-plugin-ovn.yaml to ovn-controller.yaml which makes more sense and sets the service name as 'ovn-controller'. - Adds the service 'ovn-controller' to Controller and Compute roles. - Adds the missing 'upgrade_tasks' section in ovn-dbs.yaml and ovn-controller.yaml Depends-On: Ie3f09dc70a582f3d14de093043e232820f837bc3 Depends-On: Ide11569d81f5f28bafccc168b624be505174fc53 Change-Id: Ib7747406213d18fd65b86820c1f86ee7c39f7cf5
291 lines
16 KiB
YAML
291 lines
16 KiB
YAML
resource_registry:
|
|
|
|
OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
|
|
OS::TripleO::PostDeploySteps: puppet/post.yaml
|
|
OS::TripleO::PostUpgradeSteps: puppet/post-upgrade.yaml
|
|
OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
|
|
OS::TripleO::AllNodesDeployment: OS::Heat::StructuredDeployments
|
|
OS::TripleO::Hosts::SoftwareConfig: hosts-config.yaml
|
|
OS::TripleO::Ssh::HostPubKey: extraconfig/tasks/ssh/host_public_key.yaml
|
|
OS::TripleO::Ssh::KnownHostsConfig: extraconfig/tasks/ssh/known_hosts_config.yaml
|
|
OS::TripleO::DefaultPasswords: default_passwords.yaml
|
|
OS::TripleO::RandomString: OS::Heat::RandomString
|
|
|
|
# Tasks (for internal TripleO usage)
|
|
OS::TripleO::Tasks::UpdateWorkflow: OS::Heat::None
|
|
OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
|
|
|
|
{% for role in roles %}
|
|
OS::TripleO::{{role.name}}::PreNetworkConfig: OS::Heat::None
|
|
OS::TripleO::{{role.name}}PostDeploySteps: puppet/post.yaml
|
|
OS::TripleO::{{role.name}}: puppet/{{role.name.lower()}}-role.yaml
|
|
OS::TripleO::{{role.name}}Config: puppet/{{role.name.lower()}}-config.yaml
|
|
OS::TripleO::Tasks::{{role.name}}PreConfig: OS::Heat::None
|
|
OS::TripleO::Tasks::{{role.name}}PostConfig: OS::Heat::None
|
|
OS::TripleO::{{role.name}}ExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
|
|
# Port assignments for the {{role.name}} role
|
|
{%- if role.name != 'ObjectStorage' %}
|
|
{%- for network in networks %}
|
|
OS::TripleO::{{role.name}}::Ports::{{network.name}}Port: network/ports/noop.yaml
|
|
{%- endfor %}
|
|
{%- else %}
|
|
# Note we have to special-case ObjectStorage for backwards compatibility
|
|
{%- for network in networks %}
|
|
OS::TripleO::SwiftStorage::Ports::{{network.name}}Port: network/ports/noop.yaml
|
|
{%- endfor %}
|
|
{%- endif %}
|
|
OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-noop.yaml
|
|
{% endfor %}
|
|
|
|
# This resource registry entry will override the one generated by default
|
|
# in the jinja loop
|
|
OS::TripleO::Controller::Net::SoftwareConfig: net-config-bridge.yaml
|
|
|
|
OS::TripleO::ServiceServerMetadataHook: OS::Heat::None
|
|
|
|
OS::TripleO::Server: OS::Nova::Server
|
|
{% for role in roles %}
|
|
OS::TripleO::{{role.name}}Server: OS::TripleO::Server
|
|
{% endfor %}
|
|
|
|
# This creates the "heat-admin" user for all OS images by default
|
|
# To disable, replace with firstboot/userdata_default.yaml
|
|
OS::TripleO::NodeAdminUserData: firstboot/userdata_heat_admin.yaml
|
|
|
|
# Hooks for operator extra config
|
|
# NodeUserData == Cloud-init additional user-data, e.g cloud-config
|
|
# role::NodeUserData == Role specific cloud-init additional user-data
|
|
# ControllerExtraConfigPre == Controller configuration pre service deployment
|
|
# NodeExtraConfig == All nodes configuration pre service deployment
|
|
# NodeExtraConfigPost == All nodes configuration post service deployment
|
|
OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
|
|
{% for role in roles %}
|
|
OS::TripleO::{{role.name}}::NodeUserData: firstboot/userdata_default.yaml
|
|
{% endfor %}
|
|
OS::TripleO::NodeTLSCAData: OS::Heat::None
|
|
OS::TripleO::NodeTLSData: OS::Heat::None
|
|
OS::TripleO::NodeExtraConfig: puppet/extraconfig/pre_deploy/default.yaml
|
|
OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
|
|
|
|
# "AllNodes" Extra cluster config, runs on all nodes prior to the post_deploy
|
|
# phase, e.g when puppet is applied, but after the pre_deploy phase. Useful when
|
|
# configuration with knowledge of all nodes in the cluster is required vs single
|
|
# node configuration in the pre_deploy step.
|
|
# See extraconfig/all_nodes/* for examples
|
|
OS::TripleO::AllNodesExtraConfig: OS::Heat::None
|
|
|
|
# TripleO overcloud networks
|
|
OS::TripleO::Network: network/networks.yaml
|
|
|
|
{%- for network in networks %}
|
|
OS::TripleO::Network::{{network.name}}: OS::Heat::None
|
|
{%- endfor %}
|
|
|
|
OS::TripleO::Network::ExtraConfig: OS::Heat::None
|
|
|
|
OS::TripleO::Network::Ports::NetVipMap: network/ports/net_ip_map.yaml
|
|
OS::TripleO::Network::Ports::NetIpMap: network/ports/net_ip_map.yaml
|
|
OS::TripleO::Network::Ports::NetIpListMap: network/ports/net_ip_list_map.yaml
|
|
|
|
# Port assignments for the VIPs
|
|
{%- for network in networks if network.vip|default(false) %}
|
|
OS::TripleO::Network::Ports::{{network.name}}VipPort: network/ports/noop.yaml
|
|
{%- endfor %}
|
|
|
|
OS::TripleO::Network::Ports::RedisVipPort: network/ports/ctlplane_vip.yaml
|
|
OS::TripleO::Network::Ports::ControlPlaneVipPort: OS::Neutron::Port
|
|
|
|
# Service to network Mappings
|
|
OS::TripleO::ServiceNetMap: network/service_net_map.yaml
|
|
|
|
# Service Endpoint Mappings
|
|
OS::TripleO::EndpointMap: network/endpoints/endpoint_map.yaml
|
|
|
|
# validation resources
|
|
OS::TripleO::AllNodes::Validation: all-nodes-validation.yaml
|
|
|
|
# Upgrade resources
|
|
OS::TripleO::UpgradeConfig: puppet/upgrade_config.yaml
|
|
|
|
OS::TripleO::DeployedServerEnvironment: OS::Heat::None
|
|
|
|
# services
|
|
OS::TripleO::Services: common/services.yaml
|
|
OS::TripleO::Services::Apache: puppet/services/apache.yaml
|
|
OS::TripleO::Services::CACerts: puppet/services/ca-certs.yaml
|
|
OS::TripleO::Services::CephMds: OS::Heat::None
|
|
OS::TripleO::Services::CephMon: OS::Heat::None
|
|
OS::TripleO::Services::CephRbdMirror: OS::Heat::None
|
|
OS::TripleO::Services::CephRgw: OS::Heat::None
|
|
OS::TripleO::Services::CephOSD: OS::Heat::None
|
|
OS::TripleO::Services::CephClient: OS::Heat::None
|
|
OS::TripleO::Services::CephExternal: OS::Heat::None
|
|
OS::TripleO::Services::CinderApi: puppet/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::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::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::HeatApiCloudwatch: puppet/services/heat-api-cloudwatch.yaml
|
|
OS::TripleO::Services::HeatEngine: puppet/services/heat-engine.yaml
|
|
OS::TripleO::Services::Kernel: puppet/services/kernel.yaml
|
|
OS::TripleO::Services::MySQL: puppet/services/database/mysql.yaml
|
|
OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
|
|
OS::TripleO::Services::NeutronDhcpAgent: puppet/services/neutron-dhcp.yaml
|
|
OS::TripleO::Services::NeutronL2gwApi: OS::Heat::None
|
|
OS::TripleO::Services::NeutronL3Agent: puppet/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
|
|
# 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
|
|
# 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
|
|
# Neutron Core Plugin Vendors (these typically override NeutronCorePlugin)
|
|
OS::TripleO::Services::NeutronCorePluginML2OVN: puppet/services/neutron-plugin-ml2-ovn.yaml
|
|
OS::TripleO::Services::NeutronCorePluginPlumgrid: puppet/services/neutron-plugin-plumgrid.yaml
|
|
OS::TripleO::Services::NeutronCorePluginNuage: puppet/services/neutron-plugin-nuage.yaml
|
|
OS::TripleO::Services::NeutronCorePluginNSX: puppet/services/neutron-plugin-nsx.yaml
|
|
OS::TripleO::Services::OVNDBs: OS::Heat::None
|
|
OS::TripleO::Services::OVNController: OS::Heat::None
|
|
|
|
OS::TripleO::Services::NeutronCorePluginMidonet: puppet/services/neutron-midonet.yaml
|
|
OS::TripleO::Services::NeutronOvsAgent: puppet/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::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::RabbitMQ: puppet/services/rabbitmq.yaml
|
|
OS::TripleO::Services::Qdr: OS::Heat::None
|
|
OS::TripleO::Services::HAproxy: puppet/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::Keepalived: puppet/services/keepalived.yaml
|
|
OS::TripleO::Services::Memcached: puppet/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::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::Ntp: puppet/services/time/ntp.yaml
|
|
OS::TripleO::Services::SwiftProxy: puppet/services/swift-proxy.yaml
|
|
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::Snmp: puppet/services/snmp.yaml
|
|
OS::TripleO::Services::Tacker: OS::Heat::None
|
|
OS::TripleO::Services::Timezone: puppet/services/time/timezone.yaml
|
|
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::ComputeCeilometerAgent: puppet/services/ceilometer-agent-compute.yaml
|
|
OS::TripleO::Services::CeilometerAgentIpmi: puppet/services/ceilometer-agent-ipmi.yaml
|
|
OS::TripleO::Services::Horizon: puppet/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::UndercloudGnocchiApi: OS::Heat::None
|
|
OS::TripleO::Services::UndercloudGnocchiMetricd: OS::Heat::None
|
|
OS::TripleO::Services::UndercloudGnocchiStatsd: OS::Heat::None
|
|
# Services that are disabled by default (use relevant environment files):
|
|
OS::TripleO::Services::FluentdClient: OS::Heat::None
|
|
OS::TripleO::Services::Collectd: OS::Heat::None
|
|
OS::TripleO::LoggingConfiguration: puppet/services/logging/fluentd-config.yaml
|
|
OS::TripleO::Services::ManilaApi: OS::Heat::None
|
|
OS::TripleO::Services::ManilaScheduler: OS::Heat::None
|
|
OS::TripleO::Services::ManilaShare: OS::Heat::None
|
|
OS::TripleO::Services::ManilaBackendGeneric: OS::Heat::None
|
|
OS::TripleO::Services::ManilaBackendNetapp: OS::Heat::None
|
|
OS::TripleO::Services::ManilaBackendCephFs: OS::Heat::None
|
|
OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None
|
|
OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None
|
|
OS::TripleO::Services::BarbicanApi: 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-notifier.yaml
|
|
OS::TripleO::Services::AodhListener: puppet/services/aodh-listener.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::UndercloudPankoApi: OS::Heat::None
|
|
OS::TripleO::Services::MistralEngine: OS::Heat::None
|
|
OS::TripleO::Services::MistralApi: OS::Heat::None
|
|
OS::TripleO::Services::MistralExecutor: OS::Heat::None
|
|
OS::TripleO::Services::IronicApi: OS::Heat::None
|
|
OS::TripleO::Services::IronicConductor: OS::Heat::None
|
|
OS::TripleO::Services::IronicInspector: OS::Heat::None
|
|
OS::TripleO::Services::NovaIronic: OS::Heat::None
|
|
OS::TripleO::Services::TripleoPackages: puppet/services/tripleo-packages.yaml
|
|
OS::TripleO::Services::TripleoFirewall: puppet/services/tripleo-firewall.yaml
|
|
OS::TripleO::Services::OpenDaylightApi: OS::Heat::None
|
|
OS::TripleO::Services::OpenDaylightOvs: OS::Heat::None
|
|
OS::TripleO::Services::SensuClient: OS::Heat::None
|
|
OS::TripleO::Services::TLSProxyBase: OS::Heat::None
|
|
OS::TripleO::Services::Zaqar: OS::Heat::None
|
|
OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None
|
|
OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None
|
|
OS::TripleO::Services::CinderBackendDellPs: OS::Heat::None
|
|
OS::TripleO::Services::CinderBackendDellSc: OS::Heat::None
|
|
OS::TripleO::Services::CinderBackendNetApp: OS::Heat::None
|
|
OS::TripleO::Services::CinderBackendScaleIO: OS::Heat::None
|
|
OS::TripleO::Services::CinderBackendVRTSHyperScale: OS::Heat::None
|
|
OS::TripleO::Services::CinderHPELeftHandISCSI: OS::Heat::None
|
|
OS::TripleO::Services::Etcd: OS::Heat::None
|
|
OS::TripleO::Services::Ec2Api: OS::Heat::None
|
|
OS::TripleO::Services::AuditD: OS::Heat::None
|
|
OS::TripleO::Services::OctaviaApi: OS::Heat::None
|
|
OS::TripleO::Services::OctaviaHealthManager: OS::Heat::None
|
|
OS::TripleO::Services::OctaviaHousekeeping: OS::Heat::None
|
|
OS::TripleO::Services::OctaviaWorker: OS::Heat::None
|
|
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::CertmongerUser: OS::Heat::None
|
|
OS::TripleO::Services::Iscsid: OS::Heat::None
|
|
OS::TripleO::Services::Clustercheck: OS::Heat::None
|
|
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
|
|
|
|
parameter_defaults:
|
|
EnablePackageInstall: false
|
|
SoftwareConfigTransport: POLL_TEMP_URL
|
|
|
|
{% for role in roles %}
|
|
# Parameters generated for {{role.name}} Role
|
|
{{role.name}}Services: {{role.ServicesDefault|default([])}}
|
|
{% endfor %}
|