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 "Set verbosity by default for memcached" into stable/pike
[apex-tripleo-heat-templates.git]
/
net-config-noop.yaml
diff --git
a/net-config-noop.yaml
b/net-config-noop.yaml
index
ad580cf
..
bdfda57
100644
(file)
--- a/
net-config-noop.yaml
+++ b/
net-config-noop.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
ocata
+heat_template_version:
pike
description: >
Software Config to no-op for os-net-config. Using this will allow you
description: >
Software Config to no-op for os-net-config. Using this will allow you
@@
-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: ''
@@
-38,8
+38,8
@@
resources:
OsNetConfigImpl:
type: OS::Heat::StructuredConfig
properties:
OsNetConfigImpl:
type: OS::Heat::StructuredConfig
properties:
- group:
os-
apply-config
- config:
+ group: apply-config
+ config:
{}
outputs:
OS::stack_id:
outputs:
OS::stack_id: