Merge "Ironic: enable iPXE by default and make it configurable"

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

diff --git a/network/external.yaml b/network/external.yaml
index e015dd8..3b24da7 100644 (file)
--- a/network/external.yaml
+++ b/network/external.yaml
@@ -12,10 +12,10 @@ parameters:
   ExternalNetValueSpecs:
     default: {'provider:physical_network': 'external', 'provider:network_type': 'flat'}
     description: Value specs for the external network.
-    type: string
+    type: json
   ExternalNetAdminStateUp:
     default: false
-    description: This admin state of of the network.
+    description: This admin state of the network.
     type: boolean
   ExternalNetEnableDHCP:
     default: false
@@ -54,7 +54,7 @@ resources:
       enable_dhcp: {get_param: ExternalNetEnableDHCP}
       name: {get_param: ExternalSubnetName}
       network: {get_resource: ExternalNetwork}
-      allocation_pools: {get_resource: ExternalAllocationPools}
+      allocation_pools: {get_param: ExternalAllocationPools}
 
 outputs:
   OS::stack_id: