From bf14d324223de6864d63a61b1c364be00928800d Mon Sep 17 00:00:00 2001 From: dave kormann Date: Mon, 21 Sep 2020 14:46:23 -0400 Subject: [PATCH] Rebalance root disk storage Experience with real-world deployments has shown that the bulk of the REC storage requirements are for logs. This change reworks the LV allocation on the root disk to reflect this: - The LV for /home is removed; /home will be on the root filesystem - The mariadb and swift LVs are significantly reduced in size, as neither is used by the RIC or the REC (beyond Keystone) - the /var/log/audit LV is removed. /var/log/audit will share space with the rest of /var/log - /var/log is used as the "free hog" lv, taking up any space not used by other VGs. signed-off-by: dave kormann Change-Id: I34502aa156e145c4b30a57f263c106aa89b39073 --- partfs_rootdisk/localstorage/caas/caas_master.yaml | 6 +++--- partfs_rootdisk/localstorage/caas/ceph.yaml | 2 +- partfs_rootdisk/localstorage/caas/common.yaml | 10 +--------- partfs_rootdisk/localstorage/multinode_hybrid/ceph.yaml | 2 +- partfs_rootdisk/localstorage/multinode_hybrid/cinder.yaml | 2 +- partfs_rootdisk/localstorage/multinode_hybrid/common.yaml | 10 +--------- .../localstorage/multinode_hybrid/multiple_hybrid.yaml | 4 ++-- 7 files changed, 10 insertions(+), 26 deletions(-) diff --git a/partfs_rootdisk/localstorage/caas/caas_master.yaml b/partfs_rootdisk/localstorage/caas/caas_master.yaml index 26c91ba..b695694 100644 --- a/partfs_rootdisk/localstorage/caas/caas_master.yaml +++ b/partfs_rootdisk/localstorage/caas/caas_master.yaml @@ -19,10 +19,10 @@ logical_volumes: mount_point: "/var/lib/docker" mount_opts: noatime,nodiratime,logbufs=8,pquota - lvm_name: "swift" - lvm_size: "9%VG" + lvm_size: "2%VG" mount_point: "/srv/node/swift" mount_opts: noatime,nodiratime - lvm_name: "mariadb" - lvm_size: "10%VG" + lvm_size: "2%VG" mount_point: "/var/lib/mysql" - mount_opts: noatime,nodiratime,nosuid,noexec + mount_opts: "noatime,nodiratime,nosuid,noexec,context=system_u:object_r:mysqld_db_t:s0" diff --git a/partfs_rootdisk/localstorage/caas/ceph.yaml b/partfs_rootdisk/localstorage/caas/ceph.yaml index ec9f499..1a34662 100644 --- a/partfs_rootdisk/localstorage/caas/ceph.yaml +++ b/partfs_rootdisk/localstorage/caas/ceph.yaml @@ -20,6 +20,6 @@ logical_volumes: mount_point: "/var/lib/ceph/mgr" mount_opts: noatime,nodev,nosuid,noexec - lvm_name: "cephmon" - lvm_size: "10%VG" + lvm_size: "5%VG" mount_point: "/var/lib/ceph/mon" mount_opts: noatime,nodev,nosuid,noexec diff --git a/partfs_rootdisk/localstorage/caas/common.yaml b/partfs_rootdisk/localstorage/caas/common.yaml index e2be221..0474f76 100644 --- a/partfs_rootdisk/localstorage/caas/common.yaml +++ b/partfs_rootdisk/localstorage/caas/common.yaml @@ -16,15 +16,7 @@ service_profiles: - caas_worker - storage logical_volumes: - - lvm_name: "audit" - lvm_size: "10%VG" - mount_point: "/var/log/audit" - mount_opts: noatime,nodev,nosuid,noexec - lvm_name: "log" - lvm_size: "30%VG" + lvm_size: "variable" mount_point: "/var/log" mount_opts: noatime,nodev,nosuid,noexec - - lvm_name: "home" - lvm_size: "variable" - mount_point: "/home" - mount_opts: noatime,nodev,nosuid diff --git a/partfs_rootdisk/localstorage/multinode_hybrid/ceph.yaml b/partfs_rootdisk/localstorage/multinode_hybrid/ceph.yaml index 59fe9dd..96b03e8 100644 --- a/partfs_rootdisk/localstorage/multinode_hybrid/ceph.yaml +++ b/partfs_rootdisk/localstorage/multinode_hybrid/ceph.yaml @@ -19,6 +19,6 @@ logical_volumes: mount_point: "/var/lib/ceph/mgr" mount_opts: noatime,nodev,nosuid,noexec - lvm_name: "cephmon" - lvm_size: "10%VG" + lvm_size: "5%VG" mount_point: "/var/lib/ceph/mon" mount_opts: noatime,nodev,nosuid,noexec diff --git a/partfs_rootdisk/localstorage/multinode_hybrid/cinder.yaml b/partfs_rootdisk/localstorage/multinode_hybrid/cinder.yaml index 2eb8a61..bfc9876 100644 --- a/partfs_rootdisk/localstorage/multinode_hybrid/cinder.yaml +++ b/partfs_rootdisk/localstorage/multinode_hybrid/cinder.yaml @@ -16,6 +16,6 @@ service_profiles: - cephcontroller logical_volumes: - lvm_name: "cinder" - lvm_size: "15%VG" + lvm_size: "5%VG" mount_point: "/var/lib/cinder" mount_opts: noatime,nodev,nosuid,noexec diff --git a/partfs_rootdisk/localstorage/multinode_hybrid/common.yaml b/partfs_rootdisk/localstorage/multinode_hybrid/common.yaml index c43f231..496e455 100644 --- a/partfs_rootdisk/localstorage/multinode_hybrid/common.yaml +++ b/partfs_rootdisk/localstorage/multinode_hybrid/common.yaml @@ -19,15 +19,7 @@ service_profiles: - cephcontroller - compute logical_volumes: - - lvm_name: "audit" - lvm_size: "10%VG" - mount_point: "/var/log/audit" - mount_opts: noatime,nodev,nosuid,noexec - lvm_name: "log" - lvm_size: "15%VG" + lvm_size: "variable" mount_point: "/var/log" mount_opts: noatime,nodev,nosuid,noexec - - lvm_name: "home" - lvm_size: "variable" - mount_point: "/home" - mount_opts: noatime,nodev,nosuid diff --git a/partfs_rootdisk/localstorage/multinode_hybrid/multiple_hybrid.yaml b/partfs_rootdisk/localstorage/multinode_hybrid/multiple_hybrid.yaml index 26c91ba..220bb2b 100644 --- a/partfs_rootdisk/localstorage/multinode_hybrid/multiple_hybrid.yaml +++ b/partfs_rootdisk/localstorage/multinode_hybrid/multiple_hybrid.yaml @@ -19,10 +19,10 @@ logical_volumes: mount_point: "/var/lib/docker" mount_opts: noatime,nodiratime,logbufs=8,pquota - lvm_name: "swift" - lvm_size: "9%VG" + lvm_size: "2%VG" mount_point: "/srv/node/swift" mount_opts: noatime,nodiratime - lvm_name: "mariadb" - lvm_size: "10%VG" + lvm_size: "2%VG" mount_point: "/var/lib/mysql" mount_opts: noatime,nodiratime,nosuid,noexec -- 2.16.6