openstack
/
nova
Code Issues Proposed changes

Merge "VStorage: changed default log path"

This commit is contained in:
Jenkins 2017-07-20 12:32:49 +00:00 committed by Gerrit Code Review
parent 34d77e8d1d 7f5921fedf
commit b529c32ca0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/conf/libvirt.py
View File

@ -984,7 +984,7 @@ Related options:
"""
),
cfg.StrOpt('vzstorage_log_path',
default='/var/log/pstorage/%(cluster_name)s/nova.log.gz',
default='/var/log/vstorage/%(cluster_name)s/nova.log.gz',
help="""
Path to vzstorage client log.

4
nova/tests/unit/virt/libvirt/volume/test_vzstorage.py
View File

@ -40,7 +40,7 @@ class LibvirtVZStorageTestCase(test_volume.LibvirtVolumeBaseTestCase):
"""Test that custom options cannot duplicate the configured"""
bad_opts = [
["-c", "clus111", "-v"],
["-l", "/var/log/pstorage.log", "-L", "5x5"],
["-l", "/var/log/vstorage.log", "-L", "5x5"],
["-u", "user1", "-p", "pass1"],
["-v", "-R", "100", "-C", "/ssd"],
]
@ -83,7 +83,7 @@ class LibvirtVZStorageTestCase(test_volume.LibvirtVolumeBaseTestCase):
self.assertEqual('vstorage://testcluster',
connection_info['data']['device_path'])
self.assertEqual('-u stack -g qemu -m 0770 '
'-l /var/log/pstorage/testcluster/nova.log.gz '
'-l /var/log/vstorage/testcluster/nova.log.gz '
'-C /tmp/ssd-cache/testcluster',
connection_info['data']['options'])