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 "Remove nameserver lookup dependency from Cisco ML2 CollectMacConfig."
[apex-tripleo-heat-templates.git]
/
net-config-noop.yaml
diff --git
a/net-config-noop.yaml
b/net-config-noop.yaml
index
70c57aa
..
30de584
100644
(file)
--- a/
net-config-noop.yaml
+++ b/
net-config-noop.yaml
@@
-5,6
+5,10
@@
description: >
to use the parameter driven (init-neutron-ovs) configuration instead.
parameters:
to use the parameter driven (init-neutron-ovs) configuration instead.
parameters:
+ ControlPlaneIp:
+ default: ''
+ description: IP address/subnet on the ctlplane network
+ type: string
ExternalIpSubnet:
default: ''
description: IP address/subnet on the external network
ExternalIpSubnet:
default: ''
description: IP address/subnet on the external network
@@
-34,7
+38,6
@@
resources:
config:
outputs:
config:
outputs:
- config_id:
- description: The ID of the OsNetConfigImpl resource.
- value:
- {get_resource: OsNetConfigImpl}
+ OS::stack_id:
+ description: The OsNetConfigImpl resource.
+ value: {get_resource: OsNetConfigImpl}