diff options
author | 2014-11-18 10:48:06 +0000 | |
---|---|---|
committer | 2014-11-18 10:48:06 +0000 | |
commit | 6f816b14a3956a420ef934a74bfc1141e1b9dd76 (patch) | |
tree | c9603d942acab14f1d98430523ba1d4763c287db | |
parent | 3043a28d07b6d45436406627c9ace185543529e6 (diff) | |
parent | c48c1761df45ae6ba2eb4ddf2c9d28412b384e3b (diff) |
Merge "Add swift.mount-check metadata"
-rw-r--r-- | swift-deploy.yaml | 5 | ||||
-rw-r--r-- | swift-source.yaml | 1 | ||||
-rw-r--r-- | swift-storage-source.yaml | 1 | ||||
-rw-r--r-- | swift-storage.yaml | 5 |
4 files changed, 12 insertions, 0 deletions
diff --git a/swift-deploy.yaml b/swift-deploy.yaml index 9c42684a..1e15511f 100644 --- a/swift-deploy.yaml +++ b/swift-deploy.yaml @@ -5,6 +5,10 @@ parameters: description: A random string to be used as a salt when hashing to determine mappings in the ring. type: string hidden: true + SwiftMountCheck: + default: 'false' + description: Value of mount_check in Swift account/container/object -server.conf + type: boolean SwiftMinPartHours: type: number default: 1 @@ -31,6 +35,7 @@ resources: signal_transport: NO_SIGNAL input_values: swift_hash_suffix: {get_param: SwiftHashSuffix} + swift_mount_check: {get_param: SwiftMountCheck} swift_password: {get_param: SwiftPassword} swift_part_power: {get_param: SwiftPartPower} swift_devices: diff --git a/swift-source.yaml b/swift-source.yaml index 815ca7f5..e6fd951e 100644 --- a/swift-source.yaml +++ b/swift-source.yaml @@ -7,6 +7,7 @@ resources: swift: devices: { get_input: swift_devices } hash: { get_input: swift_hash_suffix } + mount-check: { get_input: swift_mount_check } part-power: { get_input: swift_part_power } proxy-memcache: { get_input: swift_proxy_memcache } replicas: {get_input: swift_replicas } diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index fabb5545..10155df9 100644 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@ -42,6 +42,7 @@ resources: signal_transport: NO_SIGNAL input_values: swift_hash_suffix: {get_param: SwiftHashSuffix} + swift_mount_check: {get_param: SwiftMountCheck} swift_password: {get_param: SwiftPassword} swift_part_power: {get_param: SwiftPartPower} swift_devices: diff --git a/swift-storage.yaml b/swift-storage.yaml index 68fd8a48..2b40e800 100644 --- a/swift-storage.yaml +++ b/swift-storage.yaml @@ -59,6 +59,10 @@ parameters: default: default description: Name of an existing EC2 KeyPair to enable SSH access to the instances type: string + MountCheck: + default: 'false' + description: Value of mount_check in Swift account/container/object -server.conf + type: boolean NeutronEnableTunnelling: default: "True" type: string @@ -143,6 +147,7 @@ resources: snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName} 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_part_power: {get_param: PartPower} swift_replicas: { get_param: Replicas} |