Merge "Enable Neutron LBaaS Integration"

[apex-tripleo-heat-templates.git] / network / tenant.yaml

diff --git a/network/tenant.yaml b/network/tenant.yaml
index 6fe9612..2104f0b 100644 (file)
--- a/network/tenant.yaml
+++ b/network/tenant.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: pike
 
 description: >
   Tenant network.
@@ -15,7 +15,7 @@ parameters:
     type: json
   TenantNetAdminStateUp:
     default: false
-    description: This admin state of the network.
+    description: The admin state of the network.
     type: boolean
   TenantNetEnableDHCP:
     default: false
@@ -55,8 +55,11 @@ resources:
       name: {get_param: TenantSubnetName}
       network: {get_resource: TenantNetwork}
       allocation_pools: {get_param: TenantAllocationPools}
+      gateway_ip: null
 
 outputs:
   OS::stack_id:
     description: Neutron tenant network
     value: {get_resource: TenantNetwork}
+  subnet_cidr:
+    value: {get_attr: TenantSubnet, cidr}