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 "Fix cinder-{backup,volume} container with pacemaker" into stable/pike
[apex-tripleo-heat-templates.git]
/
network
/
config
/
single-nic-vlans
/
swift-storage.yaml
diff --git
a/network/config/single-nic-vlans/swift-storage.yaml
b/network/config/single-nic-vlans/swift-storage.yaml
index
88f69b4
..
99ab66c
100644
(file)
--- a/
network/config/single-nic-vlans/swift-storage.yaml
+++ b/
network/config/single-nic-vlans/swift-storage.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
'2016-10-14'
+heat_template_version:
pike
description: >
Software Config to drive os-net-config to configure VLANs for the swift storage role.
parameters:
description: >
Software Config to drive os-net-config to configure VLANs for the swift storage role.
parameters:
@@
-12,7
+12,7
@@
parameters:
type: string
InternalApiIpSubnet:
default: ''
type: string
InternalApiIpSubnet:
default: ''
- description: IP address/subnet on the internal
API
network
+ description: IP address/subnet on the internal
_api
network
type: string
StorageIpSubnet:
default: ''
type: string
StorageIpSubnet:
default: ''
@@
-20,7
+20,7
@@
parameters:
type: string
StorageMgmtIpSubnet:
default: ''
type: string
StorageMgmtIpSubnet:
default: ''
- description: IP address/subnet on the storage
mgmt network
+ description: IP address/subnet on the storage
_
mgmt network
type: string
TenantIpSubnet:
default: ''
type: string
TenantIpSubnet:
default: ''