Merge "Increase libvirt/qemu.conf max_files and max_processes"

[apex-tripleo-heat-templates.git] / puppet / services / gnocchi-base.yaml

diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml
index 3631508..be80774 100644 (file)
--- a/puppet/services/gnocchi-base.yaml
+++ b/puppet/services/gnocchi-base.yaml
@@ -1,21 +1,23 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   Gnocchi service configured with Puppet
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  GnocchiBackend:
-    default: file
-    description: The short name of the Gnocchi backend to use. Should be one
-      of swift, rbd, or file
-    type: string
-    constraints:
-    - allowed_values: ['swift', 'file', 'rbd']
   GnocchiIndexerBackend:
     default: 'mysql'
     description: The short name of the Gnocchi indexer backend to use.
@@ -34,6 +36,14 @@ parameters:
     type: string
     default: 'regionOne'
     description: Keystone region for endpoint
+  RedisPassword:
+    description: The password for the redis service account.
+    type: string
+    hidden: true
+  Debug:
+    type: string
+    default: ''
+    description: Set to True to enable debugging on all services.
 
 outputs:
   aux_parameters:
@@ -46,7 +56,8 @@ outputs:
       service_name: gnocchi_base
       config_settings:
         #Gnocchi engine
-        gnocchi::debug: {get_input: debug}
+        gnocchi_redis_password: {get_param: RedisPassword}
+        gnocchi::debug: {get_param: Debug}
         gnocchi::db::database_connection:
           list_join:
             - ''
@@ -56,15 +67,7 @@ outputs:
               - '@'
               - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/gnocchi'
-        gnocchi::db::mysql::password: {get_param: GnocchiPassword}
         gnocchi::db::sync::extra_opts: '--skip-storage --create-legacy-resource-types'
-        #Gnocchi API
-        tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend}
-        gnocchi::api::manage_service: false
-        gnocchi::api::enabled: true
-        gnocchi::api::service_name: 'httpd'
-        gnocchi::api::keystone_password: {get_param: GnocchiPassword}
-        gnocchi::wsgi::apache::ssl: false
         gnocchi::storage::swift::swift_user: 'service:gnocchi'
         gnocchi::storage::swift::swift_auth_version: 2
         gnocchi::storage::swift::swift_key: {get_param: GnocchiPassword}
@@ -78,17 +81,8 @@ outputs:
             - {get_param: CephClientUserName}
             - 'keyring'
         #Gnocchi statsd
-        gnocchi::statsd::manage_service: false
         gnocchi::statsd::resource_id: '0a8b55df-f90f-491c-8cb9-7cdecec6fc26'
         gnocchi::statsd::user_id: '27c0d3f8-e7ee-42f0-8317-72237d1c5ae3'
         gnocchi::statsd::project_id: '6c38cd8d-099a-4cb2-aecf-17be688e8616'
         gnocchi::statsd::flush_delay: 10
         gnocchi::statsd::archive_policy_name: 'low'
-        gnocchi::db::mysql::user: gnocchi
-        gnocchi::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
-        gnocchi::db::mysql::dbname: gnocchi
-        gnocchi::db::mysql::allowed_hosts:
-          - '%'
-          - "%{hiera('mysql_bind_host')}"
-        gnocchi::auth::auth_region: {get_param: KeystoneRegion}
-        gnocchi::auth::auth_tenant_name: 'service'