Add BondInterfaceOvsOptions parameter

This patch adds a new BondInterfaceOvsOptions to the
bond-with-vlans network config templates. This can
be used to configure things like LACP or the bonding mode
via a nested stack heat parameter.

The patch also removes the hard coded ovs_options relating
to both bond-with-vlans and single-nic-with-vlans configurations
which do not actually require this setting to be hard coded
because by default OVS trunks vlan ports automatically.

Change-Id: I3effbccba8ed7ed28d6ba715e5709275d4e7f984

10 files changed, 30 insertions, 10 deletions

diff --git a/network/config/bond-with-vlans/ceph-storage.yaml b/network/config/bond-with-vlans/ceph-storage.yaml
index 39beee5a..69e85b93 100644
--- a/network/config/bond-with-vlans/ceph-storage.yaml
+++ b/network/config/bond-with-vlans/ceph-storage.yaml
@@ -25,6 +25,11 @@ parameters:
     default: ''
     description: IP address/subnet on the tenant network
     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.
+    type: string
 
 resources:
   OsNetConfigImpl:
@@ -51,7 +56,7 @@ resources:
                 -
                   type: ovs_bond
                   name: bond1
-                  ovs_options: vlan_mode=trunk trunks=10,20,30,40,50
+                  ovs_options: {get_param: BondInterfaceOvsOptions}
                   members:
                     -
                       type: interface
diff --git a/network/config/bond-with-vlans/cinder-storage.yaml b/network/config/bond-with-vlans/cinder-storage.yaml
index 6a244c5a..0441565d 100644
--- a/network/config/bond-with-vlans/cinder-storage.yaml
+++ b/network/config/bond-with-vlans/cinder-storage.yaml
@@ -25,6 +25,11 @@ parameters:
     default: ''
     description: IP address/subnet on the tenant network
     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.
+    type: string
 
 resources:
   OsNetConfigImpl:
@@ -51,7 +56,7 @@ resources:
                 -
                   type: ovs_bond
                   name: bond1
-                  ovs_options: vlan_mode=trunk trunks=10,20,30,40,50
+                  ovs_options: {get_param: BondInterfaceOvsOptions}
                   members:
                     -
                       type: interface
diff --git a/network/config/bond-with-vlans/compute.yaml b/network/config/bond-with-vlans/compute.yaml
index d7113c8c..d9d15ad1 100644
--- a/network/config/bond-with-vlans/compute.yaml
+++ b/network/config/bond-with-vlans/compute.yaml
@@ -25,6 +25,11 @@ parameters:
     default: ''
     description: IP address/subnet on the tenant network
     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.
+    type: string
 
 resources:
   OsNetConfigImpl:
@@ -51,7 +56,7 @@ resources:
                 -
                   type: ovs_bond
                   name: bond1
-                  ovs_options: vlan_mode=trunk trunks=10,20,30,40,50
+                  ovs_options: {get_param: BondInterfaceOvsOptions}
                   members:
                     -
                       type: interface
diff --git a/network/config/bond-with-vlans/controller.yaml b/network/config/bond-with-vlans/controller.yaml
index 478581c2..3fc314da 100644
--- a/network/config/bond-with-vlans/controller.yaml
+++ b/network/config/bond-with-vlans/controller.yaml
@@ -25,6 +25,11 @@ parameters:
     default: ''
     description: IP address/subnet on the tenant network
     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.
+    type: string
 
 resources:
   OsNetConfigImpl:
@@ -51,7 +56,7 @@ resources:
                 -
                   type: ovs_bond
                   name: bond1
-                  ovs_options: vlan_mode=trunk trunks=10,20,30,40,50
+                  ovs_options: {get_param: BondInterfaceOvsOptions}
                   members:
                     -
                       type: interface
diff --git a/network/config/bond-with-vlans/swift-storage.yaml b/network/config/bond-with-vlans/swift-storage.yaml
index 1abb9f65..4dfa58fc 100644
--- a/network/config/bond-with-vlans/swift-storage.yaml
+++ b/network/config/bond-with-vlans/swift-storage.yaml
@@ -25,6 +25,11 @@ parameters:
     default: ''
     description: IP address/subnet on the tenant network
     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.
+    type: string
 
 resources:
   OsNetConfigImpl:
@@ -51,7 +56,7 @@ resources:
                 -
                   type: ovs_bond
                   name: bond1
-                  ovs_options: vlan_mode=trunk trunks=10,20,30,40,50
+                  ovs_options: {get_param: BondInterfaceOvsOptions}
                   members:
                     -
                       type: interface
diff --git a/network/config/single-nic-vlans/ceph-storage.yaml b/network/config/single-nic-vlans/ceph-storage.yaml
index 9ab1734d..6bffb07e 100644
--- a/network/config/single-nic-vlans/ceph-storage.yaml
+++ b/network/config/single-nic-vlans/ceph-storage.yaml
@@ -42,7 +42,6 @@ resources:
                 -
                   type: interface
                   name: nic1
-                  ovs_options: vlan_mode=trunk trunks=10,20,30,40,50
                   # force the MAC address of the bridge to this interface
                   primary: true
                 -
diff --git a/network/config/single-nic-vlans/cinder-storage.yaml b/network/config/single-nic-vlans/cinder-storage.yaml
index 72f6126c..e9f6c770 100644
--- a/network/config/single-nic-vlans/cinder-storage.yaml
+++ b/network/config/single-nic-vlans/cinder-storage.yaml
@@ -42,7 +42,6 @@ resources:
                 -
                   type: interface
                   name: nic1
-                  ovs_options: vlan_mode=trunk trunks=10,20,30,40,50
                   # force the MAC address of the bridge to this interface
                   primary: true
                 -
diff --git a/network/config/single-nic-vlans/compute.yaml b/network/config/single-nic-vlans/compute.yaml
index 93fe0b50..89a83b25 100644
--- a/network/config/single-nic-vlans/compute.yaml
+++ b/network/config/single-nic-vlans/compute.yaml
@@ -42,7 +42,6 @@ resources:
                 -
                   type: interface
                   name: nic1
-                  ovs_options: vlan_mode=trunk trunks=10,20,30,40,50
                   # force the MAC address of the bridge to this interface
                   primary: true
                 -
diff --git a/network/config/single-nic-vlans/controller.yaml b/network/config/single-nic-vlans/controller.yaml
index 5e1d5d44..aab722c0 100644
--- a/network/config/single-nic-vlans/controller.yaml
+++ b/network/config/single-nic-vlans/controller.yaml
@@ -42,7 +42,6 @@ resources:
                 -
                   type: interface
                   name: nic1
-                  ovs_options: vlan_mode=trunk trunks=10,20,30,40,50
                   # force the MAC address of the bridge to this interface
                   primary: true
                 -
diff --git a/network/config/single-nic-vlans/swift-storage.yaml b/network/config/single-nic-vlans/swift-storage.yaml
index 5733b316..93a91688 100644
--- a/network/config/single-nic-vlans/swift-storage.yaml
+++ b/network/config/single-nic-vlans/swift-storage.yaml
@@ -42,7 +42,6 @@ resources:
                 -
                   type: interface
                   name: nic1
-                  ovs_options: vlan_mode=trunk trunks=10,20,30,40,50
                   # force the MAC address of the bridge to this interface
                   primary: true
                 -