Bump version to 0.9.54

It's bad, but sometimes you need to access the API from a very old
software version. So just enable it for now and clean it up later.

.version

@@ -1 +1 @@
-0.9.51
+0.9.54

CHANGELOG.md

@@ -1,5 +1,21 @@
 ## PVC Changelog
 
+###### [v0.9.54](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.54)
+
+[CLI Client] Fixes a bad variable reference from the previous change
+[API Daemon] Enables TLSv1 with an SSLContext object for maximum compatibility
+
+###### [v0.9.53](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.53)
+
+  * [API] Fixes sort order of VM list (for real this time)
+
+###### [v0.9.52](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.52)
+
+  * [CLI] Fixes a bug with vm modify not requiring a cluster
+  * [Docs] Adds a reference to the bootstrap daemon
+  * [API] Adds sorting to node and VM lists for consistency
+  * [Node Daemon/API] Adds kb_ stats values for OSD stats
+
 ###### [v0.9.51](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.51)
 
   * [CLI Client] Fixes a faulty literal_eval when viewing task status

README.md

@@ -19,7 +19,7 @@ As a consequence of its features, PVC makes administrating very high-uptime VMs
 
 PVC also features an optional, fully customizable VM provisioning framework, designed to automate and simplify VM deployments using custom provisioning profiles, scripts, and CloudInit userdata API support.
 
-Installation of PVC is accomplished by two main components: a [Node installer ISO](https://github.com/parallelvirtualcluster/pvc-installer) which creates on-demand installer ISOs, and an [Ansible role framework](https://github.com/parallelvirtualcluster/pvc-ansible) to configure, bootstrap, and administrate the nodes. Once up, the cluster is managed via an HTTP REST API, accessible via a Python Click CLI client or WebUI.
+Installation of PVC is accomplished by two main components: a [Node installer ISO](https://github.com/parallelvirtualcluster/pvc-installer) which creates on-demand installer ISOs, and an [Ansible role framework](https://github.com/parallelvirtualcluster/pvc-ansible) to configure, bootstrap, and administrate the nodes. Installation can also be fully automated with a companion [cluster bootstrapping system](https://github.com/parallelvirtualcluster/pvc-bootstrap). Once up, the cluster is managed via an HTTP REST API, accessible via a Python Click CLI client or WebUI.
 
 Just give it physical servers, and it will run your VMs without you having to think about it, all in just an hour or two of setup time.
 

api-daemon/pvcapid/Daemon.py

@@ -22,10 +22,12 @@
 import os
 import yaml
 
+from ssl import SSLContext, TLSVersion
+
 from distutils.util import strtobool as dustrtobool
 
 # Daemon version
-version = "0.9.51"
+version = "0.9.54"
 
 # API version
 API_VERSION = 1.0
@@ -123,7 +125,10 @@ def entrypoint():
     import pvcapid.flaskapi as pvc_api  # noqa: E402
 
     if config["ssl_enabled"]:
-        context = (config["ssl_cert_file"], config["ssl_key_file"])
+        context = SSLContext()
+        context.minimum_version = TLSVersion.TLSv1
+        context.get_ca_certs()
+        context.load_cert_chain(config["ssl_cert_file"], keyfile=config["ssl_key_file"])
     else:
         context = None
 

client-cli/pvc/pvc.py

@@ -1023,6 +1023,7 @@ def vm_meta(
 )
 @click.argument("domain")
 @click.argument("cfgfile", type=click.File(), default=None, required=False)
+@cluster_req
 def vm_modify(
     domain,
     cfgfile,
@@ -1352,7 +1353,7 @@ def vm_stop(domain, confirm_flag):
 @click.argument("domain")
 @click.option(
     "--force",
-    "force",
+    "force_flag",
     is_flag=True,
     default=False,
     help="Forcibly stop the VM instead of waiting for shutdown.",

client-cli/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="pvc",
-    version="0.9.51",
+    version="0.9.54",
     packages=["pvc", "pvc.cli_lib"],
     install_requires=[
         "Click",

daemon-common/node.py

@@ -236,6 +236,7 @@ def get_list(
 ):
     node_list = []
     full_node_list = zkhandler.children("base.node")
+    full_node_list.sort()
 
     if is_fuzzy and limit:
         # Implicitly assume fuzzy limits

daemon-common/vm.py

@@ -1193,6 +1193,7 @@ def get_list(zkhandler, node, state, tag, limit, is_fuzzy=True, negate=False):
             return False, 'VM state "{}" is not valid.'.format(state)
 
     full_vm_list = zkhandler.children("base.domain")
+    full_vm_list.sort()
 
     # Set our limit to a sensible regex
     if limit:
@@ -1291,4 +1292,4 @@ def get_list(zkhandler, node, state, tag, limit, is_fuzzy=True, negate=False):
             except Exception:
                 pass
 
-    return True, vm_data_list
+    return True, sorted(vm_data_list, key=lambda d: d["name"])

debian/changelog

@@ -1,3 +1,25 @@
+pvc (0.9.54-0) unstable; urgency=high
+
+[CLI Client] Fixes a bad variable reference from the previous change
+[API Daemon] Enables TLSv1 with an SSLContext object for maximum compatibility
+
+ -- Joshua M. Boniface <joshua@boniface.me>  Tue, 23 Aug 2022 11:01:05 -0400
+
+pvc (0.9.53-0) unstable; urgency=high
+
+  * [API] Fixes sort order of VM list (for real this time)
+
+ -- Joshua M. Boniface <joshua@boniface.me>  Fri, 12 Aug 2022 17:47:11 -0400
+
+pvc (0.9.52-0) unstable; urgency=high
+
+  * [CLI] Fixes a bug with vm modify not requiring a cluster
+  * [Docs] Adds a reference to the bootstrap daemon
+  * [API] Adds sorting to node and VM lists for consistency
+  * [Node Daemon/API] Adds kb_ stats values for OSD stats
+
+ -- Joshua M. Boniface <joshua@boniface.me>  Fri, 12 Aug 2022 11:09:25 -0400
+
 pvc (0.9.51-0) unstable; urgency=high
 
   * [CLI Client] Fixes a faulty literal_eval when viewing task status

docs/index.md

@@ -18,7 +18,7 @@ As a consequence of its features, PVC makes administrating very high-uptime VMs
 
 PVC also features an optional, fully customizable VM provisioning framework, designed to automate and simplify VM deployments using custom provisioning profiles, scripts, and CloudInit userdata API support.
 
-Installation of PVC is accomplished by two main components: a [Node installer ISO](https://github.com/parallelvirtualcluster/pvc-installer) which creates on-demand installer ISOs, and an [Ansible role framework](https://github.com/parallelvirtualcluster/pvc-ansible) to configure, bootstrap, and administrate the nodes. Once up, the cluster is managed via an HTTP REST API, accessible via a Python Click CLI client or WebUI.
+Installation of PVC is accomplished by two main components: a [Node installer ISO](https://github.com/parallelvirtualcluster/pvc-installer) which creates on-demand installer ISOs, and an [Ansible role framework](https://github.com/parallelvirtualcluster/pvc-ansible) to configure, bootstrap, and administrate the nodes. Installation can also be fully automated with a companion [cluster bootstrapping system](https://github.com/parallelvirtualcluster/pvc-bootstrap). Once up, the cluster is managed via an HTTP REST API, accessible via a Python Click CLI client or WebUI.
 
 Just give it physical servers, and it will run your VMs without you having to think about it, all in just an hour or two of setup time.
 

node-daemon/pvcnoded/Daemon.py

@@ -48,7 +48,7 @@ import re
 import json
 
 # Daemon version
-version = "0.9.51"
+version = "0.9.54"
 
 
 ##########################################################

node-daemon/pvcnoded/util/keepalive.py

@@ -307,8 +307,14 @@ def collect_ceph_stats(logger, config, zkhandler, this_node, queue):
                         "var": osd["var"],
                         "pgs": osd["pgs"],
                         "kb": osd["kb"],
+                        "kb_used": osd["kb_used"],
+                        "kb_used_data": osd["kb_used_data"],
+                        "kb_used_omap": osd["kb_used_omap"],
+                        "kb_used_meta": osd["kb_used_meta"],
+                        "kb_avail": osd["kb_avail"],
                         "weight": osd["crush_weight"],
                         "reweight": osd["reweight"],
+                        "class": osd["device_class"],
                     }
                 }
             )