Merge lp:~nobuto/maas-deployer/fix-sticky-ip into lp:~maas-deployers/maas-deployer/next

[Nobuto Murata]

sticky IP address cannot be claimed during commissioning. try to get it after all nodes are ready. LP: #1478967

[Edward Hope-Morley (hopem)]

Hey nobuto, this will need rebasing once https://code.launchpad.net/~hopem/maas-deployer/lp1478789/+merge/268474 lands as it has a bit of a refactor in it. Nice work though!

=== modified file 'maas_deployer/vmaas/engine.py'
--- maas_deployer/vmaas/engine.py	2015-08-25 20:07:52 +0000
+++ maas_deployer/vmaas/engine.py	2015-09-01 03:38:01 +0000
@@ -391,16 +391,6 @@
 
             self._add_tags_to_node(client, node, maas_node)
 
-            if 'sticky_ip_address' in node:
-                sticky_ip_addr = node['sticky_ip_address']
-                mac_address = sticky_ip_addr.get('mac_address', None)
-                requested_address = sticky_ip_addr.get('requested_address',
-                                                       None)
-
-                fn = client.claim_sticky_ip_address
-                if not fn(maas_node, requested_address, mac_address):
-                    log.warning(">> Failed to claim sticky ip address")
-
     def configure_maas(self, maas_config):
         """
         Configures the MAAS instance.
@@ -470,6 +460,7 @@
             util.virsh(['start', juju_node])
 
         self._wait_for_nodes_to_commission(client)
+        self._claim_sticky_ip_address(client, maas_config)
         log.debug("Done")
 
     def _render_environments_yaml(self):
@@ -518,6 +509,29 @@
                 time.sleep(5)
                 nodes = client.get_nodes()
 
+    def _claim_sticky_ip_address(self, client, maas_config):
+        """
+        Claim sticky IP address
+        """
+        maas_nodes = client.get_nodes()
+        nodes = maas_config.get('nodes', [])
+        for maas_node in maas_nodes:
+            hostname = maas_node['hostname']
+            for node in nodes:
+                if hostname.startswith("%s." % node['name']) and \
+                   'sticky_ip_address' in node:
+
+                    sticky_ip_addr = node['sticky_ip_address']
+                    mac_address = sticky_ip_addr.get('mac_address', None)
+                    requested_address = sticky_ip_addr.get('requested_address',
+                                                           None)
+
+                    # log.debug("Claiming sticky IP address %s",
+                    #           requested_address)
+                    fn = client.claim_sticky_ip_address
+                    if not fn(maas_node, requested_address, mac_address):
+                        log.warning(">> Failed to claim sticky ip address")
+
     def get_power_parameters(self, config_parms):
         """
         Converts the power parameters entry