From a42248f49b8b9464e1fdc2e94214292e62c33588 Mon Sep 17 00:00:00 2001 From: Baha Mesleh Date: Fri, 22 Mar 2019 13:37:47 +0200 Subject: [PATCH] Initial commit Change-Id: I804eabed0b99cbf9c0900c93d932aa8f4fbf6f64 Signed-off-by: Baha Mesleh --- .gitreview | 5 + LICENSE | 202 +++++++++++++++++++++ partfs_rootdisk.spec | 38 ++++ partfs_rootdisk/localstorage/caas/caas_master.yaml | 24 +++ partfs_rootdisk/localstorage/caas/ceph.yaml | 25 +++ partfs_rootdisk/localstorage/caas/common.yaml | 30 +++ .../localstorage/multinode_hybrid/ceph.yaml | 24 +++ .../localstorage/multinode_hybrid/cinder.yaml | 21 +++ .../localstorage/multinode_hybrid/common.yaml | 33 ++++ .../multinode_hybrid/multiple_hybrid.yaml | 24 +++ partfs_rootdisk/localstorage/openstack/ceph.yaml | 24 +++ partfs_rootdisk/localstorage/openstack/cinder.yaml | 22 +++ partfs_rootdisk/localstorage/openstack/common.yaml | 34 ++++ partfs_rootdisk/tests/__init__.py | 13 ++ partfs_rootdisk/tests/inputs/double_profile.json | 46 +++++ partfs_rootdisk/tests/inputs/fewer_partition.json | 41 +++++ partfs_rootdisk/tests/inputs/missing_volume.json | 61 +++++++ partfs_rootdisk/tests/inputs/missing_volume2.json | 60 ++++++ .../tests/inputs/multinode_hybrid1.json | 179 ++++++++++++++++++ .../tests/inputs/multinode_hybrid2.json | 147 +++++++++++++++ .../tests/inputs/multinode_hybrid3.json | 179 ++++++++++++++++++ .../tests/inputs/multinode_hybrid4.json | 179 ++++++++++++++++++ .../tests/inputs/multinode_hybrid5.json | 147 +++++++++++++++ .../tests/inputs/multinode_hybrid6.json | 147 +++++++++++++++ .../tests/inputs/multinode_hybrid7.json | 147 +++++++++++++++ .../tests/inputs/multinode_hybrid8.json | 147 +++++++++++++++ .../tests/inputs/multinode_hybrid9.json | 174 ++++++++++++++++++ partfs_rootdisk/tests/inputs/single_profile.json | 50 +++++ partfs_rootdisk/tests/inputs/triple_profile.json | 67 +++++++ partfs_rootdisk/tests/localstorage_test.py | 92 ++++++++++ partfs_rootdisk/tests/outputs/double_profile.json | 14 ++ partfs_rootdisk/tests/outputs/fewer_partition.json | 9 + partfs_rootdisk/tests/outputs/missing_volume.json | 19 ++ partfs_rootdisk/tests/outputs/missing_volume2.json | 19 ++ .../tests/outputs/multinode_hybrid1.json | 44 +++++ .../tests/outputs/multinode_hybrid2.json | 19 ++ .../tests/outputs/multinode_hybrid3.json | 44 +++++ .../tests/outputs/multinode_hybrid4.json | 44 +++++ .../tests/outputs/multinode_hybrid5.json | 19 ++ .../tests/outputs/multinode_hybrid6.json | 19 ++ .../tests/outputs/multinode_hybrid7.json | 19 ++ .../tests/outputs/multinode_hybrid8.json | 19 ++ .../tests/outputs/multinode_hybrid9.json | 44 +++++ partfs_rootdisk/tests/outputs/single_profile.json | 14 ++ partfs_rootdisk/tests/outputs/triple_profile.json | 19 ++ partfs_rootdisk/tox.ini | 33 ++++ 46 files changed, 2780 insertions(+) create mode 100644 .gitreview create mode 100644 LICENSE create mode 100644 partfs_rootdisk.spec create mode 100644 partfs_rootdisk/localstorage/caas/caas_master.yaml create mode 100644 partfs_rootdisk/localstorage/caas/ceph.yaml create mode 100644 partfs_rootdisk/localstorage/caas/common.yaml create mode 100644 partfs_rootdisk/localstorage/multinode_hybrid/ceph.yaml create mode 100644 partfs_rootdisk/localstorage/multinode_hybrid/cinder.yaml create mode 100644 partfs_rootdisk/localstorage/multinode_hybrid/common.yaml create mode 100644 partfs_rootdisk/localstorage/multinode_hybrid/multiple_hybrid.yaml create mode 100644 partfs_rootdisk/localstorage/openstack/ceph.yaml create mode 100644 partfs_rootdisk/localstorage/openstack/cinder.yaml create mode 100644 partfs_rootdisk/localstorage/openstack/common.yaml create mode 100644 partfs_rootdisk/tests/__init__.py create mode 100644 partfs_rootdisk/tests/inputs/double_profile.json create mode 100644 partfs_rootdisk/tests/inputs/fewer_partition.json create mode 100644 partfs_rootdisk/tests/inputs/missing_volume.json create mode 100644 partfs_rootdisk/tests/inputs/missing_volume2.json create mode 100644 partfs_rootdisk/tests/inputs/multinode_hybrid1.json create mode 100644 partfs_rootdisk/tests/inputs/multinode_hybrid2.json create mode 100644 partfs_rootdisk/tests/inputs/multinode_hybrid3.json create mode 100644 partfs_rootdisk/tests/inputs/multinode_hybrid4.json create mode 100644 partfs_rootdisk/tests/inputs/multinode_hybrid5.json create mode 100644 partfs_rootdisk/tests/inputs/multinode_hybrid6.json create mode 100644 partfs_rootdisk/tests/inputs/multinode_hybrid7.json create mode 100644 partfs_rootdisk/tests/inputs/multinode_hybrid8.json create mode 100644 partfs_rootdisk/tests/inputs/multinode_hybrid9.json create mode 100644 partfs_rootdisk/tests/inputs/single_profile.json create mode 100644 partfs_rootdisk/tests/inputs/triple_profile.json create mode 100644 partfs_rootdisk/tests/localstorage_test.py create mode 100644 partfs_rootdisk/tests/outputs/double_profile.json create mode 100644 partfs_rootdisk/tests/outputs/fewer_partition.json create mode 100644 partfs_rootdisk/tests/outputs/missing_volume.json create mode 100644 partfs_rootdisk/tests/outputs/missing_volume2.json create mode 100644 partfs_rootdisk/tests/outputs/multinode_hybrid1.json create mode 100644 partfs_rootdisk/tests/outputs/multinode_hybrid2.json create mode 100644 partfs_rootdisk/tests/outputs/multinode_hybrid3.json create mode 100644 partfs_rootdisk/tests/outputs/multinode_hybrid4.json create mode 100644 partfs_rootdisk/tests/outputs/multinode_hybrid5.json create mode 100644 partfs_rootdisk/tests/outputs/multinode_hybrid6.json create mode 100644 partfs_rootdisk/tests/outputs/multinode_hybrid7.json create mode 100644 partfs_rootdisk/tests/outputs/multinode_hybrid8.json create mode 100644 partfs_rootdisk/tests/outputs/multinode_hybrid9.json create mode 100644 partfs_rootdisk/tests/outputs/single_profile.json create mode 100644 partfs_rootdisk/tests/outputs/triple_profile.json create mode 100644 partfs_rootdisk/tox.ini diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..6b31d0f --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.akraino.org +port=29418 +project=ta/storage +defaultremote=origin diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/partfs_rootdisk.spec b/partfs_rootdisk.spec new file mode 100644 index 0000000..5568878 --- /dev/null +++ b/partfs_rootdisk.spec @@ -0,0 +1,38 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +Name: partfs_rootdisk +Version: %{_version} +Release: 1%{?dist} +Summary: partfs_rootdisk +License: %{_platform_license} +Source0: %{name}-%{version}.tar.gz +Vendor: %{_platform_vendor} +BuildArch: noarch + +%description +Configure root disk partitions + +%prep +%autosetup + +%build + +%install +mkdir -p %{buildroot}/etc/opt/localstorage +rsync -av partfs_rootdisk/localstorage/* %{buildroot}/etc/opt/localstorage + +%files +/etc/opt/localstorage + +%post diff --git a/partfs_rootdisk/localstorage/caas/caas_master.yaml b/partfs_rootdisk/localstorage/caas/caas_master.yaml new file mode 100644 index 0000000..01c6b1f --- /dev/null +++ b/partfs_rootdisk/localstorage/caas/caas_master.yaml @@ -0,0 +1,24 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +service_profiles: + - caas_master +logical_volumes: + - lvm_name: "docker" + lvm_size: "20%VG" + mount_point: "/var/lib/docker" + mount_opts: noatime,nodiratime,nobarrier,logbufs=8,pquota + - lvm_name: "swift" + lvm_size: "19%VG" + mount_point: "/srv/node/swift" + mount_opts: noatime,nodiratime,nobarrier diff --git a/partfs_rootdisk/localstorage/caas/ceph.yaml b/partfs_rootdisk/localstorage/caas/ceph.yaml new file mode 100644 index 0000000..ec9f499 --- /dev/null +++ b/partfs_rootdisk/localstorage/caas/ceph.yaml @@ -0,0 +1,25 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +service_profiles: + - caas_master + - cephcontroller +logical_volumes: + - lvm_name: "cephmgr" + lvm_size: "1%VG" + mount_point: "/var/lib/ceph/mgr" + mount_opts: noatime,nodev,nosuid,noexec + - lvm_name: "cephmon" + lvm_size: "10%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 new file mode 100644 index 0000000..e2be221 --- /dev/null +++ b/partfs_rootdisk/localstorage/caas/common.yaml @@ -0,0 +1,30 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +service_profiles: + - caas_master + - 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" + 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 new file mode 100644 index 0000000..59fe9dd --- /dev/null +++ b/partfs_rootdisk/localstorage/multinode_hybrid/ceph.yaml @@ -0,0 +1,24 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +service_profiles: + - cephcontroller +logical_volumes: + - lvm_name: "cephmgr" + lvm_size: "1%VG" + mount_point: "/var/lib/ceph/mgr" + mount_opts: noatime,nodev,nosuid,noexec + - lvm_name: "cephmon" + lvm_size: "10%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 new file mode 100644 index 0000000..2eb8a61 --- /dev/null +++ b/partfs_rootdisk/localstorage/multinode_hybrid/cinder.yaml @@ -0,0 +1,21 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +service_profiles: + - controller + - cephcontroller +logical_volumes: + - lvm_name: "cinder" + lvm_size: "15%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 new file mode 100644 index 0000000..c43f231 --- /dev/null +++ b/partfs_rootdisk/localstorage/multinode_hybrid/common.yaml @@ -0,0 +1,33 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +service_profiles: + - caas_master + - controller + - storage + - caas_worker + - 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" + 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 new file mode 100644 index 0000000..01c6b1f --- /dev/null +++ b/partfs_rootdisk/localstorage/multinode_hybrid/multiple_hybrid.yaml @@ -0,0 +1,24 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +service_profiles: + - caas_master +logical_volumes: + - lvm_name: "docker" + lvm_size: "20%VG" + mount_point: "/var/lib/docker" + mount_opts: noatime,nodiratime,nobarrier,logbufs=8,pquota + - lvm_name: "swift" + lvm_size: "19%VG" + mount_point: "/srv/node/swift" + mount_opts: noatime,nodiratime,nobarrier diff --git a/partfs_rootdisk/localstorage/openstack/ceph.yaml b/partfs_rootdisk/localstorage/openstack/ceph.yaml new file mode 100644 index 0000000..59fe9dd --- /dev/null +++ b/partfs_rootdisk/localstorage/openstack/ceph.yaml @@ -0,0 +1,24 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +service_profiles: + - cephcontroller +logical_volumes: + - lvm_name: "cephmgr" + lvm_size: "1%VG" + mount_point: "/var/lib/ceph/mgr" + mount_opts: noatime,nodev,nosuid,noexec + - lvm_name: "cephmon" + lvm_size: "10%VG" + mount_point: "/var/lib/ceph/mon" + mount_opts: noatime,nodev,nosuid,noexec diff --git a/partfs_rootdisk/localstorage/openstack/cinder.yaml b/partfs_rootdisk/localstorage/openstack/cinder.yaml new file mode 100644 index 0000000..9c00950 --- /dev/null +++ b/partfs_rootdisk/localstorage/openstack/cinder.yaml @@ -0,0 +1,22 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +service_profiles: + - management + - controller + - cephcontroller +logical_volumes: + - lvm_name: "cinder" + lvm_size: "25%VG" + mount_point: "/var/lib/cinder" + mount_opts: noatime,nodev,nosuid,noexec diff --git a/partfs_rootdisk/localstorage/openstack/common.yaml b/partfs_rootdisk/localstorage/openstack/common.yaml new file mode 100644 index 0000000..11a7f9d --- /dev/null +++ b/partfs_rootdisk/localstorage/openstack/common.yaml @@ -0,0 +1,34 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +service_profiles: + - base + - management + - cephcontroller + - controller + - compute + - storage +logical_volumes: + - lvm_name: "audit" + lvm_size: "7%VG" + mount_point: "/var/log/audit" + mount_opts: noatime,nodev,nosuid,noexec + - lvm_name: "log" + lvm_size: "23%VG" + 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/tests/__init__.py b/partfs_rootdisk/tests/__init__.py new file mode 100644 index 0000000..e4df1e8 --- /dev/null +++ b/partfs_rootdisk/tests/__init__.py @@ -0,0 +1,13 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/partfs_rootdisk/tests/inputs/double_profile.json b/partfs_rootdisk/tests/inputs/double_profile.json new file mode 100644 index 0000000..0330c61 --- /dev/null +++ b/partfs_rootdisk/tests/inputs/double_profile.json @@ -0,0 +1,46 @@ +{ + "inventory_hostname": "controller-1", + "localstorage": { + "compute": { + "home": { + "lvm_size": "5000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "10000", + "mount_point": "/var/log", + "lvm_name": "log" + } + }, + "controller": { + "home": { + "lvm_size": "10000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "5000", + "mount_point": "/var/log", + "lvm_name": "log" + } + }, + "storage": { + "home": { + "lvm_size": "5000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "5000", + "mount_point": "/var/log", + "lvm_name": "log" + } + } + }, + "hosts": { + "controller-1": { + "service_profiles": ["controller", "compute"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/fewer_partition.json b/partfs_rootdisk/tests/inputs/fewer_partition.json new file mode 100644 index 0000000..b46e91e --- /dev/null +++ b/partfs_rootdisk/tests/inputs/fewer_partition.json @@ -0,0 +1,41 @@ +{ + "inventory_hostname": "controller-1", + "localstorage": { + "compute": { + "log": { + "lvm_size": "5000", + "mount_point": "/var/log", + "lvm_name": "log" + } + }, + "controller": { + "home": { + "lvm_size": "10000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "10000", + "mount_point": "/var/log", + "lvm_name": "log" + } + }, + "storage": { + "home": { + "lvm_size": "5000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "5000", + "mount_point": "/var/log", + "lvm_name": "log" + } + } + }, + "hosts": { + "controller-1": { + "service_profiles": ["compute"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/missing_volume.json b/partfs_rootdisk/tests/inputs/missing_volume.json new file mode 100644 index 0000000..604936b --- /dev/null +++ b/partfs_rootdisk/tests/inputs/missing_volume.json @@ -0,0 +1,61 @@ +{ + "inventory_hostname": "controller-1", + "openstack": { + "storage_backend": "lvm" + }, + "ceph_configured": false, + "localstorage": { + "compute": { + "home": { + "lvm_size": "5000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "10000", + "mount_point": "/var/log", + "lvm_name": "log" + } + }, + "controller": { + "home": { + "lvm_size": "10000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "5000", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "5000", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + + }, + "storage": { + "home": { + "lvm_size": "5000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "5000", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10000", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + } + }, + "hosts": { + "controller-1": { + "service_profiles": ["controller", "compute", "storage"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/missing_volume2.json b/partfs_rootdisk/tests/inputs/missing_volume2.json new file mode 100644 index 0000000..7b5579a --- /dev/null +++ b/partfs_rootdisk/tests/inputs/missing_volume2.json @@ -0,0 +1,60 @@ +{ + "inventory_hostname": "controller-1", + "openstack": { + "storage_backend": "lvm" + }, + "ceph_configured": false, + "localstorage": { + "compute": { + "home": { + "lvm_size": "5000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "10000", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "11000", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "controller": { + "home": { + "lvm_size": "10000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "5000", + "mount_point": "/var/log", + "lvm_name": "log" + } + }, + "storage": { + "home": { + "lvm_size": "5000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "5000", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10000", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + } + }, + "hosts": { + "controller-1": { + "service_profiles": ["controller", "compute", "storage"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/multinode_hybrid1.json b/partfs_rootdisk/tests/inputs/multinode_hybrid1.json new file mode 100644 index 0000000..c1f6468 --- /dev/null +++ b/partfs_rootdisk/tests/inputs/multinode_hybrid1.json @@ -0,0 +1,179 @@ +{ + "inventory_hostname": "controller-1", + "openstack": { + "storage_backend": "ceph" + }, + "ceph_configured": true, + "localstorage": { + "controller": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + }, + "caas_master": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "docker": { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + "swift": { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + } + }, + "management": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "docker": { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + "swift": { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + }, + "cephcontroller": { + "cephmgr": { + "lvm_size": "1%VG", + "mount_point": "/var/lib/ceph/mgr", + "lvm_name": "cephmgr" + }, + "cephmon": { + "lvm_size": "10%VG", + "mount_point": "/var/lib/ceph/mon", + "lvm_name": "cephmon" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + }, + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "compute": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "storage": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "caas_worker": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + } + + }, + "hosts": { + "controller-1": { + "service_profiles": ["controller", "compute", "storage", "caas_master", "management"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/multinode_hybrid2.json b/partfs_rootdisk/tests/inputs/multinode_hybrid2.json new file mode 100644 index 0000000..a6fe9dc --- /dev/null +++ b/partfs_rootdisk/tests/inputs/multinode_hybrid2.json @@ -0,0 +1,147 @@ +{ + "inventory_hostname": "compute-1", + "openstack": { + "storage_backend": "ceph" + }, + "ceph_configured": true, + "localstorage": { + "controller": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + }, + "caas_master": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "docker": { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + "swift": { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + } + }, + "cephcontroller": { + "cephmgr": { + "lvm_size": "1%VG", + "mount_point": "/var/lib/ceph/mgr", + "lvm_name": "cephmgr" + }, + "cephmon": { + "lvm_size": "10%VG", + "mount_point": "/var/lib/ceph/mon", + "lvm_name": "cephmon" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + }, + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "compute": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "storage": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "caas_worker": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + } + + }, + "hosts": { + "compute-1": { + "service_profiles": ["caas_worker"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/multinode_hybrid3.json b/partfs_rootdisk/tests/inputs/multinode_hybrid3.json new file mode 100644 index 0000000..4def857 --- /dev/null +++ b/partfs_rootdisk/tests/inputs/multinode_hybrid3.json @@ -0,0 +1,179 @@ +{ + "inventory_hostname": "controller-1", + "openstack": { + "storage_backend": "ceph" + }, + "ceph_configured": true, + "localstorage": { + "controller": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + }, + "caas_master": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "docker": { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + "swift": { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + } + }, + "management": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "docker": { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + "swift": { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + }, + "cephcontroller": { + "cephmgr": { + "lvm_size": "1%VG", + "mount_point": "/var/lib/ceph/mgr", + "lvm_name": "cephmgr" + }, + "cephmon": { + "lvm_size": "10%VG", + "mount_point": "/var/lib/ceph/mon", + "lvm_name": "cephmon" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + }, + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "compute": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "storage": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "caas_worker": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + } + + }, + "hosts": { + "controller-1": { + "service_profiles": ["controller", "compute", "caas_master", "management"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/multinode_hybrid4.json b/partfs_rootdisk/tests/inputs/multinode_hybrid4.json new file mode 100644 index 0000000..28aebbf --- /dev/null +++ b/partfs_rootdisk/tests/inputs/multinode_hybrid4.json @@ -0,0 +1,179 @@ +{ + "inventory_hostname": "controller-1", + "openstack": { + "storage_backend": "ceph" + }, + "ceph_configured": true, + "localstorage": { + "controller": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + }, + "caas_master": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "docker": { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + "swift": { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + } + }, + "management": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "docker": { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + "swift": { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + }, + "cephcontroller": { + "cephmgr": { + "lvm_size": "1%VG", + "mount_point": "/var/lib/ceph/mgr", + "lvm_name": "cephmgr" + }, + "cephmon": { + "lvm_size": "10%VG", + "mount_point": "/var/lib/ceph/mon", + "lvm_name": "cephmon" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + }, + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "compute": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "storage": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "caas_worker": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + } + + }, + "hosts": { + "controller-1": { + "service_profiles": ["controller", "caas_master", "management"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/multinode_hybrid5.json b/partfs_rootdisk/tests/inputs/multinode_hybrid5.json new file mode 100644 index 0000000..85deaeb --- /dev/null +++ b/partfs_rootdisk/tests/inputs/multinode_hybrid5.json @@ -0,0 +1,147 @@ +{ + "inventory_hostname": "compute-1", + "openstack": { + "storage_backend": "ceph" + }, + "ceph_configured": true, + "localstorage": { + "controller": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + }, + "caas_master": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "docker": { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + "swift": { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + } + }, + "cephcontroller": { + "cephmgr": { + "lvm_size": "1%VG", + "mount_point": "/var/lib/ceph/mgr", + "lvm_name": "cephmgr" + }, + "cephmon": { + "lvm_size": "10%VG", + "mount_point": "/var/lib/ceph/mon", + "lvm_name": "cephmon" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + }, + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "compute": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "storage": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "caas_worker": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + } + + }, + "hosts": { + "compute-1": { + "service_profiles": ["compute", "storage"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/multinode_hybrid6.json b/partfs_rootdisk/tests/inputs/multinode_hybrid6.json new file mode 100644 index 0000000..fe23a31 --- /dev/null +++ b/partfs_rootdisk/tests/inputs/multinode_hybrid6.json @@ -0,0 +1,147 @@ +{ + "inventory_hostname": "compute-1", + "openstack": { + "storage_backend": "ceph" + }, + "ceph_configured": true, + "localstorage": { + "controller": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + }, + "caas_master": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "docker": { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + "swift": { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + } + }, + "cephcontroller": { + "cephmgr": { + "lvm_size": "1%VG", + "mount_point": "/var/lib/ceph/mgr", + "lvm_name": "cephmgr" + }, + "cephmon": { + "lvm_size": "10%VG", + "mount_point": "/var/lib/ceph/mon", + "lvm_name": "cephmon" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + }, + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "compute": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "storage": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "caas_worker": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + } + + }, + "hosts": { + "compute-1": { + "service_profiles": ["storage", "caas_worker"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/multinode_hybrid7.json b/partfs_rootdisk/tests/inputs/multinode_hybrid7.json new file mode 100644 index 0000000..a22f4c6 --- /dev/null +++ b/partfs_rootdisk/tests/inputs/multinode_hybrid7.json @@ -0,0 +1,147 @@ +{ + "inventory_hostname": "compute-1", + "openstack": { + "storage_backend": "ceph" + }, + "ceph_configured": true, + "localstorage": { + "controller": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + }, + "caas_master": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "docker": { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + "swift": { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + } + }, + "cephcontroller": { + "cephmgr": { + "lvm_size": "1%VG", + "mount_point": "/var/lib/ceph/mgr", + "lvm_name": "cephmgr" + }, + "cephmon": { + "lvm_size": "10%VG", + "mount_point": "/var/lib/ceph/mon", + "lvm_name": "cephmon" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + }, + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "compute": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "storage": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "caas_worker": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + } + + }, + "hosts": { + "compute-1": { + "service_profiles": ["compute"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/multinode_hybrid8.json b/partfs_rootdisk/tests/inputs/multinode_hybrid8.json new file mode 100644 index 0000000..7807d21 --- /dev/null +++ b/partfs_rootdisk/tests/inputs/multinode_hybrid8.json @@ -0,0 +1,147 @@ +{ + "inventory_hostname": "compute-1", + "openstack": { + "storage_backend": "ceph" + }, + "ceph_configured": true, + "localstorage": { + "controller": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + }, + "caas_master": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "docker": { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + "swift": { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + } + }, + "cephcontroller": { + "cephmgr": { + "lvm_size": "1%VG", + "mount_point": "/var/lib/ceph/mgr", + "lvm_name": "cephmgr" + }, + "cephmon": { + "lvm_size": "10%VG", + "mount_point": "/var/lib/ceph/mon", + "lvm_name": "cephmon" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + }, + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "compute": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "storage": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "caas_worker": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + } + + }, + "hosts": { + "compute-1": { + "service_profiles": ["storage"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/multinode_hybrid9.json b/partfs_rootdisk/tests/inputs/multinode_hybrid9.json new file mode 100644 index 0000000..aa5eaa7 --- /dev/null +++ b/partfs_rootdisk/tests/inputs/multinode_hybrid9.json @@ -0,0 +1,174 @@ +{ + "inventory_hostname": "controller-1", + "openstack": { + "storage_backend": "ceph" + }, + "ceph_configured": true, + "localstorage": { + "controller": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + }, + "caas_master": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "docker": { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + "swift": { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + } + }, + "management": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + "docker": { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + "swift": { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + } + }, + "cephcontroller": { + "cephmgr": { + "lvm_size": "1%VG", + "mount_point": "/var/lib/ceph/mgr", + "lvm_name": "cephmgr" + }, + "cephmon": { + "lvm_size": "10%VG", + "mount_point": "/var/lib/ceph/mon", + "lvm_name": "cephmon" + }, + "cinder": { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + }, + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "compute": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "storage": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + }, + "caas_worker": { + "home": { + "lvm_size": "variable", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + } + + }, + "hosts": { + "controller-1": { + "service_profiles": ["caas_master", "management"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/single_profile.json b/partfs_rootdisk/tests/inputs/single_profile.json new file mode 100644 index 0000000..3ca07df --- /dev/null +++ b/partfs_rootdisk/tests/inputs/single_profile.json @@ -0,0 +1,50 @@ +{ + "inventory_hostname": "controller-1", + "openstack": { + "storage_backend": "lvm" + }, + "ceph_configured": false, + "localstorage": { + "compute": { + "home": { + "lvm_size": "5000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "5000", + "mount_point": "/var/log", + "lvm_name": "log" + } + }, + "controller": { + "home": { + "lvm_size": "10000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "10000", + "mount_point": "/var/log", + "lvm_name": "log" + } + }, + "storage": { + "home": { + "lvm_size": "5000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "5000", + "mount_point": "/var/log", + "lvm_name": "log" + } + } + }, + "hosts": { + "controller-1": { + "service_profiles": ["controller"] + } + } +} diff --git a/partfs_rootdisk/tests/inputs/triple_profile.json b/partfs_rootdisk/tests/inputs/triple_profile.json new file mode 100644 index 0000000..4d3831e --- /dev/null +++ b/partfs_rootdisk/tests/inputs/triple_profile.json @@ -0,0 +1,67 @@ +{ + "inventory_hostname": "controller-1", + "openstack": { + "storage_backend": "lvm" + }, + "ceph_configured": false, + "localstorage": { + "compute": { + "home": { + "lvm_size": "5000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "10000", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "5000", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + + }, + "controller": { + "home": { + "lvm_size": "10000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "5000", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "5000", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + + }, + "storage": { + "home": { + "lvm_size": "5000", + "mount_point": "/home", + "lvm_name": "home" + }, + "log": { + "lvm_size": "5000", + "mount_point": "/var/log", + "lvm_name": "log" + }, + "audit": { + "lvm_size": "10000", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + } + }, + "hosts": { + "controller-1": { + "service_profiles": ["controller", "compute", "storage"] + } + } +} diff --git a/partfs_rootdisk/tests/localstorage_test.py b/partfs_rootdisk/tests/localstorage_test.py new file mode 100644 index 0000000..763e377 --- /dev/null +++ b/partfs_rootdisk/tests/localstorage_test.py @@ -0,0 +1,92 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +import unittest +import json +import jinja2 +from ansible.plugins.filter.core import regex_search + + +class LocalstorageTest(unittest.TestCase): + + def setUp(self): + env = jinja2.Environment( + loader=jinja2.FileSystemLoader('./role/templates') + ) + env.filters['search'] = regex_search + env.tests['search'] = regex_search + self.template = env.get_template('localstorage.j2') + + def ordered(self, obj): + if isinstance(obj, dict): + return sorted((k, self.ordered(v)) for k, v in obj.items()) + if isinstance(obj, list): + return sorted(self.ordered(x) for x in obj) + return obj + + def verify(self, usecase): + with open('./tests/inputs/%s.json' % usecase) as data: + inventory = json.load(data) + rendered = self.template.render(inventory) + actual = json.loads(rendered) + with open('./tests/outputs/%s.json' % usecase) as data: + expected = json.load(data) + self.assertEqual(self.ordered(actual), self.ordered(expected)) + + def test_single_profile(self): + self.verify('single_profile') + + def test_double_profile(self): + self.verify('double_profile') + + def test_triple_profile(self): + self.verify('triple_profile') + + def test_missing_volume(self): + self.verify('missing_volume') + + def test_missing_volume2(self): + self.verify('missing_volume2') + + def test_fewer_partition(self): + self.verify('fewer_partition') + + def test_multinode_hybrid1(self): + self.verify('multinode_hybrid1') + + def test_multinode_hybrid2(self): + self.verify('multinode_hybrid2') + + def test_multinode_hybrid3(self): + self.verify('multinode_hybrid3') + + def test_multinode_hybrid4(self): + self.verify('multinode_hybrid4') + + def test_multinode_hybrid5(self): + self.verify('multinode_hybrid5') + + def test_multinode_hybrid6(self): + self.verify('multinode_hybrid6') + + def test_multinode_hybrid7(self): + self.verify('multinode_hybrid7') + + def test_multinode_hybrid8(self): + self.verify('multinode_hybrid8') + + def test_multinode_hybrid9(self): + self.verify('multinode_hybrid9') + +if __name__ == '__main__': + unittest.main() diff --git a/partfs_rootdisk/tests/outputs/double_profile.json b/partfs_rootdisk/tests/outputs/double_profile.json new file mode 100644 index 0000000..11bba33 --- /dev/null +++ b/partfs_rootdisk/tests/outputs/double_profile.json @@ -0,0 +1,14 @@ +{ + "device_mapping": [ + { + "lvm_size": "10000", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "10000", + "mount_point": "/var/log", + "lvm_name": "log" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/fewer_partition.json b/partfs_rootdisk/tests/outputs/fewer_partition.json new file mode 100644 index 0000000..3960533 --- /dev/null +++ b/partfs_rootdisk/tests/outputs/fewer_partition.json @@ -0,0 +1,9 @@ +{ + "device_mapping": [ + { + "lvm_size": "5000", + "mount_point": "/var/log", + "lvm_name": "log" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/missing_volume.json b/partfs_rootdisk/tests/outputs/missing_volume.json new file mode 100644 index 0000000..106468d --- /dev/null +++ b/partfs_rootdisk/tests/outputs/missing_volume.json @@ -0,0 +1,19 @@ +{ + "device_mapping": [ + { + "lvm_size": "10000", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "10000", + "mount_point": "/var/log", + "lvm_name": "log" + }, + { + "lvm_size": "10000", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/missing_volume2.json b/partfs_rootdisk/tests/outputs/missing_volume2.json new file mode 100644 index 0000000..b58c534 --- /dev/null +++ b/partfs_rootdisk/tests/outputs/missing_volume2.json @@ -0,0 +1,19 @@ +{ + "device_mapping": [ + { + "lvm_size": "10000", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "10000", + "mount_point": "/var/log", + "lvm_name": "log" + }, + { + "lvm_size": "11000", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/multinode_hybrid1.json b/partfs_rootdisk/tests/outputs/multinode_hybrid1.json new file mode 100644 index 0000000..1007b22 --- /dev/null +++ b/partfs_rootdisk/tests/outputs/multinode_hybrid1.json @@ -0,0 +1,44 @@ +{ + "device_mapping": [ + { + "lvm_size": "10%VG", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + }, + { + "lvm_size": "1%VG", + "mount_point": "/var/lib/ceph/mgr", + "lvm_name": "cephmgr" + }, + { + "lvm_size": "10%VG", + "mount_point": "/var/lib/ceph/mon", + "lvm_name": "cephmon" + }, + { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/multinode_hybrid2.json b/partfs_rootdisk/tests/outputs/multinode_hybrid2.json new file mode 100644 index 0000000..c58712f --- /dev/null +++ b/partfs_rootdisk/tests/outputs/multinode_hybrid2.json @@ -0,0 +1,19 @@ +{ + "device_mapping": [ + { + "lvm_size": "75%VG", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/multinode_hybrid3.json b/partfs_rootdisk/tests/outputs/multinode_hybrid3.json new file mode 100644 index 0000000..1007b22 --- /dev/null +++ b/partfs_rootdisk/tests/outputs/multinode_hybrid3.json @@ -0,0 +1,44 @@ +{ + "device_mapping": [ + { + "lvm_size": "10%VG", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + }, + { + "lvm_size": "1%VG", + "mount_point": "/var/lib/ceph/mgr", + "lvm_name": "cephmgr" + }, + { + "lvm_size": "10%VG", + "mount_point": "/var/lib/ceph/mon", + "lvm_name": "cephmon" + }, + { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/multinode_hybrid4.json b/partfs_rootdisk/tests/outputs/multinode_hybrid4.json new file mode 100644 index 0000000..1007b22 --- /dev/null +++ b/partfs_rootdisk/tests/outputs/multinode_hybrid4.json @@ -0,0 +1,44 @@ +{ + "device_mapping": [ + { + "lvm_size": "10%VG", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + }, + { + "lvm_size": "1%VG", + "mount_point": "/var/lib/ceph/mgr", + "lvm_name": "cephmgr" + }, + { + "lvm_size": "10%VG", + "mount_point": "/var/lib/ceph/mon", + "lvm_name": "cephmon" + }, + { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/multinode_hybrid5.json b/partfs_rootdisk/tests/outputs/multinode_hybrid5.json new file mode 100644 index 0000000..c58712f --- /dev/null +++ b/partfs_rootdisk/tests/outputs/multinode_hybrid5.json @@ -0,0 +1,19 @@ +{ + "device_mapping": [ + { + "lvm_size": "75%VG", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/multinode_hybrid6.json b/partfs_rootdisk/tests/outputs/multinode_hybrid6.json new file mode 100644 index 0000000..54501ab --- /dev/null +++ b/partfs_rootdisk/tests/outputs/multinode_hybrid6.json @@ -0,0 +1,19 @@ +{ + "device_mapping": [ + { + "lvm_size": "75%VG", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/multinode_hybrid7.json b/partfs_rootdisk/tests/outputs/multinode_hybrid7.json new file mode 100644 index 0000000..54501ab --- /dev/null +++ b/partfs_rootdisk/tests/outputs/multinode_hybrid7.json @@ -0,0 +1,19 @@ +{ + "device_mapping": [ + { + "lvm_size": "75%VG", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/multinode_hybrid8.json b/partfs_rootdisk/tests/outputs/multinode_hybrid8.json new file mode 100644 index 0000000..54501ab --- /dev/null +++ b/partfs_rootdisk/tests/outputs/multinode_hybrid8.json @@ -0,0 +1,19 @@ +{ + "device_mapping": [ + { + "lvm_size": "75%VG", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/multinode_hybrid9.json b/partfs_rootdisk/tests/outputs/multinode_hybrid9.json new file mode 100644 index 0000000..1007b22 --- /dev/null +++ b/partfs_rootdisk/tests/outputs/multinode_hybrid9.json @@ -0,0 +1,44 @@ +{ + "device_mapping": [ + { + "lvm_size": "10%VG", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "15%VG", + "mount_point": "/var/log", + "lvm_name": "log" + }, + { + "lvm_size": "10%VG", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + }, + { + "lvm_size": "20%VG", + "mount_point": "/var/lib/docker", + "lvm_name": "docker" + }, + { + "lvm_size": "19%VG", + "mount_point": "/srv/node/swift", + "lvm_name": "swift" + }, + { + "lvm_size": "1%VG", + "mount_point": "/var/lib/ceph/mgr", + "lvm_name": "cephmgr" + }, + { + "lvm_size": "10%VG", + "mount_point": "/var/lib/ceph/mon", + "lvm_name": "cephmon" + }, + { + "lvm_size": "15%VG", + "mount_point": "/var/lib/cinder", + "lvm_name": "cinder" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/single_profile.json b/partfs_rootdisk/tests/outputs/single_profile.json new file mode 100644 index 0000000..11bba33 --- /dev/null +++ b/partfs_rootdisk/tests/outputs/single_profile.json @@ -0,0 +1,14 @@ +{ + "device_mapping": [ + { + "lvm_size": "10000", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "10000", + "mount_point": "/var/log", + "lvm_name": "log" + } + ] +} diff --git a/partfs_rootdisk/tests/outputs/triple_profile.json b/partfs_rootdisk/tests/outputs/triple_profile.json new file mode 100644 index 0000000..106468d --- /dev/null +++ b/partfs_rootdisk/tests/outputs/triple_profile.json @@ -0,0 +1,19 @@ +{ + "device_mapping": [ + { + "lvm_size": "10000", + "mount_point": "/home", + "lvm_name": "home" + }, + { + "lvm_size": "10000", + "mount_point": "/var/log", + "lvm_name": "log" + }, + { + "lvm_size": "10000", + "mount_point": "/var/log/audit", + "lvm_name": "audit" + } + ] +} diff --git a/partfs_rootdisk/tox.ini b/partfs_rootdisk/tox.ini new file mode 100644 index 0000000..0a78f3c --- /dev/null +++ b/partfs_rootdisk/tox.ini @@ -0,0 +1,33 @@ +# Copyright 2019 Nokia + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +[tox] +envlist = py27-pytest,pylint +skipsdist = True + +[testenv] +basepython = python2.7 + +commands = pytest -vv \ + --pep8 \ + --basetemp={envtmpdir} \ + {posargs:./tests} + +deps=pytest + jinja2 + ansible + pytest-pep8 + +[pytest] +cache_dir = .pytest-cache +pep8maxlinelength = 100 -- 2.16.6