Merge lp:~1chb1n/charms/trusty/nova-compute/cpu-mode into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Ryan Beisner]

Add charm config options for tuning nova/libvirt and smt in ppc64el compute node scenarios.

It works:
http://paste.ubuntu.com/12255215/

A bundle usage example:
http://bazaar.launchpad.net/~1chb1n/openstack-charm-testing/power-native-1509/view/head:/bundles/ppc64/ppc64el-7-unit-method1.yaml#L74

Previously, these needs were addressed via hacky post-deployment patches @
http://bazaar.launchpad.net/~ost-maintainers/openstack-charm-testing/trunk/view/head:/tools/ppc64el-post-deploy-patches.sh#L37

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

charm_lint_check #9243 nova-compute-next for 1chb1n mp269952
    LINT OK: passed

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

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

charm_unit_test #8544 nova-compute-next for 1chb1n mp269952
    UNIT OK: passed

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

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

charm_amulet_test #6204 nova-compute-next for 1chb1n mp269952
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 124
ERROR:root:Make target returned non-zero.

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

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

charm_lint_check #9244 nova-compute-next for 1chb1n mp269952
    LINT OK: passed

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

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

charm_unit_test #8545 nova-compute-next for 1chb1n mp269952
    UNIT OK: passed

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

[Ryan Beisner (1chb1n)]

Ignore amulet fail #6204, undercloud issue. Re-running...

[lp:~1chb1n/charms/trusty/nova-compute/cpu-mode]

158. By Ryan Beisner on 2015-09-04

update comment

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

charm_lint_check #9385 nova-compute-next for 1chb1n mp269952
    LINT OK: passed

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

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

charm_unit_test #8680 nova-compute-next for 1chb1n mp269952
    UNIT OK: passed

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

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

charm_amulet_test #6249 nova-compute-next for 1chb1n mp269952
    AMULET OK: passed

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

[James Page (james-page)]

review: Needs Fixing

[Haw Loeung (hloeung)]

Any updates on getting this landed?

[Ryan Beisner (1chb1n)]

I plan to revisit to address the review comments, with the intention of landing it by the 15.10 charm release.

[Brad Marshall (brad-marshall)]

Any plans to progress this? I'm trying to deploy nova-compute on ppc64el, and it would be useful.

[Ryan Beisner (1chb1n)]

Hi Brad - yes, today I resumed work on this as part of our revalidation efforts ahead of 16.04 release. This MP will be abandoned and work will resume against the git/gerrit flow.

Unmerged revisions

158. By Ryan Beisner on 2015-09-04

update comment

157. By Ryan Beisner on 2015-09-02

add ppc64_smt config option (needed in ppc64el scenarios)

156. By Ryan Beisner on 2015-09-02

add cpu_mode libvirt config option (needed in ppc64el scenarios)

=== modified file 'Makefile'
--- Makefile	2015-04-16 21:32:06 +0000
+++ Makefile	2015-09-04 13:17:40 +0000
@@ -7,7 +7,7 @@
 
 unit_test:
 	@echo Starting unit tests...
-	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage unit_tests
+	@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests
 
 bin/charm_helpers_sync.py:
 	@mkdir -p bin

=== modified file 'config.yaml'
--- config.yaml	2015-08-13 09:11:23 +0000
+++ config.yaml	2015-09-04 13:17:40 +0000
@@ -257,3 +257,15 @@
     description: |
       The pecentage of system memory to use for hugepages eg '10%' or the total
       number of 2M hugepages - eg "1024".
+  cpu-mode:
+    type: string
+    default:
+    description: |
+      Sets the cpu_mode value in the nova.conf [libvirt] section. For example,
+      with ppc64el compute nodes, cpu mode 'host-passthrough' may be needed.
+  ppc64-cpu-smt-state:
+    type: string
+    default:
+    description: |
+      Sets the ppc64_cpu smt state value.  Common values are 'on', 'off'
+      or an integer.  Typically, set to 'off' for ppc64el compute nodes.

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2015-08-13 10:31:20 +0000
+++ hooks/nova_compute_context.py	2015-09-04 13:17:40 +0000
@@ -127,6 +127,9 @@
         if config('hugepages'):
             ctxt['hugepages'] = True
 
+        if config('cpu-mode'):
+            ctxt['cpu_mode'] = config('cpu-mode')
+
         ctxt['host_uuid'] = '%s' % uuid.uuid4()
         return ctxt
 

=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2015-08-19 15:07:10 +0000
+++ hooks/nova_compute_hooks.py	2015-09-04 13:17:40 +0000
@@ -66,6 +66,7 @@
     assert_charm_supports_ipv6,
     manage_ovs,
     install_hugepages,
+    set_ppc64_cpu_smt_state
 )
 
 from charmhelpers.contrib.network.ip import (
@@ -144,6 +145,9 @@
     if config('hugepages'):
         install_hugepages()
 
+    if config('ppc64-cpu-smt-state'):
+        set_ppc64_cpu_smt_state(config('ppc64-cpu-smt-state'))
+
     CONFIGS.write_all()
 
 

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-08-13 14:39:13 +0000
+++ hooks/nova_compute_utils.py	2015-09-04 13:17:40 +0000
@@ -471,6 +471,13 @@
     check_output(['chown', '-R', user, ssh_dir])
 
 
+def set_ppc64_cpu_smt_state(smt_state):
+    """Set ppc64_cpu smt state."""
+    log('Setting ppc64_cpu smt state: %s' % smt_state)
+    cmd = ['ppc64_cpu', '--smt=%s' % smt_state]
+    check_output(cmd)
+
+
 def import_authorized_keys(user='root', prefix=None):
     """Import SSH authorized_keys + known_hosts from a cloud-compute relation.
     Store known_hosts in user's $HOME/.ssh and authorized_keys in a path

=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2015-08-25 17:40:00 +0000
+++ templates/icehouse/nova.conf	2015-09-04 13:17:40 +0000
@@ -157,4 +157,6 @@
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
-
+{% if cpu_mode -%}
+cpu_mode = {{ cpu_mode }}
+{% endif -%}

=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2015-08-25 17:40:00 +0000
+++ templates/juno/nova.conf	2015-09-04 13:17:40 +0000
@@ -161,3 +161,6 @@
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
+{% if cpu_mode -%}
+cpu_mode = {{ cpu_mode }}
+{% endif -%}

=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-08-25 17:40:00 +0000
+++ templates/kilo/nova.conf	2015-09-04 13:17:40 +0000
@@ -166,6 +166,9 @@
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif -%}
+{% if cpu_mode -%}
+cpu_mode = {{ cpu_mode }}
+{% endif -%}
 
 {% include "parts/section-database" %}
 

=== modified file 'unit_tests/test_nova_compute_contexts.py'
--- unit_tests/test_nova_compute_contexts.py	2015-03-31 08:46:52 +0000
+++ unit_tests/test_nova_compute_contexts.py	2015-09-04 13:17:40 +0000
@@ -210,6 +210,19 @@
              'listen_tls': 0,
              'host_uuid': 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'}, libvirt())
 
+    @patch.object(context.uuid, 'uuid4')
+    def test_libvirt_cpu_mode(self, mock_uuid):
+        self.test_config.set('cpu-mode', 'host-passthrough')
+        mock_uuid.return_value = 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7'
+        libvirt = context.NovaComputeLibvirtContext()
+
+        self.assertEqual(
+            {'libvirtd_opts': '-d',
+             'arch': platform.machine(),
+             'listen_tls': 0,
+             'host_uuid': 'e46e530d-18ae-4a67-9ff0-e6e2ba7c60a7',
+             'cpu_mode': 'host-passthrough'}, libvirt())
+
     @patch.object(context.NeutronComputeContext, 'network_manager')
     @patch.object(context.NeutronComputeContext, 'plugin')
     def test_disable_security_groups_true(self, plugin, nm):