Merge "Move neutron settings out of puppet/compute.yaml"

[apex-tripleo-heat-templates.git] / puppet / services / ceilometer-api.yaml

diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml
index d0f3767..c5c143b 100644 (file)
--- a/puppet/services/ceilometer-api.yaml
+++ b/puppet/services/ceilometer-api.yaml
@@ -21,7 +21,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer API role.
     value:
-      service_name: ceilometer-api
+      service_name: ceilometer_api
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]
@@ -30,5 +30,6 @@ outputs:
                 dport:
                   - 8777
                   - 13777
+          - ceilometer::api::keystone_tenant: 'service'
       step_config: |
         include ::tripleo::profile::base::ceilometer::api