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

[Edward Hope-Morley]

[Billy Olsen (billy-olsen)]

LGTM, Approved.

review: Approve

=== modified file 'examples/deployment.yaml'
--- examples/deployment.yaml	2015-08-25 20:47:21 +0000
+++ examples/deployment.yaml	2015-09-05 12:13:36 +0000
@@ -1,6 +1,19 @@
 # This file defines the deployment for the MAAS environment which is to be
 # deployed and automated.
 demo-maas:
+    # Contains the virtual machine parameters for creating the Juju bootstrap
+    # node virtual machine
+    juju-bootstrap:
+        name: juju-boot-vm-dc1
+        interfaces: ['bridge=virbr0,model=virtio']
+        memory: 2048
+        vcpus: 2
+        arch: amd64
+        pool: default
+        disk_size: 20G
+        sticky_ip_address:
+            requested_address: 192.168.122.5
+
     maas:
         # Defines the general setup for the MAAS environment, including the
         # username and password for the host as well as the MAAS server.
@@ -105,15 +118,5 @@
                   driver: LAN_2_0
               sticky_ip_address:
                   mac_address: "38:63:bb:43:b8:9c"
-                  requested_address: 192.168.122.5
-                
-    # Contains the virtual machine parameters for creating the Juju bootstrap
-    # node virtual machine
-    juju-bootstrap:
-        name: juju-boot-vm-dc1
-        interfaces: ['bridge=virbr0,model=virtio']
-        memory: 2048
-        vcpus: 2
-        arch: amd64
-        pool: default
-        disk_size: 20G
+                  requested_address: 192.168.122.6
+

=== modified file 'maas_deployer/vmaas/engine.py'
--- maas_deployer/vmaas/engine.py	2015-09-02 18:34:36 +0000
+++ maas_deployer/vmaas/engine.py	2015-09-05 12:13:36 +0000
@@ -52,7 +52,8 @@
 
         # 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, maas_config)
+        juju_node = self._get_juju_node_params(juju_domain, juju_config,
+                                               maas_config)
 
         nodes = maas_config.get('nodes', [])
         if not nodes:
@@ -75,7 +76,7 @@
         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):
+    def _get_juju_node_params(self, juju_domain, juju_config, maas_config):
         """
         Determines the mac address of the juju machine specified.
 
@@ -100,6 +101,11 @@
                 'power_parameters_power_id': juju_domain.name,
             })
 
+        sticky_cfg = juju_config.get('sticky_ip_address')
+        if sticky_cfg:
+            node['sticky_ip_address'] = sticky_cfg
+            node['sticky_ip_address']['mac_address'] = node['mac_addresses'][0]
+
         return node
 
     def deploy_juju_bootstrap(self, params):
@@ -107,7 +113,7 @@
         Deploys the juju bootstrap node.
         """
         log.debug("Creating Juju bootstrap node...")
-        juju_node = vm.Instance(**params)
+        juju_node = vm.Instance(params)
         juju_node.netboot = True
         juju_node.define()
         return juju_node
@@ -117,7 +123,7 @@
         Deploys the virtual maas node.
         """
         log.debug("Creating MAAS Virtual Machine...")
-        maas = vm.CloudInstance(**params)
+        maas = vm.CloudInstance(params)
         maas.create()
         return maas
 
@@ -532,22 +538,28 @@
         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')
-                    if requested_address:
-                        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 "
-                                        "'%s'", (requested_address))
+        config_nodes = maas_config.get('nodes', [])
+        sticky_nodes = {}
+        for m_node in maas_nodes:
+            hostname = m_node['hostname']
+            for c_node in config_nodes:
+                sticky_addr_cfg = c_node.get('sticky_ip_address')
+                if (hostname.startswith("%s." % c_node['name']) and
+                        sticky_addr_cfg):
+                    ip_addr = sticky_addr_cfg.get('requested_address')
+                    mac_addr = sticky_addr_cfg.get('mac_address')
+                    if ip_addr and mac_addr:
+                        sticky_nodes[ip_addr] = {'mac_addr': mac_addr,
+                                                 'maas_node': m_node}
+
+        for ip_addr, cfg in sticky_nodes.iteritems():
+            node = cfg['maas_node']
+            log.debug("Claiming sticky IP address '%s' for node '%s'",
+                      ip_addr, node['hostname'])
+            rc = client.claim_sticky_ip_address(node, ip_addr,
+                                                cfg['mac_addr'])
+            if not rc:
+                log.warning("Failed to claim sticky ip address '%s'", ip_addr)
 
     def get_power_parameters(self, config_parms):
         """

=== modified file 'maas_deployer/vmaas/vm.py'
--- maas_deployer/vmaas/vm.py	2015-08-14 16:59:12 +0000
+++ maas_deployer/vmaas/vm.py	2015-09-05 12:13:36 +0000
@@ -38,19 +38,17 @@
 
 class Instance(object):
 
-    def __init__(self, name, interfaces, arch='amd64', disk_size='20G',
-                 vcpus=1, memory=1024, pool='default', netboot=False):
-        self.name = name
-        self.interfaces = interfaces
-        self.arch = arch
-        self.disk_size = disk_size
-        self.vcpus = vcpus
-        self.memory = memory
-        self.pool = pool
-        self.netboot = netboot
+    def __init__(self, params):
+        self.name = params.get('name')
+        self.interfaces = params.get('interfaces')
+        self.arch = params.get('arch', 'amd64')
+        self.disk_size = params.get('disk_size', '20G')
+        self.vcpus = params.get('vcpus', 1)
+        self.memory = params.get('memory', 1024)
+        self.pool = params.get('pool', 'default')
+        self.netboot = params.get('netboot', False)
         self.conn = libvirt.open(cfg.remote)
-
-        self.assert_pool_exists(pool)
+        self.assert_pool_exists(self.pool)
 
     @staticmethod
     def assert_pool_exists(pool='default'):
@@ -265,28 +263,21 @@
 
 class CloudInstance(Instance):
 
-    def __init__(self, name, interfaces, disk_size='40G', vcpus=2,
-                 memory=4096, pool='default', user='ubuntu', password='ubuntu',
-                 release='trusty', arch='amd64', **kwargs):
-        super(CloudInstance, self).__init__(self, name, interfaces)
-        self.name = name
-        self.interfaces = interfaces
-        self.disk_size = disk_size
-        self.vcpus = vcpus
-        self.memory = memory
-        self.pool = pool
-        self.release = release
-        self.user = user
-        self.password = password
-        self.arch = arch
-
-        if 'network_config' in kwargs:
-            self.network_interfaces_content = kwargs['network_config']
-
-        if 'node_group_ifaces' in kwargs:
-            self.node_group_ifaces = kwargs['node_group_ifaces']
-
-        self.apt_http_proxy = kwargs.get('apt_http_proxy')
+    def __init__(self, params):
+        super(CloudInstance, self).__init__(params)
+        self.name = params.get('name')
+        self.interfaces = params.get('interfaces')
+        self.arch = params.get('arch', 'amd64')
+        self.disk_size = params.get('disk_size', '40G')
+        self.vcpus = params.get('vcpus', 2)
+        self.memory = params.get('memory', 4096)
+        self.pool = params.get('pool', 'default')
+        self.release = params.get('release', 'trusty')
+        self.user = params.get('user', 'ubuntu')
+        self.password = params.get('password', 'ubuntu')
+        self.network_interfaces_content = params.get('network_config')
+        self.node_group_ifaces = params.get('node_group_ifaces')
+        self.apt_http_proxy = params.get('apt_http_proxy')
 
     def _get_cloud_image_info(self):
         """