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 "TLS everywhere/docker: add nova services to environment"
[apex-tripleo-heat-templates.git]
/
ci
/
common
/
net-config-multinode-os-net-config.yaml
diff --git
a/ci/common/net-config-multinode-os-net-config.yaml
b/ci/common/net-config-multinode-os-net-config.yaml
index
8c50b64
..
9d45a9f
100644
(file)
--- a/
ci/common/net-config-multinode-os-net-config.yaml
+++ b/
ci/common/net-config-multinode-os-net-config.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
ocata
+heat_template_version:
pike
description: >
Software Config to drive os-net-config for a simple bridge configured
description: >
Software Config to drive os-net-config for a simple bridge configured
@@
-15,7
+15,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: ''
@@
-23,7
+23,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: ''