Merge "Add sample usage of StorageMgmt network for compute nodes"

[apex-tripleo-heat-templates.git] / network / config / bond-with-vlans / compute.yaml

diff --git a/network/config/bond-with-vlans/compute.yaml b/network/config/bond-with-vlans/compute.yaml
index 448d4e2..882402a 100644 (file)
--- a/network/config/bond-with-vlans/compute.yaml
+++ b/network/config/bond-with-vlans/compute.yaml
@@ -32,16 +32,14 @@ parameters:
     type: string
   BondInterfaceOvsOptions:
     default: ''
-    description: The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using
-      this option.
+    description: 'The ovs_options or bonding_options string for the bond
+      interface. Set things like lacp=active and/or bond_mode=balance-slb
+      for OVS bonds or like mode=4 for Linux bonds using this option.'
     type: string
     constraints:
     - allowed_pattern: ^((?!balance.tcp).)*$
       description: 'The balance-tcp bond mode is known to cause packet loss and
-
-        should not be used in BondInterfaceOvsOptions.
-
-        '
+        should not be used in BondInterfaceOvsOptions.'
   ExternalNetworkVlanID:
     default: 10
     description: Vlan ID for the external network traffic.
@@ -145,6 +143,12 @@ resources:
                   addresses:
                   - ip_netmask:
                       get_param: StorageIpSubnet
+                # Uncomment when including environments/hyperconverged-ceph.yaml
+                #- type: vlan
+                #  device: bond1
+                #  vlan_id: {get_param: StorageMgmtNetworkVlanID}
+                #  addresses:
+                #    - ip_netmask: {get_param: StorageMgmtIpSubnet}
                 - type: vlan
                   device: bond1
                   vlan_id:
@@ -155,16 +159,13 @@ resources:
                 # Uncomment when including environments/network-management.yaml
                 # If setting default route on the Management interface, comment
                 # out the default route on the Control Plane.
-                #-
-                #  type: vlan
+                #- type: vlan
                 #  device: bond1
                 #  vlan_id: {get_param: ManagementNetworkVlanID}
                 #  addresses:
-                #    -
-                #      ip_netmask: {get_param: ManagementIpSubnet}
+                #    - ip_netmask: {get_param: ManagementIpSubnet}
                 #  routes:
-                #    -
-                #      default: true
+                #    - default: true
                 #      next_hop: {get_param: ManagementInterfaceDefaultRoute}
 outputs:
   OS::stack_id: