From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 7 Oct 2014 20:50:59 +0000 (+0000)
Subject: Merge "Add SwiftMinPartHours parameter"
X-Git-Tag: opnfv-6.0.0~2739
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a35679f539614846f43dbb0b5a3c57dc7e0f34ee;p=apex-tripleo-heat-templates.git

Merge "Add SwiftMinPartHours parameter"
---

a35679f539614846f43dbb0b5a3c57dc7e0f34ee
diff --cc swift-source.yaml
index ca0967a4,b07164c8..815ca7f5
--- a/swift-source.yaml
+++ b/swift-source.yaml
@@@ -7,7 -7,8 +7,8 @@@ resources
          swift:
            devices: { get_input: swift_devices }
            hash: { get_input: swift_hash_suffix }
 -          part-power: 10
 +          part-power: { get_input: swift_part_power }
            proxy-memcache: { get_input: swift_proxy_memcache }
            replicas: {get_input: swift_replicas }
+           min-part-hours: {get_input: swift_min_part_hours }
            service-password: { get_input: swift_password }