Merge lp:~julian-edwards/maas/virsh-power-cleanup into lp:~maas-committers/maas/trunk

[Julian Edwards]

Two bugs for the price of one: Fix the virsh power parameters input boxes, plus document how to set up virsh.

[Andres Rodriguez (andreserl)]

Lgtm

review: Approve

=== added file 'docs/media/virsh-config.png'
Binary files docs/media/virsh-config.png	1970-01-01 00:00:00 +0000 and docs/media/virsh-config.png	2013-11-08 04:07:46 +0000 differ
=== modified file 'docs/nodes.rst'
--- docs/nodes.rst	2013-06-07 16:26:25 +0000
+++ docs/nodes.rst	2013-11-08 04:07:46 +0000
@@ -46,3 +46,49 @@
 
 If you know the MAC address of a node, you can manually enter details
 about the node through the web interface.
+
+
+Virtual machine nodes
+---------------------
+
+If you're setting up virtual machines to use as nodes with MAAS, you need
+to configure the power type as ``virsh``.  For MAAS to be able to use
+virsh, make sure you have the ``libvirt-bin`` package installed.
+
+The virsh power type takes two parameters:
+
+Power ID
+    The Power ID is the name of the virtual machine shown by
+    ``sudo virsh list --all``
+
+Address
+    This is a libvirt connection string, such as
+    ``qemu+ssh://ubuntu@10.0.0.2/system`` or ``qemu:///system``
+
+.. image:: media/virsh-config.png
+
+If you want to use ssh you'll need to generate a ssh key pair for the maas
+user.  By default there is no home directory created for the maas user::
+
+    $ sudo mkdir /home/maas
+    $ sudo chown maas:maas /home/maas
+
+Add a login shell for the maas user::
+
+    $ sudo chsh maas
+    $ /bin/bash
+
+Become the maas user and generate a SSH keypair::
+
+    # sudo su - maas
+    $ ssh-keygen
+
+Then add the public key to ``/ubuntu/.ssh/authorized_keys`` on the vm server
+so virsh can use ssh without a password::
+
+    $ ssh-copy-id -i ~/.ssh/id_rsa ubuntu@10.0.0.2
+
+As the maas user, test virsh commands against libvirt at 10.0.0.2::
+
+    $ virsh -c qemu+ssh://ubuntu@10.0.0.2/system list --all
+

=== modified file 'etc/maas/templates/power/virsh.template'
--- etc/maas/templates/power/virsh.template	2012-06-14 05:52:58 +0000
+++ etc/maas/templates/power/virsh.template	2013-11-08 04:07:46 +0000
@@ -7,8 +7,6 @@
 power_change={{power_change}}
 power_address={{power_address}}
 power_id={{power_id}}
-username={{username}}
-system_id={{system_id}}
 virsh={{virsh}}
 
 

=== modified file 'src/maasserver/power_parameters.py'
--- src/maasserver/power_parameters.py	2013-10-18 09:54:17 +0000
+++ src/maasserver/power_parameters.py	2013-11-08 04:07:46 +0000
@@ -54,9 +54,6 @@
         skip_check=True),
     POWER_TYPE.VIRSH: DictCharField(
         [
-            ('driver', forms.CharField(label="Driver", required=False)),
-            ('username',
-             forms.CharField(label="Username", required=False)),
             ('power_address',
              forms.CharField(label="Address", required=False)),
             ('power_id',

=== modified file 'src/provisioningserver/power/tests/test_poweraction.py'
--- src/provisioningserver/power/tests/test_poweraction.py	2013-10-15 11:35:10 +0000
+++ src/provisioningserver/power/tests/test_poweraction.py	2013-11-08 04:07:46 +0000
@@ -168,8 +168,8 @@
         action = PowerAction(POWER_TYPE.VIRSH)
         script = action.render_template(
             action.get_template(), power_change='on',
-            power_address='qemu://example.com/', system_id='mysystem',
-            power_id='mysystem', username='me', virsh='echo')
+            power_address='qemu://example.com/',
+            power_id='mysystem', virsh='echo')
         output = action.run_shell(script)
         self.assertIn("Got unknown power state from virsh", output)