X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=controller.yaml;h=79f5ece5f4a670b61996518f6d5fe4e7d70917eb;hb=13d59fd1b62f2a3649e140df22b632e1312a870f;hp=8b57fa0f143368265a24a09cc460fce1bb441b58;hpb=f498e7f3c05f1d7df34251a2c16d870f7d12d521;p=apex-tripleo-heat-templates.git

diff --git a/controller.yaml b/controller.yaml
index 8b57fa0f..79f5ece5 100644
--- 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'
@@ -515,6 +515,9 @@ parameters:
   MysqlVirtualIP:
     type: string
     default: ''
+  KeystoneAdminApiVirtualIP:
+    type: string
+    default: ''
   KeystonePublicApiVirtualIP:
     type: string
     default: ''