Merge "Set pacemaker default resource-stickiness"

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

diff --git a/controller.yaml b/controller.yaml
index 5156be5..79f5ece 100644 (file)
--- a/controller.yaml
+++ b/controller.yaml
@@ -343,7 +343,7 @@ parameters:
     default: 'datacentre'
     description: If set, flat networks to configure in neutron plugins.
   NeutronNetworkType:
-    default: 'gre'
+    default: 'vxlan'
     description: The tenant network type for Neutron, either gre or vxlan.
     type: string
   NeutronNetworkVLANRanges:
@@ -385,7 +385,7 @@ parameters:
     description: If set, the public interface is a vlan with this device as the raw device.
     type: string
   NeutronTunnelTypes:
-    default: 'gre'
+    default: 'vxlan'
     description: |
         The tunnel types for the Neutron tenant network. To specify multiple
         values, use a comma separated string, like so: 'gre,vxlan'