summaryrefslogtreecommitdiffstats
path: root/swift-storage.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'swift-storage.yaml')
-rw-r--r--swift-storage.yaml33
1 files changed, 0 insertions, 33 deletions
diff --git a/swift-storage.yaml b/swift-storage.yaml
index 38359ffe..076d4bcb 100644
--- a/swift-storage.yaml
+++ b/swift-storage.yaml
@@ -1,9 +1,6 @@
heat_template_version: 2014-10-16
description: 'Common Swift Storage Configuration'
parameters:
- ControllerIP:
- default: ''
- type: string
ExtraConfig:
default: {}
description: |
@@ -64,12 +61,6 @@ parameters:
default: 'false'
description: Value of mount_check in Swift account/container/object -server.conf
type: boolean
- NeutronEnableTunnelling:
- default: "True"
- type: string
- NeutronNetworkType:
- default: gre
- type: string
MinPartHours:
type: number
default: 1
@@ -78,12 +69,6 @@ parameters:
default: 10
description: Partition Power to use when building Swift rings
type: number
- Password:
- default: unset
- description: The password for the swift service account, used by the swift proxy
- services.
- hidden: true
- type: string
Replicas:
type: number
default: 1
@@ -114,10 +99,7 @@ resources:
min-part-hours: { get_input: swift_min_part_hours }
mount-check: { get_input: swift_mount_check }
replicas: {get_input: swift_replicas }
- service-password: { get_input: swift_password }
neutron:
- enable_tunnelling: {get_param: NeutronEnableTunnelling}
- tenant_network_type: {get_param: NeutronNetworkType}
ovs:
local_ip: { get_input: neutron_local_ip }
SwiftStorage:
@@ -129,20 +111,6 @@ resources:
user_data_format: SOFTWARE_CONFIG
networks:
- network: ctlplane
- SwiftKeystoneConfig:
- type: OS::Heat::StructuredConfig
- properties:
- config:
- keystone:
- host: {get_input: keystone_host}
- SwiftStorageKeystone:
- type: OS::Heat::StructuredDeployment
- properties:
- server: {get_resource: SwiftStorage}
- config: {get_resource: SwiftKeystoneConfig}
- signal_transport: NO_SIGNAL
- input_values:
- keystone_host: {get_param: ControllerIP}
SwiftStorageDeploy:
type: OS::Heat::StructuredDeployment
properties:
@@ -155,7 +123,6 @@ resources:
snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
swift_hash_suffix: {get_param: HashSuffix}
swift_mount_check: {get_param: MountCheck}
- swift_password: {get_param: Password}
swift_min_part_hours: {get_param: MinPartHours}
swift_part_power: {get_param: PartPower}
swift_replicas: { get_param: Replicas}