Merge lp:~vila/uci-vms/1328170-final-msg-option into lp:~canonical-ci-engineering/uci-vms/trunk

[Vincent Ladeuil]

Add 'vm.final_message' config option for VM daughter classes with specific needs

uci-engine defines a new class of VM for nova instances and needs a way to specify the cloud-init final message.

This proposal adds a 'vm.final_message' config option to address that.

=== modified file 'NEWS.rst'
--- NEWS.rst	2014-06-06 12:29:55 +0000
+++ NEWS.rst	2014-06-11 16:19:57 +0000
@@ -4,6 +4,12 @@
 
 Overview of changes to uci-vms in reverse chronological order.
 
+0.1.2
+=====
+
+ * Add 'vm.final_message' so VM daughter classes with specific needs can
+   override (LP: #1328170).
+
 0.1.1
 =====
 

=== modified file 'ucivms/config.py'
--- ucivms/config.py	2014-06-05 11:35:09 +0000
+++ ucivms/config.py	2014-06-11 16:19:57 +0000
@@ -306,3 +306,8 @@
                         default='~ubuntu/bin',
                         help_string='''\
 Where {vm.uploaded_scripts} are uploaded on the guest.'''))
+register(options.Option('vm.final_message',
+                        default=None,
+                        help_string='''\
+The cloud-init final message, a release-specific message is used if
+none is provided to address compatibility with Ubuntu precise.'''))

=== modified file 'ucivms/tests/test_vms.py'
--- ucivms/tests/test_vms.py	2014-05-20 12:41:16 +0000
+++ ucivms/tests/test_vms.py	2014-06-11 16:19:57 +0000
@@ -284,6 +284,12 @@
         self.assertEqual('uci-vms finished installing in $UPTIME seconds.',
                          self.ci_data.cloud_config['final_message'])
 
+    def test_final_message_explicit(self):
+        self.conf.store._load_from_string('vm.final_message = hello there')
+        self.ci_data.populate()
+        self.assertEqual('hello there',
+                         self.ci_data.cloud_config['final_message'])
+
     def test_poweroff_precise(self):
         self.conf.store._load_from_string('vm.release = precise')
         self.ci_data.populate()

=== modified file 'ucivms/vms.py'
--- ucivms/vms.py	2014-06-05 11:35:09 +0000
+++ ucivms/vms.py	2014-06-11 16:19:57 +0000
@@ -301,11 +301,13 @@
         self.set('manage_etc_hosts', None, True)
         self.set('chpasswd', None, dict(expire=False))
         # Configurable options
-        if self.conf.get('vm.release') == 'precise':
-            # Curse cloud-init lack of compatibility
-            msg = 'uci-vms finished installing in $UPTIME seconds.'
-        else:
-            msg = 'uci-vms finished installing in ${uptime} seconds.'
+        msg = self.conf.get('vm.final_message')
+        if msg is None:
+            if self.conf.get('vm.release') == 'precise':
+                # Curse cloud-init lack of compatibility
+                msg = 'uci-vms finished installing in $UPTIME seconds.'
+            else:
+                msg = 'uci-vms finished installing in ${uptime} seconds.'
         self.set('final_message', None, msg)
         self.set('password', 'vm.password')
         self.set_list_of_paths('ssh_authorized_keys', 'vm.ssh_authorized_keys')