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 the MySQL root password"
[apex-tripleo-heat-templates.git]
/
swift-source.yaml
diff --git
a/swift-source.yaml
b/swift-source.yaml
index
3ca2b1a
..
9c7b04f
100644
(file)
--- a/
swift-source.yaml
+++ b/
swift-source.yaml
@@
-1,7
+1,7
@@
-
R
esources:
+
r
esources:
SwiftConfig:
SwiftConfig:
-
T
ype: OS::Heat::StructuredConfig
-
P
roperties:
+
t
ype: OS::Heat::StructuredConfig
+
p
roperties:
group: os-apply-config
config:
swift:
group: os-apply-config
config:
swift:
@@
-12,7
+12,7
@@
Resources:
replicas: 1
service-password: { get_input: swift_password }
neutron:
replicas: 1
service-password: { get_input: swift_password }
neutron:
- enable_tunnelling: {Ref: NeutronEnableTunnelling}
- tenant_network_type: {Ref: NeutronNetworkType}
ovs:
local_ip: { get_input: neutron_local_ip }
ovs:
local_ip: { get_input: neutron_local_ip }
+ enable_tunnelling: { get_input: neutron_enable_tunnelling}
+ tenant_network_type: { get_input: neutron_tenant_network_type}