Merge "Add network-v2 default files + vip data examples" into stable/wallaby

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

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

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

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.
+#
+#
+[]

tools/yaml-validate.py

@@ -1245,7 +1245,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:

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