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
docker: add logging(source & groups)
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
nova-placement.yaml
diff --git
a/docker/services/nova-placement.yaml
b/docker/services/nova-placement.yaml
index
d784ace
..
8015071
100644
(file)
--- a/
docker/services/nova-placement.yaml
+++ b/
docker/services/nova-placement.yaml
@@
-36,6
+36,13
@@
parameters:
default: {}
description: Parameters specific to the role
type: json
default: {}
description: Parameters specific to the role
type: json
+ EnableInternalTLS:
+ type: boolean
+ default: false
+
+conditions:
+
+ internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
resources:
resources:
@@
-64,6
+71,8
@@
outputs:
map_merge:
- get_attr: [NovaPlacementBase, role_data, config_settings]
- apache::default_vhost: false
map_merge:
- get_attr: [NovaPlacementBase, role_data, config_settings]
- apache::default_vhost: false
+ logging_source: {get_attr: [NovaPlacementBase, role_data, logging_source]}
+ logging_groups: {get_attr: [NovaPlacementBase, role_data, logging_groups]}
step_config: &step_config
list_join:
- "\n"
step_config: &step_config
list_join:
- "\n"
@@
-104,6
+113,17
@@
outputs:
- /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/nova_placement/:/var/lib/kolla/config_files/src:ro
- /var/log/containers/nova:/var/log/nova
- /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/nova_placement/:/var/lib/kolla/config_files/src:ro
- /var/log/containers/nova:/var/log/nova
+ - /var/log/containers/httpd/nova-placement:/var/log/httpd
+ -
+ if:
+ - internal_tls_enabled
+ - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
+ - ''
+ -
+ if:
+ - internal_tls_enabled
+ - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
+ - ''
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
metadata_settings:
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
metadata_settings:
@@
-111,8
+131,11
@@
outputs:
host_prep_tasks:
- name: create persistent logs directory
file:
host_prep_tasks:
- name: create persistent logs directory
file:
- path:
/var/log/containers/nova
+ path:
"{{ item }}"
state: directory
state: directory
+ with_items:
+ - /var/log/containers/nova
+ - /var/log/containers/httpd/nova-placement
upgrade_tasks:
- name: Stop and disable nova_placement service (running under httpd)
tags: step2
upgrade_tasks:
- name: Stop and disable nova_placement service (running under httpd)
tags: step2