Merge "VStorage: changed default log path"

openstack · Jul 20, 2017 · b529c32 · b529c32
2 parents 34d77e8 + 7f5921f
commit b529c32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py
@@ -984,7 +984,7 @@
 """
               ),
     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.
 

diff --git a/nova/tests/unit/virt/libvirt/volume/test_vzstorage.py b/nova/tests/unit/virt/libvirt/volume/test_vzstorage.py
@@ -40,7 +40,7 @@ def test_libvirt_vzstorage_driver_opts_negative(self):
         """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 @@ def brick_conn_vol(data):
         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'])