Add S3 storage driver as an option and its config

S3 storage driver is a supported option for gnocchi upstream.

The puppet change has been added in this commit
I5a49fa34d344c4464ea883bf96350f00b0a17eac

Change-Id: Ib44278ef87c8c4d1c39a50d24c1f02fe1fe4042e
This commit is contained in:
Pradeep Kilambi 2017-11-17 09:40:36 -05:00
parent 49d8f4ea76
commit b2b37b6bda
5 changed files with 29 additions and 5 deletions

View File

@ -25,7 +25,7 @@ parameter_defaults:
# Type: string # Type: string
GlanceBackend: rbd GlanceBackend: rbd
# The short name of the Gnocchi backend to use. Should be one of swift, rbd, or file # The short name of the Gnocchi backend to use. Should be one of swift, rbd, file or s3.
# Type: string # Type: string
GnocchiBackend: rbd GnocchiBackend: rbd

View File

@ -51,7 +51,7 @@ parameter_defaults:
# Type: string # Type: string
GlanceRbdPoolName: images GlanceRbdPoolName: images
# The short name of the Gnocchi backend to use. Should be one of swift, rbd, or file # The short name of the Gnocchi backend to use. Should be one of swift, rbd, file or s3.
# Type: string # Type: string
GnocchiBackend: rbd GnocchiBackend: rbd

View File

@ -37,10 +37,10 @@ parameters:
GnocchiBackend: GnocchiBackend:
default: swift default: swift
description: The short name of the Gnocchi backend to use. Should be one description: The short name of the Gnocchi backend to use. Should be one
of swift, rbd, or file of swift, rbd, file or s3.
type: string type: string
constraints: constraints:
- allowed_values: ['swift', 'file', 'rbd'] - allowed_values: ['swift', 'file', 'rbd', 's3']
GnocchiIncomingStorageDriver: GnocchiIncomingStorageDriver:
default: redis default: redis
description: Storage driver to use for incoming metric data description: Storage driver to use for incoming metric data

View File

@ -67,7 +67,23 @@ parameters:
description: Set to modify which endpoint type is gnocchi accessing swift description: Set to modify which endpoint type is gnocchi accessing swift
from. from.
type: string type: string
GnocchiStorageS3Endpoint:
default: ''
description: The endpoint url for S3 storage.
type: string
GnocchiStorageS3RegionName:
default: ''
description: S3 Region name.
type: string
GnocchiStorageS3AccessKeyId:
default: ''
description: S3 storage access key Id.
type: string
GnocchiStorageS3AccessSecret:
default: ''
description: S3 storage access key secret.
type: string
hidden: true
conditions: conditions:
service_debug_unset: {equals : [{get_param: GnocchiDebug}, '']} service_debug_unset: {equals : [{get_param: GnocchiDebug}, '']}
@ -117,6 +133,10 @@ outputs:
- 'client' - 'client'
- {get_param: CephClientUserName} - {get_param: CephClientUserName}
- 'keyring' - 'keyring'
gnocchi::storage::s3::s3_endpoint_url: {get_param: GnocchiStorageS3Endpoint}
gnocchi::storage::s3::s3_region_name: {get_param: GnocchiStorageS3RegionName}
gnocchi::storage::s3::s3_access_key_id: {get_param: GnocchiStorageS3AccessKeyId}
gnocchi::storage::s3::s3_secret_access_key: {get_param: GnocchiStorageS3AccessSecret}
#Gnocchi statsd #Gnocchi statsd
gnocchi::statsd::resource_id: '0a8b55df-f90f-491c-8cb9-7cdecec6fc26' gnocchi::statsd::resource_id: '0a8b55df-f90f-491c-8cb9-7cdecec6fc26'
gnocchi::statsd::user_id: '27c0d3f8-e7ee-42f0-8317-72237d1c5ae3' gnocchi::statsd::user_id: '27c0d3f8-e7ee-42f0-8317-72237d1c5ae3'

View File

@ -0,0 +1,4 @@
---
fixes:
- |
Add s3 driver option and params associated with it.