openstack/tripleo-heat-templates
Code Issues Proposed changes

Fix docker nova logging

Browse Source 
rootwrap.conf is not a nova conf file.
Also cleaned up redundant config file args, were the same as the defaults.

Change-Id: I4db5b0c896e7b3ee00c0d97cf07caacb83f04a9c
Related-bug: 1739492
This commit is contained in:
Oliver Walsh 2018-02-02 14:16:19 +00:00
parent c04b3ed5eb
commit 8318923dd7
3 changed files with 4 additions and 4 deletions
Show Stats 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:
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]
config_files:
- 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}
kolla_config:
/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:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"

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

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