openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix docker nova logging"

Browse Source
This commit is contained in:
Zuul
2018-02-09 12:45:18 +00:00
committed by Gerrit Code Review
parent 4bef5bd4e4 8318923dd7
commit 5ed2221959
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/services/nova-compute.yaml
View File

@@ -111,7 +111,7 @@ outputs:
command: command:
list_join: list_join:
- ' ' - ' '
- - /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf - - /usr/bin/nova-compute
- get_attr: [NovaLogging, cmd_extra_args] - get_attr: [NovaLogging, cmd_extra_args]
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"

2
docker/services/nova-ironic.yaml
View File

@@ -74,7 +74,7 @@ outputs:
config_image: {get_param: DockerNovaConfigImage} config_image: {get_param: DockerNovaConfigImage}
kolla_config: kolla_config:
/var/lib/kolla/config_files/nova_ironic.json: /var/lib/kolla/config_files/nova_ironic.json:
command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf command: /usr/bin/nova-compute
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"

4
docker/services/nova-libvirt.yaml
View File

@@ -140,8 +140,8 @@ outputs:
command: command:
if: if:
- use_tls_for_live_migration - use_tls_for_live_migration
- /usr/sbin/libvirtd --listen --config /etc/libvirt/libvirtd.conf - /usr/sbin/libvirtd --listen
- /usr/sbin/libvirtd --config /etc/libvirt/libvirtd.conf - /usr/sbin/libvirtd
config_files: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"