2f2d8183e6
When using neutron routed networks we need to specify either the subnet or a ip address in the fixed-ips-request when creating neutron ports. a) For the Vip's: Adds VipSubnetMap and VipSubnetMapDefaults parameters in service_net_map.yaml. The two maps are merged, so that the operator can override the subnet where VIP port should be hosted. For example: parameter_defaults: VipSubnetMap: ctlplane: ctlplane-leaf1 InternalApi: internal_api_leaf1 Storage: storage_leaf1 redis: internal_api_leaf1 b) For overcloud node ports: Enrich 'networks' in roles defenition to include both network and subnet data. Changes the list to a map instead of a list of strings. New schema: - name: <role_name> networks: <network_name> subnet: <subnet_name> For backward compatibility a conditional is used to check if the data is a map or not. In either case the internal list of role networks is created as '_role_networks' in the jinja2 templates. When the data is a map, and the map contains the 'subnet' key the subnet specified in roles_data.yaml is used as the subnet in the fixed-ips-reqest when ports are created. If subnet is not set (or role.networks is not a map) the default will be {{network.name_lower}}_subnet. Also, since the fixed_ips request passed to Vip ports are no longer [] by default, the conditinal has been updated to test for 'ip_address' entries in the request. Partial: blueprint tripleo-routed-networks-templates Depends-On: I773a38fd903fe287132151a4d178326a46890969 Change-Id: I77edc82723d00bfece6752b5dd2c79137db93443
57 lines
2.2 KiB
YAML
57 lines
2.2 KiB
YAML
###############################################################################
|
|
# Role: ComputeAlt #
|
|
###############################################################################
|
|
- name: ComputeAlt
|
|
description: |
|
|
Alternate Compute Node role
|
|
CountDefault: 0
|
|
networks:
|
|
InternalApi:
|
|
subnet: internal_api_subnet
|
|
Tenant:
|
|
subnet: tenant_subnet
|
|
Storage:
|
|
subnet: storage_subnet
|
|
HostnameFormatDefault: '%stackname%-novacomputealt-%index%'
|
|
disable_constraints: True
|
|
RoleParametersDefault:
|
|
TunedProfileName: "virtual-host"
|
|
ServicesDefault:
|
|
- OS::TripleO::Services::AuditD
|
|
- OS::TripleO::Services::BootParams
|
|
- OS::TripleO::Services::CACerts
|
|
- OS::TripleO::Services::CephClient
|
|
- OS::TripleO::Services::CephExternal
|
|
- OS::TripleO::Services::CertmongerUser
|
|
- OS::TripleO::Services::CollectdAlt
|
|
- OS::TripleO::Services::ComputeCeilometerAgentAlt
|
|
- OS::TripleO::Services::ComputeNeutronCorePlugin
|
|
- OS::TripleO::Services::ComputeNeutronL3Agent
|
|
- OS::TripleO::Services::ComputeNeutronMetadataAgent
|
|
- OS::TripleO::Services::ComputeNeutronOvsAgentAlt
|
|
- OS::TripleO::Services::FluentdAlt
|
|
- OS::TripleO::Services::IscsidAlt
|
|
- OS::TripleO::Services::Kernel
|
|
- OS::TripleO::Services::MySQLClient
|
|
- OS::TripleO::Services::NeutronBgpVpnBagpipe
|
|
- OS::TripleO::Services::NeutronLinuxbridgeAgent
|
|
- OS::TripleO::Services::NeutronVppAgent
|
|
- OS::TripleO::Services::NovaComputeAlt
|
|
- OS::TripleO::Services::NovaLibvirtAlt
|
|
- OS::TripleO::Services::NovaMigrationTargetAlt
|
|
- OS::TripleO::Services::OpenDaylightOvs
|
|
- OS::TripleO::Services::Podman
|
|
- OS::TripleO::Services::Rhsm
|
|
- OS::TripleO::Services::Securetty
|
|
- OS::TripleO::Services::SensuClientAlt
|
|
- OS::TripleO::Services::SkydiveAgent
|
|
- OS::TripleO::Services::Snmp
|
|
- OS::TripleO::Services::Sshd
|
|
- OS::TripleO::Services::Timesync
|
|
- OS::TripleO::Services::Timezone
|
|
- OS::TripleO::Services::TripleoFirewall
|
|
- OS::TripleO::Services::TripleoPackages
|
|
- OS::TripleO::Services::Tuned
|
|
- OS::TripleO::Services::Vpp
|
|
- OS::TripleO::Services::OVNControllerAlt
|