Harald Jensås
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
38 lines
1.3 KiB
YAML
38 lines
1.3 KiB
YAML
###############################################################################
|
|
# Role: OpenShiftMaster #
|
|
###############################################################################
|
|
- name: OpenShiftMaster
|
|
description: |
|
|
OpenShiftMaster role
|
|
CountDefault: 1
|
|
RoleParametersDefault:
|
|
OpenShiftNodeGroupName: 'node-config-master'
|
|
DockerSkipUpdateReconfiguration: true
|
|
tags:
|
|
- primary
|
|
- controller
|
|
- openshift
|
|
networks:
|
|
External:
|
|
subnet: external_subnet
|
|
InternalApi:
|
|
subnet: internal_api_subnet
|
|
Storage:
|
|
subnet: storage_subnet
|
|
# For systems with both IPv4 and IPv6, you may specify a gateway network for
|
|
# each, such as ['ControlPlane', 'External']
|
|
default_route_networks: ['External']
|
|
ServicesDefault:
|
|
- OS::TripleO::Services::BootParams
|
|
- OS::TripleO::Services::ContainerImagePrepare
|
|
- OS::TripleO::Services::Docker
|
|
- OS::TripleO::Services::HAproxy
|
|
- OS::TripleO::Services::Keepalived
|
|
- OS::TripleO::Services::OpenShift::Master
|
|
- OS::TripleO::Services::Podman
|
|
- OS::TripleO::Services::Rhsm
|
|
- OS::TripleO::Services::Sshd
|
|
- OS::TripleO::Services::Timesync
|
|
- OS::TripleO::Services::TripleoFirewall
|
|
- OS::TripleO::Services::TripleoPackages
|