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 "Parametrize Swift partition power"
[apex-tripleo-heat-templates.git]
/
swift-storage-source.yaml
diff --git
a/swift-storage-source.yaml
b/swift-storage-source.yaml
index
49bc3e4
..
48154e2
100644
(file)
--- a/
swift-storage-source.yaml
+++ b/
swift-storage-source.yaml
@@
-12,12
+12,6
@@
parameters:
default: baremetal
description: Flavor for Swift storage nodes to request when deploying.
type: string
default: baremetal
description: Flavor for Swift storage nodes to request when deploying.
type: string
- NeutronNetworkType:
- type: string
- default: 'gre'
- NeutronEnableTunnelling:
- type: string
- default: True
resources:
SwiftStorage0:
type: OS::Nova::Server
resources:
SwiftStorage0:
type: OS::Nova::Server
@@
-47,9
+41,6
@@
resources:
config: {get_resource: SwiftConfig}
signal_transport: NO_SIGNAL
input_values:
config: {get_resource: SwiftConfig}
signal_transport: NO_SIGNAL
input_values:
- neutron_local_ip: {get_attr: [SwiftStorage0, networks, ctlplane, 0]}
- neutron_tenant_network_type: {get_param: NeutronNetworkType}
- neutron_enable_tunneling: {get_param: NeutronEnableTunnelling}
swift_hash_suffix: {get_param: SwiftHashSuffix}
swift_password: {get_param: SwiftPassword}
swift_part_power: {get_param: SwiftPartPower}
swift_hash_suffix: {get_param: SwiftHashSuffix}
swift_password: {get_param: SwiftPassword}
swift_part_power: {get_param: SwiftPartPower}