Merge "Revert "Revert "Blacklist support for ExtraConfig"""

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

diff --git a/network/storage.yaml b/network/storage.yaml
index d403f9e..0fb9cc0 100644 (file)
--- a/network/storage.yaml
+++ b/network/storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: pike
 
 description: >
   Storage network.
@@ -12,10 +12,10 @@ parameters:
   StorageNetValueSpecs:
     default: {'provider:physical_network': 'storage', 'provider:network_type': 'flat'}
     description: Value specs for the storage network.
-    type: string
+    type: json
   StorageNetAdminStateUp:
     default: false
-    description: This admin state of of the network.
+    description: This admin state of the network.
     type: boolean
   StorageNetEnableDHCP:
     default: false
@@ -55,6 +55,7 @@ resources:
       name: {get_param: StorageSubnetName}
       network: {get_resource: StorageNetwork}
       allocation_pools: {get_param: StorageAllocationPools}
+      gateway_ip: null
 
 outputs:
   OS::stack_id: