Big Switch Neutron ML2 plugin integration

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

diff --git a/compute.yaml b/compute.yaml
index d51aa35..9a2c6f1 100644 (file)
--- a/compute.yaml
+++ b/compute.yaml
@@ -25,6 +25,10 @@ parameters:
     description: The password for the ceilometer service account.
     type: string
     hidden: true
+  CinderEnableNfsBackend:
+    default: false
+    description: Whether to enable or not the NFS backend for Cinder
+    type: boolean
   Debug:
     default: ''
     description: Set to True to enable debugging on all services.
@@ -98,7 +102,10 @@ parameters:
     default: default
     constraints:
       - custom_constraint: nova.keypair
-  KeystoneHost:
+  KeystoneAdminApiVirtualIP:
+    type: string
+    default: ''
+  KeystonePublicApiVirtualIP:
     type: string
     default: ''
   NeutronBridgeMappings:
@@ -125,7 +132,7 @@ parameters:
   NeutronNetworkType:
     type: string
     description: The tenant network type for Neutron, either gre or vxlan.
-    default: 'gre'
+    default: 'vxlan'
   NeutronNetworkVLANRanges:
     default: 'datacentre'
     description: >
@@ -151,7 +158,7 @@ parameters:
     description: |
         The tunnel types for the Neutron tenant network. To specify multiple
         values, use a comma separated string, like so: 'gre,vxlan'
-    default: 'gre'
+    default: 'vxlan'
   NeutronTunnelIdRanges:
     description: |
         Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges
@@ -405,7 +412,7 @@ resources:
         glance_host: {get_param: GlanceHost}
         glance_port: {get_param: GlancePort}
         glance_protocol: {get_param: GlanceProtocol}
-        keystone_host: {get_param: KeystoneHost}
+        keystone_host: {get_param: KeystonePublicApiVirtualIP}
         neutron_flat_networks: {get_param: NeutronFlatNetworks}
         neutron_host: {get_param: NeutronHost}
         neutron_local_ip: {get_attr: [NovaCompute, networks, ctlplane, 0]}