Bump version to 0.9.7

Before, the default False was problematic and would reset consoles if
the template was otherwise modified. Instead switch the flags to be full
true/false flags, and on modify, adjust the default to be None so they
will not be changed.

README.md

@@ -20,6 +20,14 @@ To get started with PVC, please see the [About](https://parallelvirtualcluster.r
 
 ## Changelog
 
+#### v0.9.7
+
+  * Fixes bug with provisioner system template modifications
+
+#### v0.9.6
+
+  * Fixes bug with migrations
+
 #### v0.9.5
 
   * Fixes bug with line count in log follow

client-cli/pvc.py

@@ -2721,14 +2721,14 @@ def provisioner_template_system_list(limit):
     help='The amount of vRAM (in MB).'
 )
 @click.option(
-    '-s', '--serial', 'serial',
+    '-s/-S', '--serial/--no-serial', 'serial',
     is_flag=True, default=False,
     help='Enable the virtual serial console.'
 )
 @click.option(
-    '-n', '--vnc', 'vnc',
+    '-n/-N', '--vnc/--no-vnc', 'vnc',
     is_flag=True, default=False,
-    help='Enable the VNC console.'
+    help='Enable/disable the VNC console.'
 )
 @click.option(
     '-b', '--vnc-bind', 'vnc_bind',
@@ -2801,14 +2801,14 @@ def provisioner_template_system_add(name, vcpus, vram, serial, vnc, vnc_bind, no
     help='The amount of vRAM (in MB).'
 )
 @click.option(
-    '-s', '--serial', 'serial',
+    '-s/-S', '--serial/--no-serial', 'serial',
     is_flag=True, default=None,
     help='Enable the virtual serial console.'
 )
 @click.option(
-    '-n', '--vnc', 'vnc',
+    '-n/-N', '--vnc/--no-vnc', 'vnc',
     is_flag=True, default=None,
-    help='Enable the VNC console.'
+    help='Enable/disable the VNC console.'
 )
 @click.option(
     '-b', '--vnc-bind', 'vnc_bind',

debian/changelog

@@ -1,3 +1,15 @@
+pvc (0.9.7-0) unstable; urgency=high
+
+  * Fixes bug with provisioner system template modifications
+
+ -- Joshua M. Boniface <joshua@boniface.me>  Thu, 19 Nov 2020 10:48:28 -0500
+
+pvc (0.9.6-0) unstable; urgency=high
+
+  * Fixes bug with migrations
+
+ -- Joshua M. Boniface <joshua@boniface.me>  Tue, 17 Nov 2020 13:01:54 -0500
+
 pvc (0.9.5-0) unstable; urgency=high
 
   * Fixes bug with line count in log follow

docs/index.md

@@ -18,6 +18,14 @@ To get started with PVC, please see the [About](https://parallelvirtualcluster.r
 
 ## Changelog
 
+#### v0.9.7
+
+  * Fixes bug with provisioner system template modifications
+
+#### v0.9.6
+
+  * Fixes bug with migrations
+
 #### v0.9.5
 
   * Fixes bug with line count in log follow

node-daemon/pvcnoded/Daemon.py

@@ -54,7 +54,7 @@ import pvcnoded.CephInstance as CephInstance
 import pvcnoded.MetadataAPIInstance as MetadataAPIInstance
 
 # Version string for startup output
-version = '0.9.5'
+version = '0.9.7'
 
 ###############################################################################
 # PVCD - node daemon startup program

node-daemon/pvcnoded/VMInstance.py

@@ -381,6 +381,7 @@ class VMInstance(object):
             })
             migrate_lock_node.release()
             migrate_lock_state.release()
+            self.inmigrate = False
             self.logger.out('Aborted migration: {}'.format(reason), state='i', prefix='Domain {}'.format(self.domuuid))
 
         # Acquire exclusive lock on the domain node key