Merge "Add S3 storage driver as an option and its config"

environments/storage/enable-ceph.yaml

@@ -25,7 +25,7 @@ parameter_defaults:
   # Type: string
   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
   GnocchiBackend: rbd
 

environments/storage/external-ceph.yaml

@@ -51,7 +51,7 @@ parameter_defaults:
   # Type: string
   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
   GnocchiBackend: rbd
 

puppet/services/gnocchi-api.yaml

@@ -37,10 +37,10 @@ parameters:
   GnocchiBackend:
     default: swift
     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
     constraints:
-    - allowed_values: ['swift', 'file', 'rbd']
+    - allowed_values: ['swift', 'file', 'rbd', 's3']
   GnocchiIncomingStorageDriver:
     default: redis
     description: Storage driver to use for incoming metric data

puppet/services/gnocchi-base.yaml

@@ -67,7 +67,23 @@ parameters:
     description: Set to modify which endpoint type is gnocchi accessing swift
                  from.
     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:
   service_debug_unset: {equals : [{get_param: GnocchiDebug}, '']}
 
@@ -117,6 +133,10 @@ outputs:
             - 'client'
             - {get_param: CephClientUserName}
             - '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::resource_id: '0a8b55df-f90f-491c-8cb9-7cdecec6fc26'
         gnocchi::statsd::user_id: '27c0d3f8-e7ee-42f0-8317-72237d1c5ae3'

releasenotes/notes/add-s3-driver-da8a31a3c646892e.yaml

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