[lxc-devel] [lxd/master] lvm: s/LXDPool/LXDThinPool/g

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 381 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180529/3a9ad171/attachment.bin>
-------------- next part --------------
From a94d040023cae0071f531d4ca2504f4609354360 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Tue, 29 May 2018 12:14:44 +0200
Subject: [PATCH] lvm: s/LXDPool/LXDThinPool/g

Closes #4602.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 doc/rest-api.md             | 4 ++--
 doc/storage.md              | 2 +-
 lxd/cluster/config.go       | 2 +-
 lxd/patches.go              | 2 +-
 lxd/storage_lvm_utils.go    | 2 +-
 lxd/storage_pools_config.go | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/rest-api.md b/doc/rest-api.md
index d4e3b4548..8e433a8ac 100644
--- a/doc/rest-api.md
+++ b/doc/rest-api.md
@@ -2280,7 +2280,7 @@ Return:
             "source": "pool1",
             "volume.block.filesystem": "xfs",
             "volume.block.mount_options": "discard",
-            "lvm.thinpool_name": "LXDPool",
+            "lvm.thinpool_name": "LXDThinPool",
             "lvm.vg_name": "pool1",
             "volume.size": "10737418240"
         }
@@ -2501,7 +2501,7 @@ Return:
             "used_by": "",
             "volume.block.filesystem": "xfs",
             "volume.block.mount_options": "discard",
-            "lvm.thinpool_name": "LXDPool",
+            "lvm.thinpool_name": "LXDThinPool",
             "lvm.vg_name": "pool1",
             "volume.size": "10737418240"
         }
diff --git a/doc/storage.md b/doc/storage.md
index 2a8eaf422..94dc3d7a9 100644
--- a/doc/storage.md
+++ b/doc/storage.md
@@ -16,7 +16,7 @@ ceph.osd.pg\_num                | string    | ceph driver
 ceph.osd.pool\_name             | string    | ceph driver                       | name of the pool           | storage\_driver\_ceph              | Name of the osd storage pool.
 ceph.rbd.clone\_copy            | string    | ceph driver                       | true                       | storage\_driver\_ceph              | Whether to use RBD lightweight clones rather than full dataset copies.
 ceph.user.name                  | string    | ceph driver                       | admin                      | storage\_ceph\_user\_name          | The ceph user to use when creating storage pools and volumes.
-lvm.thinpool\_name              | string    | lvm driver                        | LXDPool                    | storage                            | Thin pool where images and containers are created.
+lvm.thinpool\_name              | string    | lvm driver                        | LXDThinPool                | storage                            | Thin pool where images and containers are created.
 lvm.use\_thinpool               | bool      | lvm driver                        | true                       | storage\_lvm\_use\_thinpool        | Whether the storage pool uses a thinpool for logical volumes.
 lvm.vg\_name                    | string    | lvm driver                        | name of the pool           | storage                            | Name of the volume group to create.
 rsync.bwlimit                   | string    | -                                 | 0 (no limit)               | storage\_rsync\_bwlimit            | Specifies the upper limit to be placed on the socket I/O whenever rsync has to be used to transfer storage entities.
diff --git a/lxd/cluster/config.go b/lxd/cluster/config.go
index 73851f81e..19eb4d855 100644
--- a/lxd/cluster/config.go
+++ b/lxd/cluster/config.go
@@ -221,7 +221,7 @@ var ConfigSchema = config.Schema{
 	// Keys deprecated since the implementation of the storage api.
 	"storage.lvm_fstype":           {Setter: deprecatedStorage, Default: "ext4"},
 	"storage.lvm_mount_options":    {Setter: deprecatedStorage, Default: "discard"},
-	"storage.lvm_thinpool_name":    {Setter: deprecatedStorage, Default: "LXDPool"},
+	"storage.lvm_thinpool_name":    {Setter: deprecatedStorage, Default: "LXDThinPool"},
 	"storage.lvm_vg_name":          {Setter: deprecatedStorage},
 	"storage.lvm_volume_size":      {Setter: deprecatedStorage, Default: "10GiB"},
 	"storage.zfs_pool_name":        {Setter: deprecatedStorage},
diff --git a/lxd/patches.go b/lxd/patches.go
index 57e066287..61bacf20a 100644
--- a/lxd/patches.go
+++ b/lxd/patches.go
@@ -878,7 +878,7 @@ func upgradeFromStorageTypeLvm(name string, d *Daemon, defaultPoolName string, d
 	poolConfig["lvm.thinpool_name"] = daemonConfig["storage.lvm_thinpool_name"]
 	if poolConfig["lvm.thinpool_name"] == "" {
 		// If empty we need to set it to the old default.
-		poolConfig["lvm.thinpool_name"] = "LXDPool"
+		poolConfig["lvm.thinpool_name"] = "LXDThinPool"
 	}
 
 	poolConfig["lvm.vg_name"] = daemonConfig["storage.lvm_vg_name"]
diff --git a/lxd/storage_lvm_utils.go b/lxd/storage_lvm_utils.go
index 38813386c..86539fe92 100644
--- a/lxd/storage_lvm_utils.go
+++ b/lxd/storage_lvm_utils.go
@@ -136,7 +136,7 @@ func (s *storageLvm) getLvmThinpoolName() string {
 		return s.pool.Config["lvm.thinpool_name"]
 	}
 
-	return "LXDThinpool"
+	return "LXDThinPool"
 }
 
 func (s *storageLvm) usesThinpool() bool {
diff --git a/lxd/storage_pools_config.go b/lxd/storage_pools_config.go
index c40b06a3d..0f1102cf5 100644
--- a/lxd/storage_pools_config.go
+++ b/lxd/storage_pools_config.go
@@ -226,7 +226,7 @@ func storagePoolFillDefault(name string, driver string, config map[string]string
 
 		if useThinpool && config["lvm.thinpool_name"] == "" {
 			// Unchangeable pool property: Set unconditionally.
-			config["lvm.thinpool_name"] = "LXDThinpool"
+			config["lvm.thinpool_name"] = "LXDThinPool"
 		}
 	}