Merge "Set default network interfaces to nic1"

[apex-tripleo-heat-templates.git] / controller.yaml

diff --git a/controller.yaml b/controller.yaml
index cf5962d..9b3745d 100644 (file)
--- a/controller.yaml
+++ b/controller.yaml
@@ -94,7 +94,6 @@ parameters:
         }
     type: json
   Flavor:
-    default: baremetal
     description: Flavor for control nodes to request when deploying.
     type: string
     constraints:
@@ -244,7 +243,7 @@ parameters:
     type: string
     hidden: true
   NeutronPublicInterface:
-    default: eth0
+    default: nic1
     description: What interface to bridge onto br-ex for network nodes.
     type: string
   NeutronPublicInterfaceTag:
@@ -637,6 +636,7 @@ resources:
               options:
                 - timeout client 0
                 - timeout server 0
+                - maxconn 1500
 
   ControllerPassthroughConfig:
     type: OS::Heat::StructuredConfig