Merge lp:~hopem/maas-deployer/lp1480263 into lp:~maas-deployers/maas-deployer/next

[Edward Hope-Morley]

[Billy Olsen (billy-olsen)]

LGTM, thanks Ed!

review: Approve

=== modified file 'maas_deployer/vmaas/engine.py'
--- maas_deployer/vmaas/engine.py	2015-09-01 13:38:33 +0000
+++ maas_deployer/vmaas/engine.py	2015-09-01 23:16:41 +0000
@@ -65,9 +65,14 @@
         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)
+
+        api_url = 'http://{}/MAAS/api/1.0'.format(self.ip_addr)
+        client = MAASClient(api_url, self.api_key,
+                            ssh_user=maas_config['user'])
+
+        self.apply_maas_settings(client, maas_config)
+        self.wait_for_import_boot_images(client, maas_config)
+        self.configure_maas(client, maas_config)
 
     def _get_juju_node_params(self, juju_domain, maas_config):
         """
@@ -186,6 +191,7 @@
         cmd = self.get_ssh_cmd(maas_config['user'], maas_ip,
                                remote_cmd=rcmd)
         util.execc(cmd=cmd)
+        log.info("done.")
         self._get_api_key_from_cloudinit(maas_config['user'], maas_ip)
 
     def wait_for_maas_installation(self, maas_config):
@@ -282,9 +288,11 @@
         """
         util.exec_script_remote(maas_config['user'], self.ip_addr, script)
 
-    def wait_for_import_boot_images(self, maas_config):
+    def wait_for_import_boot_images(self, client, maas_config):
         """Polls the import boot image status."""
-        log.debug("Importing boot images...")
+        log.debug("Starting the import of boot resources")
+        client.import_boot_images()
+
         ip_addr = self.ip_addr or self._get_maas_ip_address(maas_config)
         user = maas_config['user']
         password = maas_config['password']
@@ -391,17 +399,7 @@
 
             self._add_tags_to_node(client, node, maas_node)
 
-    def configure_maas(self, maas_config):
-        """
-        Configures the MAAS instance.
-        """
-        api_url = 'http://{}/MAAS/api/1.0'.format(self.ip_addr)
-
-        client = MAASClient(api_url, self.api_key,
-                            ssh_user=maas_config['user'])
-
-        nodegroup = client.get_nodegroups()[0]
-
+    def apply_maas_settings(self, client, maas_config):
         log.debug("Configuring MAAS settings...")
         maas_settings = maas_config.get('settings', {})
         for key in maas_settings:
@@ -410,6 +408,11 @@
             if not succ:
                 log.error("Unable to set %s to %s", key, value)
 
+    def configure_maas(self, client, maas_config):
+        """
+        Configures the MAAS instance.
+        """
+        nodegroup = client.get_nodegroups()[0]
         log.debug("Creating the nodegroup interfaces...")
         node_group_interfaces = copy.deepcopy(maas_config['node_group_ifaces'])
         for iface in node_group_interfaces:
 
=== modified file 'maas_deployer/vmaas/maasclient/clidriver.py'
--- maas_deployer/vmaas/maasclient/clidriver.py	2015-08-20 04:57:32 +0000
+++ maas_deployer/vmaas/maasclient/clidriver.py	2015-09-01 23:16:41 +0000
@@ -125,7 +125,7 @@
 
         :rtype: bool indicating whether the start of the import was successful
         """
-        raise NotImplementedError()
+        return self._maas_execute('boot-resources', 'import')
 
     ###########################################################################
     # Nodegroup API - http://maas.ubuntu.com/docs/api.html#nodegroups
 
=== modified file 'maas_deployer/vmaas/templates/config-maas.sh'
--- maas_deployer/vmaas/templates/config-maas.sh	2015-08-25 20:47:21 +0000
+++ maas_deployer/vmaas/templates/config-maas.sh	2015-09-01 23:16:41 +0000
@@ -10,15 +10,8 @@
     --password={{password}} \
     --email={{user}}@localhost
 
-
-# Configure the dns nameservers
-echo "Configuring the DNS nameserver"
-for dev in `ip link show | grep eth.*mtu | cut -d':' -f2`; do
-  sudo resolvconf -d ${dev}.inet
-done
-
 sudo sed -i 's/dns-nameserver.*/dns-nameserver 127.0.0.1/g' /etc/network/interfaces
-
+# NOTE: we should cleanup /etc/resolv.conf once MAAS DNS has been configured.
 
 # Generate a MAAS API key for the admin user and start the importing of boot resources.
 echo "Generating MAAS API login credentials for admin"
@@ -27,13 +20,11 @@
 ipaddr=$(ip route get 8.8.8.8 | awk 'NR==1 {print $NF}')
 maas login maas http://${ipaddr}/MAAS/api/1.0 ${apikey}
 
-
 # Configure MAAS networks...
 echo "Configuring MAAS node group interfaces (dns and dhcp configuration)..."
 maas_ip=$(ip addr show eth0 | awk '/inet / {print $2}' | cut -d/ -f1)
 maas_net=$(ip addr show eth0 | awk '/inet / {print $2}' | cut -d/ -f1 | cut -d. -f-3)
 
-
 node_group_uuid=$(maas maas node-groups list | grep uuid | cut -d\" -f4)
 attempts=0
 while [[ "$node_group_uuid" == "master" ]] && [ $attempts -le 10 ]
@@ -58,13 +49,6 @@
 iptables -t nat -A POSTROUTING -o $ext_dev -j MASQUERADE
 sed -i -s "s/^exit 0/iptables -t nat -A POSTROUTING -o $ext_dev -j MASQUERADE\nexit 0/" /etc/rc.local
 
-
 # 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
-
-