Merge lp:~clark-laughlin/charms/trusty/nova-compute/arm64-patch-1 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Clark Laughlin]

This change allows the nova-compute charm to deploy on arm64 machines without requiring a different configuration to be used. To deploy nova-compute on arm64 requires 2 settings in nova.conf, which are not required for amd64:

libvirt_use_virtio_for_bridges = False
libvirt_disk_prefix = vd

Since juju configuration is specified at the service level, there is not a way to provide a separate configuration when deploying an amd64 unit and an arm64 unit -- preventing deployment of openstack with a mixture of arm64 and amd64 nova-compute nodes.

This change simply detects the machine architecture, and adds the two configuration settings to nova.conf when running on an arm64 (aarch64) machine. Behavior when running on other architectures is unchanged.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2609 nova-compute-next for clark-laughlin mp252662
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2609/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2399 nova-compute-next for clark-laughlin mp252662
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
  FAILED (SKIP=5, failures=3)
  make: *** [unit_test] Error 1

Full unit test output: http://paste.ubuntu.com/10582347/
Build: http://10.245.162.77:8080/job/charm_unit_test/2399/

[Ryan Beisner (1chb1n)]

It looks like the unit test will also need some updating.

review: Needs Fixing

[Clark Laughlin (clark-laughlin)]

Hmm - is it possible that the test results include all of the other changes
on that branch, or is this just for my change? I'll have to figure out how
the test works and what's failing – – curious, because my changes should
not alter the behavior of anything unless it is run on an ARM host

On Wednesday, March 11, 2015, Ryan Beisner <email address hidden>
wrote:

> Review: Needs Fixing
>
> It looks like the unit test will also need some updating.
> --
>
> https://code.launchpad.net/~clark-laughlin/charms/trusty/nova-compute/arm64-patch-1/+merge/252662
> You are the owner of
> lp:~clark-laughlin/charms/trusty/nova-compute/arm64-patch-1.
>

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2434 nova-compute-next for clark-laughlin mp252662
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/2434/

[Ryan Beisner (1chb1n)]

See inline comment.

[Ryan Beisner (1chb1n)]

If you can apply this patch or edit like so, that should do the trick:
    http://paste.ubuntu.com/10582523/

To re-confirm manually before committing:
    make unit_test

[Clark Laughlin (clark-laughlin)]

Thank you! I'll give it a try later tonight and resubmit.

On Wednesday, March 11, 2015, Ryan Beisner <email address hidden>
wrote:

> If you can apply this patch or edit like so, that should do the trick:
> http://paste.ubuntu.com/10582523/
>
> To re-confirm manually before committing:
> make unit_test
>
> --
>
> https://code.launchpad.net/~clark-laughlin/charms/trusty/nova-compute/arm64-patch-1/+merge/252662
> You are the owner of
> lp:~clark-laughlin/charms/trusty/nova-compute/arm64-patch-1.
>

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2610 nova-compute-next for clark-laughlin mp252662
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  unit_tests/test_nova_compute_contexts.py:210:30: W291 trailing whitespace
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/10583581/
Build: http://10.245.162.77:8080/job/charm_lint_check/2610/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2401 nova-compute-next for clark-laughlin mp252662
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2401/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2435 nova-compute-next for clark-laughlin mp252662
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10583654/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2435/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2611 nova-compute-next for clark-laughlin mp252682
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2611/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2402 nova-compute-next for clark-laughlin mp252682
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2402/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2436 nova-compute-next for clark-laughlin mp252682
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10583731/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2436/

[Ryan Beisner (1chb1n)]

Amulet test failed due to environment timeout issue, unrelated to the proposed changes. I kicked off a re-run of that test.

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2437 nova-compute-next for clark-laughlin mp252682
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/2437/

[Liam Young (gnuoy)]

Thank you for the contribution, it is very much appreciated. Approved

review: Approve

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2015-02-16 09:53:45 +0000
+++ hooks/nova_compute_context.py	2015-03-12 03:47:45 +0000
@@ -1,5 +1,5 @@
 import uuid
-
+import platform
 from charmhelpers.contrib.openstack import context
 from charmhelpers.core.host import service_running, service_start
 from charmhelpers.fetch import apt_install, filter_installed_packages
@@ -104,6 +104,9 @@
             'listen_tls': 0,
         }
 
+        # get the processor architecture to use in the nova.conf template
+        ctxt['arch'] = platform.machine()
+
         # enable tcp listening if configured for live migration.
         if config('enable-live-migration'):
             ctxt['libvirtd_opts'] += ' -l'
 
=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2014-12-15 10:28:47 +0000
+++ templates/havana/nova.conf	2015-03-12 03:47:45 +0000
@@ -13,7 +13,14 @@
 state_path=/var/lib/nova
 lock_path=/var/lock/nova
 force_dhcp_release=True
+
+{% if arch == 'aarch64' -%}
+libvirt_use_virtio_for_bridges=False
+libvirt_disk_prefix=vd
+{% else -%}
 libvirt_use_virtio_for_bridges=True
+{% endif -%}
+
 verbose=True
 use_syslog = {{ use_syslog }}
 ec2_private_dns_show_ip=True
 
=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2014-12-15 10:28:47 +0000
+++ templates/juno/nova.conf	2015-03-12 03:47:45 +0000
@@ -13,7 +13,14 @@
 state_path=/var/lib/nova
 lock_path=/var/lock/nova
 force_dhcp_release=True
+
+{% if arch == 'aarch64' -%}
+libvirt_use_virtio_for_bridges=False
+libvirt_disk_prefix=vd
+{% else -%}
 libvirt_use_virtio_for_bridges=True
+{% endif -%}
+
 verbose=True
 use_syslog = {{ use_syslog }}
 ec2_private_dns_show_ip=True
 
=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-01-21 12:27:42 +0000
+++ templates/kilo/nova.conf	2015-03-12 03:47:45 +0000
@@ -22,6 +22,11 @@
 compute_driver=libvirt.LibvirtDriver
 my_ip = {{ host_ip }}
 
+{% if arch == 'aarch64' -%}
+libvirt_use_virtio_for_bridges=False
+libvirt_disk_prefix=vd
+{% endif -%}
+
 {% include "parts/database" %}
 
 {% include "parts/rabbitmq" %}
 
=== modified file 'unit_tests/test_nova_compute_contexts.py'
--- unit_tests/test_nova_compute_contexts.py	2015-02-16 09:53:45 +0000
+++ unit_tests/test_nova_compute_contexts.py	2015-03-12 03:47:45 +0000
@@ -1,3 +1,5 @@
+import platform
+
 from mock import patch
 from test_utils import CharmTestCase
 
@@ -179,6 +181,7 @@
 
         self.assertEqual(
             {'libvirtd_opts': '-d',
+             'arch': platform.machine(),
              'listen_tls': 0,
              'host_uuid': 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'}, libvirt())
 
@@ -190,6 +193,7 @@
 
         self.assertEqual(
             {'libvirtd_opts': '-d -l',
+             'arch': platform.machine(),
              'listen_tls': 0,
              'host_uuid': 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'}, libvirt())
 
@@ -201,9 +205,10 @@
 
         self.assertEqual(
             {'libvirtd_opts': '-d',
+             'disk_cachemodes': 'file=unsafe,block=none',
+             'arch': platform.machine(),
              'listen_tls': 0,
-             'host_uuid': 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7',
-             'disk_cachemodes': 'file=unsafe,block=none'}, libvirt())
+             'host_uuid': 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'}, libvirt())
 
     @patch.object(context.NeutronComputeContext, 'network_manager')
     @patch.object(context.NeutronComputeContext, 'plugin')