diff --git a/network-data-samples/vip-data-default-network-isolation.yaml b/network-data-samples/vip-data-default-network-isolation.yaml new file mode 100644 index 0000000000..898690f838 --- /dev/null +++ b/network-data-samples/vip-data-default-network-isolation.yaml @@ -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 diff --git a/network-data-samples/vip-data-fixed-ip.yaml b/network-data-samples/vip-data-fixed-ip.yaml new file mode 100644 index 0000000000..b481811b7d --- /dev/null +++ b/network-data-samples/vip-data-fixed-ip.yaml @@ -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 diff --git a/network-data-samples/vip-data-routed-networks.yaml b/network-data-samples/vip-data-routed-networks.yaml new file mode 100644 index 0000000000..ab3936d593 --- /dev/null +++ b/network-data-samples/vip-data-routed-networks.yaml @@ -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 diff --git a/network_data_default.yaml b/network_data_default.yaml new file mode 100644 index 0000000000..1e9938df2c --- /dev/null +++ b/network_data_default.yaml @@ -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. +# +# +[] \ No newline at end of file diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index f0cf372319..13e59a3409 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -1244,7 +1244,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: diff --git a/vip_data_default.yaml b/vip_data_default.yaml new file mode 100644 index 0000000000..36be352d71 --- /dev/null +++ b/vip_data_default.yaml @@ -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 \ No newline at end of file