aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/swift-storage.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-02 10:00:14 +0000
committerGerrit Code Review <review@openstack.org>2016-09-02 10:00:14 +0000
commitd6837ea4a62ec74c4b06901c257fe4d6f4bea73c (patch)
treef6d252cfb4026674c7133e8b863c5e5f0a9d0ce1 /puppet/services/swift-storage.yaml
parent3a5d28c4739d3f79c7b10af169f110f9a10f61bb (diff)
parent25ad7b8e1eeeb0e1f5f83b9f7560502717b44536 (diff)
Merge "Availability monitoring agents support"
Diffstat (limited to 'puppet/services/swift-storage.yaml')
-rw-r--r--puppet/services/swift-storage.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml
index 6c7c3c7a..91d52569 100644
--- a/puppet/services/swift-storage.yaml
+++ b/puppet/services/swift-storage.yaml
@@ -30,6 +30,9 @@ parameters:
default: {}
description: 'A hash of additional raw devices to use as Swift backend (eg. {sdb: {}})'
type: json
+ MonitoringSubscriptionSwiftStorage:
+ default: 'overcloud-swift-storage'
+ type: string
# DEPRECATED options for compatibility with overcloud.yaml
# This should be removed and manipulation of the ControllerServices list
@@ -58,6 +61,7 @@ outputs:
description: Role data for the Swift Proxy role.
value:
service_name: swift_storage
+ monitoring_subscription: {get_param: MonitoringSubscriptionSwiftStorage}
config_settings:
map_merge:
- get_attr: [SwiftBase, role_data, config_settings]