Merge lp:~opnfv-team/maas-deployer/power8 into lp:~maas-deployers/maas-deployer/next

[Narinder Gupta]

modified it to accommodate the review comments.

This patch is submitted from IBM power 8 and wants to merge this patch to enable MAAS deployer for IBM power 8 systems and VMs.
IBM is enabling opnfv JOID (Juju opnfv infratstruture deployer) with POWER 8 and this is first patch to enable the same. I think we are commenting one package in the patch but that is needed as that package does not exist for power8 system.

[Billy Olsen (billy-olsen)]

Rather than simply commenting this out, I think we need to refactor this to pass the architecture through to the template that renders the cloud-init.cfg and handle it properly, rather than commenting it out which may risk breaking other arches, e.g.:

{% if not arch == 'power' -%}
- linux-image-extra-virtual
{% endif -%}

review: Needs Fixing

[Narinder Gupta (narindergupta)]

Hi Billy,
Please review it again as i have updated the changes to check for
architecture. If you can review ASAP that will help IBM to test the final
build based on this branch.

https://code.launchpad.net/~opnfv-team/maas-deployer/power8/+merge/288335

Thanks and Regards,
Narinder Gupta (PMP) <email address hidden>
Canonical, Ltd. narindergupta [irc.freenode.net]
+1.281.736.5150 narindergupta2007[skype]

Ubuntu- Linux for human beings | www.ubuntu.com | www.canonical.com

On Mon, Mar 7, 2016 at 1:15 PM, Billy Olsen <email address hidden>
wrote:

> Review: Needs Fixing
>
> Rather than simply commenting this out, I think we need to refactor this
> to pass the architecture through to the template that renders the
> cloud-init.cfg and handle it properly, rather than commenting it out which
> may risk breaking other arches, e.g.:
>
> {% if not arch == 'power' -%}
> - linux-image-extra-virtual
> {% endif -%}
>
> --
> https://code.launchpad.net/~opnfv-team/maas-deployer/power8/+merge/288335
> Your team OPNFV Team is subscribed to branch
> lp:~opnfv-team/maas-deployer/power8.
>

[Narinder Gupta (narindergupta)]

review: Needs Resubmitting (resubmit after fix)

[Narinder Gupta (narindergupta)]

review: Approve (fixed)

[lp:~opnfv-team/maas-deployer/power8]

65. By Billy Olsen on 2016-03-14

Enable Power8 system deployment with MAAS deployer.

This patch was authored by Narinder Gupta and IBM in order to enable
ppc64/Power8 support in maas-deployer.

=== modified file 'maas_deployer/vmaas/engine.py'
--- maas_deployer/vmaas/engine.py	2016-02-18 04:49:17 +0000
+++ maas_deployer/vmaas/engine.py	2016-03-08 13:59:47 +0000
@@ -85,7 +85,7 @@
         """
         node = {
             'name': juju_domain.name,
-            'architecture': 'amd64/generic',
+            'architecture': juju_config.get('arch'),
             'mac_addresses': [x for x in juju_domain.mac_addresses],
             'tags': 'bootstrap'
         }

=== modified file 'maas_deployer/vmaas/templates/cloud-init.cfg'
--- maas_deployer/vmaas/templates/cloud-init.cfg	2016-02-04 19:06:52 +0000
+++ maas_deployer/vmaas/templates/cloud-init.cfg	2016-03-08 13:59:47 +0000
@@ -43,7 +43,10 @@
   - maas-dns
   # Used to manage KVM instances via libvirt
   - libvirt-bin
+  # Below package does not exist on Power8 architecture.
+{% if arch != 'ppc64' -%}
   - linux-image-extra-virtual
+{% endif -%}
   - jq
   - juju-core
   - juju-deployer

=== modified file 'maas_deployer/vmaas/vm.py'
--- maas_deployer/vmaas/vm.py	2015-09-23 15:57:45 +0000
+++ maas_deployer/vmaas/vm.py	2016-03-08 13:59:47 +0000
@@ -47,6 +47,7 @@
         self.memory = params.get('memory', 1024)
         self.pool = params.get('pool', 'default')
         self.netboot = params.get('netboot', False)
+        self.video = params.get('video', 'cirrus')
 
         self.working_dir = tempfile.mkdtemp()
         self.conn = libvirt.open(cfg.remote)
@@ -130,7 +131,9 @@
                '--connect', cfg.remote,
                '--name', self.name,
                '--ram', str(self.memory),
-               '--vcpus', str(self.vcpus)]
+               '--vcpus', str(self.vcpus),
+               '--video', str(self.video),
+               '--arch', str(self.arch)]
 
         for disk in self._get_disks():
             cmd.extend(['--disk', disk])
@@ -307,8 +310,13 @@
         Returns a tuple with the cloud-image url and the file it
         should be saved as.
         """
-        url = ('https://cloud-images.ubuntu.com/{release}/current/'
-               '{release}-server-cloudimg-{arch}-disk1.img')
+        if self.arch == "ppc64":
+            url = ('https://cloud-images.ubuntu.com/{release}/current/'
+                   '{release}-server-cloudimg-{arch}el-disk1.img')
+        else:
+            url = ('https://cloud-images.ubuntu.com/{release}/current/'
+                   '{release}-server-cloudimg-{arch}-disk1.img')
+
         url = url.format(release=self.release, arch=self.arch)
         f = url.split('/')[-1]
         return (url, f)
@@ -450,7 +458,8 @@
             'ssh_key': self._get_ssh_key(),
             'apt_http_proxy': self.apt_http_proxy,
             'apt_sources': self.apt_sources,
-            'network_config': '\n'.join(etc_net_interfaces)
+            'network_config': '\n'.join(etc_net_interfaces),
+            'arch': self.arch
         }
         content = template.load('cloud-init.cfg', parms)
         with open(base_file, 'w+') as f: