diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-22 12:08:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-22 12:08:12 +0000 |
| commit | d291083e7f990362a5bb4b3b2b22a006d8bc16c1 (patch) | |
| tree | d299dc355028eacd4056b21f09c792f8c42faaa6 /puppet/objectstorage-role.yaml | |
| parent | 58f3d248bab6ea0ed3433fd3aa485d8c93060f56 (diff) | |
| parent | d2da59065dd11cbfb6845040697e21e4def35b8f (diff) | |
Merge "Add hook to generate metadata from service profiles"
Diffstat (limited to 'puppet/objectstorage-role.yaml')
| -rw-r--r-- | puppet/objectstorage-role.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml index 088a2e3d..640378c8 100644 --- a/puppet/objectstorage-role.yaml +++ b/puppet/objectstorage-role.yaml @@ -102,6 +102,9 @@ parameters: MonitoringSubscriptions: type: comma_delimited_list default: [] + ServiceMetadataSettings: + type: json + default: {} ConfigCommand: type: string description: Command which will be run whenever configuration data changes @@ -137,6 +140,7 @@ resources: map_merge: - {get_param: ServerMetadata} - {get_param: SwiftStorageServerMetadata} + - {get_param: ServiceMetadataSettings} scheduler_hints: {get_param: ObjectStorageSchedulerHints} # Combine the NodeAdminUserData and NodeUserData mime archives |