Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Allow a fixed IP to be allocated to RedisVirtualIP"
[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
5dce7c3
..
b9f021e
100644
(file)
--- a/
puppet/services/ceilometer-api.yaml
+++ b/
puppet/services/ceilometer-api.yaml
@@
-4,6
+4,15
@@
description: >
OpenStack Ceilometer API service configured with Puppet
parameters:
OpenStack Ceilometer API 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
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-15,14
+24,23
@@
resources:
CeilometerServiceBase:
type: ./ceilometer-base.yaml
properties:
CeilometerServiceBase:
type: ./ceilometer-base.yaml
properties:
+ ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:
description: Role data for the Ceilometer API role.
value:
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:
description: Role data for the Ceilometer API role.
value:
- service_name: ceilometer
-
api
+ service_name: ceilometer
_
api
config_settings:
config_settings:
- get_attr: [CeilometerServiceBase, role_data, config_settings]
+ map_merge:
+ - get_attr: [CeilometerServiceBase, role_data, config_settings]
+ - tripleo.ceilometer_api.firewall_rules:
+ '124 ceilometer':
+ dport:
+ - 8777
+ - 13777
+ - ceilometer::api::keystone_tenant: 'service'
step_config: |
include ::tripleo::profile::base::ceilometer::api
step_config: |
include ::tripleo::profile::base::ceilometer::api