Merge "Keystone token flush cron job should log to a file"

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

diff --git a/network/storage_mgmt.yaml b/network/storage_mgmt.yaml
index d0c919b..c711716 100644 (file)
--- a/network/storage_mgmt.yaml
+++ b/network/storage_mgmt.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: ocata
 
 description: >
   Storage management network. Storage replication, etc.
@@ -12,10 +12,10 @@ parameters:
   StorageMgmtNetValueSpecs:
     default: {'provider:physical_network': 'storage_mgmt', 'provider:network_type': 'flat'}
     description: Value specs for the storage_mgmt network.
-    type: string
+    type: json
   StorageMgmtNetAdminStateUp:
     default: false
-    description: This admin state of of the network.
+    description: This admin state of the network.
     type: boolean
   StorageMgmtNetEnableDHCP:
     default: false
@@ -55,6 +55,7 @@ resources:
       name: {get_param: StorageMgmtSubnetName}
       network: {get_resource: StorageMgmtNetwork}
       allocation_pools: {get_param: StorageMgmtAllocationPools}
+      gateway_ip: null
 
 outputs:
   OS::stack_id: