Merge lp:~billy-olsen/maas-deployer/add-virsh-power into lp:~maas-deployers/maas-deployer/next

[Billy Olsen]

[lp:~billy-olsen/maas-deployer/add-virsh-power]

14. By Billy Olsen on 2015-08-20

Rebase to latest from next

[Edward Hope-Morley (hopem)]

Hey Billy a few points here:

You are creating and installing keys to /home/maas/.ssh but the maas user created on installing has its home path set as follows:

    ubuntu@localhost:~$ echo ~maas
    /var/lib/maas

If i put my keys in /home/maas/.ssh maas is unable to find them whereas if i put them in /var/lib/maas/.ssh everything work fine and dandy.

Few more inline comments.

[Edward Hope-Morley (hopem)]

review: Needs Fixing

[lp:~billy-olsen/maas-deployer/add-virsh-power]

15. By Billy Olsen on 2015-08-25

Code review feedback and merge with latest in /next

16. By Billy Olsen on 2015-08-25

Cleanup config-maas.sh to just use whatever the current maas home directory is

17. By Billy Olsen on 2015-08-25

Merge with /next one more time

=== modified file 'examples/deployment.yaml'
--- examples/deployment.yaml	2015-08-20 04:57:32 +0000
+++ examples/deployment.yaml	2015-08-25 20:14:09 +0000
@@ -21,6 +21,16 @@
         # Apt http proxy setting(s)
         apt_http_proxy:
 
+        # Virsh power settings
+        # Specifies the uri and keys to use for virsh power control of the 
+        # juju virtual machine. If the uri is omitted, the value for the
+        # --remote is used. If no power settings are desired, then do not
+        # supply the virsh block.
+        #virsh:
+        #    rsa_priv_key: /path/to/id_rsa
+        #    rsa_pub_key: /path/to/id_rsa.pub
+        #    uri: qemu+ssh://user@10.0.3.1/system
+
         # Defines the IP Address that the configuration script will use to
         # to access the MAAS controller via SSH.
         ip_address: 192.168.122.2
@@ -33,8 +43,6 @@
             main_archive: http://archive.ubuntu.com/ubuntu
             upstream_dns: 192.168.122.1
             maas_name: automaas
-            # kernel_opts: "console=tty0 console=ttyS1,115200n8"
-            # ntp_server: ntp.ubuntu.com
 
         # This section is used to define the networking parameters for when
         # the node first comes up. It is fed into the meta-data cloud-init

=== modified file 'maas_deployer/vmaas/engine.py'
--- maas_deployer/vmaas/engine.py	2015-08-21 17:12:13 +0000
+++ maas_deployer/vmaas/engine.py	2015-08-25 20:14:09 +0000
@@ -47,38 +47,53 @@
         config = self.config.get(target)
         juju_config = config.get('juju-bootstrap')
         juju_domain = self.deploy_juju_bootstrap(juju_config)
+        maas_config = config.get('maas')
 
         # Insert juju node information into the maas nodes list.
         # This allows us to define it in maas.
-        juju_node = self._get_juju_node_params(juju_domain)
+        juju_node = self._get_juju_node_params(juju_domain, maas_config)
 
-        maas_config = config.get('maas')
         nodes = maas_config.get('nodes', [])
-        if nodes:
-            nodes.append(juju_node)
+        if not nodes:
+            log.warning("No MAAS cluster nodes provided")
             maas_config['nodes'] = nodes
-        else:
-            log.warning("No MAAS cluster nodes provided")
+
+        nodes.append(juju_node)
 
         self.deploy_maas_node(maas_config)
 
         self.wait_for_maas_installation(maas_config)
+        self.configure_maas_virsh_control(maas_config)
         self.api_key = self._get_api_key(maas_config)
         self.wait_for_import_boot_images(maas_config)
 
         self.configure_maas(maas_config)
 
-    def _get_juju_node_params(self, juju_domain):
+    def _get_juju_node_params(self, juju_domain, maas_config):
         """
         Determines the mac address of the juju machine specified.
+
+        :param juju_domain: the juju bootstrap image domain
+        :param include_power: a boolean value of whether to include
+                              power parameters or not for virsh power
+                              control.
         """
         node = {
             'name': juju_domain.name,
             'architecture': 'amd64/generic',
             'mac_addresses': [x for x in juju_domain.mac_addresses],
-            'tags': 'bootstrap',
+            'tags': 'bootstrap'
         }
 
+        virsh_info = maas_config.get('virsh')
+        if virsh_info:
+            uri = virsh_info.get('uri', util.CONF.remote)
+            node.update({
+                'power_type': 'virsh',
+                'power_parameters_power_address': uri,
+                'power_parameters_power_id': juju_domain.name,
+            })
+
         return node
 
     def deploy_juju_bootstrap(self, params):
@@ -222,6 +237,51 @@
 
         return self.api_key
 
+    def configure_maas_virsh_control(self, maas_config):
+        """Configure the virsh control SSH keys"""
+        virsh_info = maas_config.get('virsh')
+        if not virsh_info:
+            log.debug('No virsh specified in maas_config.')
+            return
+
+        KEY_TO_FILE_MAP = {
+            'rsa_priv_key': 'id_rsa',
+            'rsa_pub_key': 'id_rsa.pub',
+            'dsa_priv_key': 'id_dsa',
+            'dsa_pub_key': 'id_dsa.pub',
+        }
+
+        # First, make the remote directory.
+        remote_cmd = ['mkdir', 'virsh-keys']
+        cmd = self.get_ssh_cmd(maas_config['user'], self.ip_addr,
+                               remote_cmd=remote_cmd)
+        util.execc(cmd)
+
+        for key, value in virsh_info.iteritems():
+            # not a key of interest
+            if not key.endswith('_key'):
+                continue
+
+            try:
+                dest_file = 'virsh-keys/%s' % KEY_TO_FILE_MAP[key]
+                cmd = self.get_scp_cmd(maas_config['user'], self.ip_addr,
+                                       os.path.expanduser(value), dest_file)
+                util.execc(cmd)
+            except:
+                log.error("Error reading from %s file" % value)
+
+        # Now move them over to the maas user.
+        script = """
+        maas_home=$(echo ~maas)
+        sudo mkdir -p $maas_home/.ssh
+        sudo mv ~/virsh-keys/* $maas_home/.ssh
+        sudo chown -R maas:maas $maas_home/.ssh
+        sudo chmod 700 $maas_home/.ssh
+        sudo find $maas_home/.ssh -name id* | xargs sudo chmod 600
+        rmdir ~/virsh-keys
+        """
+        util.exec_script_remote(maas_config['user'], self.ip_addr, script)
+
     def wait_for_import_boot_images(self, maas_config):
         """Polls the import boot image status."""
         log.debug("Importing boot images...")
@@ -404,8 +464,9 @@
             util.exec_script_remote(maas_config['user'], self.ip_addr, script)
 
         # Start juju domain
+        virsh_info = maas_config.get('virsh')
         juju_node = self._get_juju_nodename(nodes)
-        if juju_node is not None:
+        if juju_node is not None and not virsh_info:
             util.virsh(['start', juju_node])
 
         self._wait_for_nodes_to_commission(client)

=== modified file 'maas_deployer/vmaas/templates/config-maas.sh'
--- maas_deployer/vmaas/templates/config-maas.sh	2015-08-19 13:58:28 +0000
+++ maas_deployer/vmaas/templates/config-maas.sh	2015-08-25 20:14:09 +0000
@@ -62,9 +62,7 @@
 # Create a juju user
 sudo adduser --disabled-password --gecos "Juju,,," juju
 
-
 # Kick off the boot-resources import
 echo "Starting the import of boot resources"
 maas maas boot-resources import
 
-