Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Repurpose KeystoneWorkers add keystone::wsgi::apache::threads"
[apex-tripleo-heat-templates.git]
/
network
/
storage.yaml
diff --git
a/network/storage.yaml
b/network/storage.yaml
index
1f60adf
..
dc9f35e
100644
(file)
--- a/
network/storage.yaml
+++ b/
network/storage.yaml
@@
-12,10
+12,10
@@
parameters:
StorageNetValueSpecs:
default: {'provider:physical_network': 'storage', 'provider:network_type': 'flat'}
description: Value specs for the storage network.
StorageNetValueSpecs:
default: {'provider:physical_network': 'storage', 'provider:network_type': 'flat'}
description: Value specs for the storage network.
- type:
string
+ type:
json
StorageNetAdminStateUp:
default: false
StorageNetAdminStateUp:
default: false
- description: This admin state of
of
the network.
+ description: This admin state of the network.
type: boolean
StorageNetEnableDHCP:
default: false
type: boolean
StorageNetEnableDHCP:
default: false
@@
-33,6
+33,10
@@
parameters:
default: storage_subnet
description: The name of the storage subnet in Neutron.
type: string
default: storage_subnet
description: The name of the storage subnet in Neutron.
type: string
+ StorageAllocationPools:
+ default: [{'start': '172.16.1.4', 'end': '172.16.1.250'}]
+ description: Ip allocation pool range for the storage network.
+ type: json
resources:
StorageNetwork:
resources:
StorageNetwork:
@@
-50,6
+54,7
@@
resources:
enable_dhcp: {get_param: StorageNetEnableDHCP}
name: {get_param: StorageSubnetName}
network: {get_resource: StorageNetwork}
enable_dhcp: {get_param: StorageNetEnableDHCP}
name: {get_param: StorageSubnetName}
network: {get_resource: StorageNetwork}
+ allocation_pools: {get_param: StorageAllocationPools}
outputs:
OS::stack_id:
outputs:
OS::stack_id: