Merge "Add network-v2 default files + vip data examples"

This commit is contained in:
Zuul 2021-06-18 22:33:24 +00:00 committed by Gerrit Code Review
commit 2c4363561e
6 changed files with 131 additions and 1 deletions

View File

@ -0,0 +1,39 @@
# Exmaple vip data file for the default network-isolation scenario
#
# The vip data file should be a list of vip definitions, following is the
# configurable options for each vip entry.
#
# name:
# description:
# - Virtual IP name (optional)
# type: str
# network:
# description:
# - Neutron Network name
# type: str
# required: True
# ip_address:
# description:
# - IP address (Optional)
# type: str
# subnet:
# description:
# - Neutron Subnet name (Optional)
# type: str
# dns_name:
# description:
# - Dns Name
# type: str
# required: True
# default: overcloud
#
- network: storage_mgmt
dns_name: overcloud
- network: internal_api
dns_name: overcloud
- network: storage
dns_name: overcloud
- network: external
dns_name: overcloud
- network: ctlplane
dns_name: overcloud

View File

@ -0,0 +1,35 @@
# Example vip data entry specifying a fixed IP address
#
# The vip data file should be a list of vip definitions, following is the
# configurable options for each vip entry.
#
# name:
# description:
# - Virtual IP name (optional)
# type: str
# network:
# description:
# - Neutron Network name
# type: str
# required: True
# ip_address:
# description:
# - IP address (Optional)
# type: str
# subnet:
# description:
# - Neutron Subnet name (Optional)
# type: str
# dns_name:
# description:
# - Dns Name
# type: str
# required: True
# default: overcloud
#
- network: ctlplane
dns_name: overcloud
ip_address: 192.168.24.5
- network: external
dns_name: overcloud
ip_address: 10.0.0.5

View File

@ -0,0 +1,40 @@
# Example vip data file for a routed networks scenario where Virtual IPs need
# to be created on the specific subnet used by controller nodes.
#
# The vip data file should be a list of vip definitions, following is the
# configurable options for each vip entry.
#
# name:
# description:
# - Virtual IP name (optional)
# type: str
# network:
# description:
# - Neutron Network name
# type: str
# required: True
# ip_address:
# description:
# - IP address (Optional)
# type: str
# subnet:
# description:
# - Neutron Subnet name (Optional)
# type: str
# dns_name:
# description:
# - Dns Name
# type: str
# required: True
# default: overcloud
- network: storage_mgmt
subnet: storage_mgmt_subnet01
- network: internal_api
subnet: internal_api_subnet01
- network: storage
subnet: storage_subnet01
- network: external
subnet: external_subnet
- network: ctlplane
subnet: ctlplane-leaf1

View File

@ -0,0 +1,7 @@
# The default is to deploy with no network isolation. The ctlplane network
# is implicit, thus the default is an empty list of networks.
#
# Please refer to the sample files in network-data-samples folder.
#
#
[]

View File

@ -1209,7 +1209,8 @@ def validate(filename, param_map):
# definition instead.
if (filename.startswith('./network_data_') and
not filename.endswith(('routed.yaml',
'undercloud.yaml'))):
'undercloud.yaml',
'default.yaml'))):
result = validate_network_data_file(filename)
retval |= result
else:

8
vip_data_default.yaml Normal file
View File

@ -0,0 +1,8 @@
# The default is to deploy with no network isolation, with a virtual IP only
# on the ctlplane network.
#
# Please refer to the sample files in network-data-samples folder for examples
# for more advanced configuration.
#
- network: ctlplane
dns_name: overcloud