Merge lp:~freyes/charms/trusty/nova-cloud-controller/lp1387073 into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Felipe Reyes]

Dear OpenStack Charmers,

This MP exposes the scheduler_default_filters from nova.conf as a config option. By default uses the same set of filters that was hardcoded in the template.

This MP adds a basic unit test for NovaConfigContext class.

Best Regards,

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

charm_lint_check #10195 nova-cloud-controller-next for freyes mp271554
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

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

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

charm_unit_test #9353 nova-cloud-controller-next for freyes mp271554
    UNIT OK: passed

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

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

charm_amulet_test #6484 nova-cloud-controller-next for freyes mp271554
    AMULET FAIL: amulet-test failed

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

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

[Liam Young (gnuoy)]

The amulet fail looks to do with a known race and other tests did pass. The lint error is a minor charm proof issue unrelated to this change, so LGTM! Thanks for the mp

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-07-24 12:29:29 +0000
+++ config.yaml	2015-09-17 20:44:10 +0000
@@ -395,3 +395,9 @@
       
       If memcached is being used to store the tokens, then it's recommended to
       change this configuration to False.
+  scheduler-default-filters:
+    type: string
+    default: "RetryFilter,AvailabilityZoneFilter,CoreFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter"
+    description: |
+      List of filter class names to use for filtering hosts when not specified in
+      the request.
 
=== modified file 'hooks/nova_cc_context.py'
--- hooks/nova_cc_context.py	2015-07-24 12:29:29 +0000
+++ hooks/nova_cc_context.py	2015-09-17 20:44:10 +0000
@@ -304,6 +304,7 @@
 class NovaConfigContext(context.WorkerConfigContext):
     def __call__(self):
         ctxt = super(NovaConfigContext, self).__call__()
+        ctxt['scheduler_default_filters'] = config('scheduler-default-filters')
         ctxt['cpu_allocation_ratio'] = config('cpu-allocation-ratio')
         ctxt['ram_allocation_ratio'] = config('ram-allocation-ratio')
         addr = resolve_address(INTERNAL)
 
=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2014-12-16 14:08:58 +0000
+++ templates/havana/nova.conf	2015-09-17 20:44:10 +0000
@@ -22,7 +22,8 @@
 compute_driver=libvirt.LibvirtDriver
 osapi_compute_workers = {{ workers }}
 ec2_workers = {{ workers }}
-scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,CoreFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter
+
+scheduler_default_filters = {{ scheduler_default_filters }}
 cpu_allocation_ratio = {{ cpu_allocation_ratio }}
 use_syslog={{ use_syslog }}
 my_ip = {{ host_ip }}
 
=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2015-08-25 15:34:46 +0000
+++ templates/icehouse/nova.conf	2015-09-17 20:44:10 +0000
@@ -31,7 +31,7 @@
 osapi_compute_workers = {{ workers }}
 ec2_workers = {{ workers }}
 
-scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,CoreFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter
+scheduler_default_filters = {{ scheduler_default_filters }}
 cpu_allocation_ratio = {{ cpu_allocation_ratio }}
 ram_allocation_ratio = {{ ram_allocation_ratio }}
 
 
=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2015-08-25 15:34:46 +0000
+++ templates/juno/nova.conf	2015-09-17 20:44:10 +0000
@@ -31,7 +31,7 @@
 osapi_compute_workers = {{ workers }}
 ec2_workers = {{ workers }}
 
-scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,CoreFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter
+scheduler_default_filters = {{ scheduler_default_filters }}
 cpu_allocation_ratio = {{ cpu_allocation_ratio }}
 ram_allocation_ratio = {{ ram_allocation_ratio }}
 
 
=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-08-25 15:34:46 +0000
+++ templates/kilo/nova.conf	2015-09-17 20:44:10 +0000
@@ -30,7 +30,7 @@
 osapi_compute_workers = {{ workers }}
 ec2_workers = {{ workers }}
 
-scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,CoreFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter
+scheduler_default_filters = {{ scheduler_default_filters }}
 cpu_allocation_ratio = {{ cpu_allocation_ratio }}
 ram_allocation_ratio = {{ ram_allocation_ratio }}
 
 
=== modified file 'unit_tests/test_nova_cc_contexts.py'
--- unit_tests/test_nova_cc_contexts.py	2015-07-24 12:29:29 +0000
+++ unit_tests/test_nova_cc_contexts.py	2015-09-17 20:44:10 +0000
@@ -296,3 +296,14 @@
         self.assertEqual(ctxt['ssl_key'], '/etc/nova/ssl/nova_key.pem')
         self.assertEqual(ctxt['html5proxy_base_url'],
                          'https://10.5.0.1:6082/spice_auto.html')
+
+    @mock.patch('charmhelpers.core.hookenv.local_unit')
+    def test_nova_config_context(self, local_unit):
+        local_unit.return_value = 'nova-cloud-controller/0'
+        ctxt = context.NovaConfigContext()()
+        self.assertEqual(ctxt['scheduler_default_filters'],
+                         self.config('scheduler-default-filters'))
+        self.assertEqual(ctxt['cpu_allocation_ratio'],
+                         self.config('cpu-allocation-ratio'))
+        self.assertEqual(ctxt['ram_allocation_ratio'],
+                         self.config('ram-allocation-ratio'))