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

[Ryan Beisner]

Update amulet test definitions

[lp:~1chb1n/charms/trusty/nova-compute/next-amulet-1602]

196. By Ryan Beisner on 2016-02-13

Update

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

charm_lint_check #452 nova-compute-next for 1chb1n mp285950
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/452/

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

charm_unit_test #371 nova-compute-next for 1chb1n mp285950
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/371/

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

charm_amulet_test #168 nova-compute-next for 1chb1n mp285950
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/15033630/
Build: http://10.245.162.36:8080/job/charm_amulet_test/168/

[lp:~1chb1n/charms/trusty/nova-compute/next-amulet-1602]

197. By Ryan Beisner on 2016-02-13

Disable xenial test, not quite ready

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

charm_lint_check #460 nova-compute-next for 1chb1n mp285950
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/460/

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

charm_unit_test #380 nova-compute-next for 1chb1n mp285950
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/380/

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

charm_amulet_test #177 nova-compute-next for 1chb1n mp285950
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/177/

=== modified file 'tests/019-basic-trusty-mitaka' (properties changed: -x to +x)
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-10-16 05:42:25 +0000
+++ tests/basic_deployment.py	2016-02-13 03:28:45 +0000
@@ -411,7 +411,7 @@
                                               db_nc_rel['nova_password'],
                                               db_nc_rel['db_host'],
                                               'nova')
-
+        # Common conf across all releases
         expected = {
             'DEFAULT': {
                 'dhcpbridge_flagfile': '/etc/nova/nova.conf',
@@ -424,51 +424,45 @@
                 'ec2_private_dns_show_ip': 'True',
                 'api_paste_config': '/etc/nova/api-paste.ini',
                 'enabled_apis': 'ec2,osapi_compute,metadata',
-                'auth_strategy': 'keystone',
                 'flat_interface': 'eth1',
                 'network_manager': 'nova.network.manager.FlatDHCPManager',
                 'volume_api_class': 'nova.volume.cinder.API',
+                'auth_strategy': 'keystone'
             }
         }
+
         if self._get_openstack_release() < self.trusty_kilo:
-            d = 'DEFAULT'
-            expected[d]['lock_path'] = '/var/lock/nova'
-            expected[d]['libvirt_use_virtio_for_bridges'] = 'True'
-            expected[d]['compute_driver'] = 'libvirt.LibvirtDriver'
-            expected[d]['sql_connection'] = db_uri
-            expected[d]['rabbit_userid'] = 'nova'
-            expected[d]['rabbit_virtual_host'] = 'openstack'
-            expected[d]['rabbit_password'] = rmq_nc_rel['password']
-            expected[d]['rabbit_host'] = rmq_nc_rel['hostname']
-            expected[d]['glance_api_servers'] = gl_nc_rel['glance-api-server']
+            # Juno or earlier
+            expected['DEFAULT'].update({
+                'lock_path': '/var/lock/nova',
+                'libvirt_use_virtio_for_bridges': 'True',
+                'compute_driver': 'libvirt.LibvirtDriver',
+                'sql_connection': db_uri,
+                'rabbit_userid': 'nova',
+                'rabbit_virtual_host': 'openstack',
+                'rabbit_password': rmq_nc_rel['password'],
+                'rabbit_host': rmq_nc_rel['hostname'],
+                'glance_api_servers': gl_nc_rel['glance-api-server']
+            })
         else:
-            oslo_concurrency = {
+            # Kilo or later
+            expected.update({
                 'oslo_concurrency': {
                     'lock_path': '/var/lock/nova'
-                }
-            }
-            database = {
+                },
                 'database': {
                     'connection': db_uri
-                }
-            }
-            oslo_messaging_rabbit = {
+                },
                 'oslo_messaging_rabbit': {
                     'rabbit_userid': 'nova',
                     'rabbit_virtual_host': 'openstack',
                     'rabbit_password': rmq_nc_rel['password'],
                     'rabbit_host': rmq_nc_rel['hostname'],
-                }
-            }
-            glance = {
+                },
                 'glance': {
                     'api_servers': gl_nc_rel['glance-api-server']
                 }
-            }
-            expected.update(oslo_concurrency)
-            expected.update(database)
-            expected.update(oslo_messaging_rabbit)
-            expected.update(glance)
+            })
 
         for section, pairs in expected.iteritems():
             ret = u.validate_config_data(unit, conf, section, pairs)