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 "Hiera optimization: use a new hiera hook"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
nova-api.yaml
diff --git
a/puppet/services/nova-api.yaml
b/puppet/services/nova-api.yaml
index
49bd84b
..
c4d5c6b
100644
(file)
--- a/
puppet/services/nova-api.yaml
+++ b/
puppet/services/nova-api.yaml
@@
-87,8
+87,8
@@
outputs:
map_merge:
- get_attr: [NovaBase, role_data, config_settings]
- get_attr: [ApacheServiceBase, role_data, config_settings]
map_merge:
- get_attr: [NovaBase, role_data, config_settings]
- get_attr: [ApacheServiceBase, role_data, config_settings]
- - nova::cron::archive_deleted_rows::hour: '
"*/12"
'
- nova::cron::archive_deleted_rows::destination: '
"/dev/null"
'
+ - nova::cron::archive_deleted_rows::hour: '
*/12
'
+ nova::cron::archive_deleted_rows::destination: '
/dev/null
'
tripleo.nova_api.firewall_rules:
'113 nova_api':
dport:
tripleo.nova_api.firewall_rules:
'113 nova_api':
dport:
@@
-108,7
+108,7
@@
outputs:
nova::api::api_bind_address:
str_replace:
template:
nova::api::api_bind_address:
str_replace:
template:
- '
"%{::fqdn_$NETWORK}"
'
+ '
%{::fqdn_$NETWORK}
'
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::service_name: 'httpd'
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::service_name: 'httpd'
@@
-122,7
+122,7
@@
outputs:
nova::wsgi::apache::servername:
str_replace:
template:
nova::wsgi::apache::servername:
str_replace:
template:
- '
"%{::fqdn_$NETWORK}"
'
+ '
%{::fqdn_$NETWORK}
'
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}