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
Pass -q option to yum
[apex-tripleo-heat-templates.git]
/
network
/
tenant.yaml
diff --git
a/network/tenant.yaml
b/network/tenant.yaml
index
db7f99f
..
6fe9612
100644
(file)
--- a/
network/tenant.yaml
+++ b/
network/tenant.yaml
@@
-12,10
+12,10
@@
parameters:
TenantNetValueSpecs:
default: {'provider:physical_network': 'tenant', 'provider:network_type': 'flat'}
description: Value specs for the tenant network.
TenantNetValueSpecs:
default: {'provider:physical_network': 'tenant', 'provider:network_type': 'flat'}
description: Value specs for the tenant network.
- type:
string
+ type:
json
TenantNetAdminStateUp:
default: false
TenantNetAdminStateUp:
default: false
- description: This admin state of
of
the network.
+ description: This admin state of the network.
type: boolean
TenantNetEnableDHCP:
default: false
type: boolean
TenantNetEnableDHCP:
default: false
@@
-33,6
+33,10
@@
parameters:
default: tenant_subnet
description: The name of the tenant subnet in Neutron.
type: string
default: tenant_subnet
description: The name of the tenant subnet in Neutron.
type: string
+ TenantAllocationPools:
+ default: [{'start': '172.16.0.4', 'end': '172.16.0.250'}]
+ description: Ip allocation pool range for the tenant network.
+ type: json
resources:
TenantNetwork:
resources:
TenantNetwork:
@@
-50,6
+54,7
@@
resources:
enable_dhcp: {get_param: TenantNetEnableDHCP}
name: {get_param: TenantSubnetName}
network: {get_resource: TenantNetwork}
enable_dhcp: {get_param: TenantNetEnableDHCP}
name: {get_param: TenantSubnetName}
network: {get_resource: TenantNetwork}
+ allocation_pools: {get_param: TenantAllocationPools}
outputs:
OS::stack_id:
outputs:
OS::stack_id: