X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fgnocchi-api.yaml;h=bc217743410bd718b24132c71fc84829101a12ba;hb=5d13a6397c4dccc78dc13c4bf23d651485868904;hp=bf23cda12ad779ea72df897687a0bfedf625f237;hpb=763b275d036e34c900a09cd92ee477e6b156f60b;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml
index bf23cda1..bc217743 100644
--- a/puppet/services/gnocchi-api.yaml
+++ b/puppet/services/gnocchi-api.yaml
@@ -4,23 +4,49 @@ 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
+  GnocchiPassword:
+    description: The password for the gnocchi service and db account.
+    type: string
+    hidden: true
+  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']
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
 
 resources:
   GnocchiServiceBase:
     type: ./gnocchi-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Gnocchi role.
     value:
-      service_name: gnocchi-api
+      service_name: gnocchi_api
       config_settings:
         map_merge:
           - get_attr: [GnocchiServiceBase, role_data, config_settings]
@@ -29,5 +55,20 @@ outputs:
                 dport:
                   - 8041
                   - 13041
+            gnocchi::api::enabled: true
+            gnocchi::api::manage_service: false
+            gnocchi::api::service_name: 'httpd'
+            gnocchi::keystone::auth::admin_url: { get_param: [ EndpointMap, GnocchiAdmin, uri ] }
+            gnocchi::keystone::auth::internal_url: {get_param: [EndpointMap, GnocchiInternal, uri]}
+            gnocchi::keystone::auth::password: {get_param: GnocchiPassword}
+            gnocchi::keystone::auth::public_url: { get_param: [ EndpointMap, GnocchiPublic, uri ] }
+            gnocchi::keystone::auth::region: {get_param: KeystoneRegion}
+            gnocchi::keystone::auth::tenant: 'service'
+            gnocchi::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
+            gnocchi::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
+            gnocchi::keystone::authtoken::password: {get_param: GnocchiPassword}
+            gnocchi::keystone::authtoken::project_name: 'service'
+            gnocchi::wsgi::apache::ssl: false
+            tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend}
       step_config: |
         include ::tripleo::profile::base::gnocchi::api