Merge lp:~corey.bryant/charms/trusty/nova-compute/amulet-novacc into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Corey Bryant]

[Corey Bryant (corey.bryant)]

The git amulet tests only deploy the current charm from source, and the other charms are deployed from packages. This has worked ok so far except nova-compute started getting some odd instance creation timeouts due to what looked like oslo.messaging issues. Deploying nova-cc from source in addition to nova-compute from source seems to fix it.

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

charm_lint_check #6564 nova-compute-next for corey.bryant mp265428
    LINT OK: passed

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

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

charm_unit_test #6196 nova-compute-next for corey.bryant mp265428
    UNIT OK: passed

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

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

charm_amulet_test #5241 nova-compute-next for corey.bryant mp265428
    AMULET OK: passed

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

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-07-14 17:47:59 +0000
+++ tests/basic_deployment.py	2015-07-21 18:04:56 +0000
@@ -69,13 +69,16 @@
         """Configure all of the services."""
         nova_config = {'config-flags': 'auto_assign_floating_ip=False',
                        'enable-live-migration': 'False'}
+        nova_cc_config = {}
         if self.git:
             amulet_http_proxy = os.environ.get('AMULET_HTTP_PROXY')
 
             reqs_repo = 'git://github.com/openstack/requirements'
+            neutron_repo = 'git://github.com/openstack/neutron'
             nova_repo = 'git://github.com/openstack/nova'
             if self._get_openstack_release() == self.trusty_icehouse:
                 reqs_repo = 'git://github.com/coreycb/requirements'
+                neutron_repo = 'git://github.com/coreycb/neutron'
                 nova_repo = 'git://github.com/coreycb/nova'
 
             branch = 'stable/' + self._get_openstack_release_string()
@@ -85,6 +88,9 @@
                     {'name': 'requirements',
                      'repository': reqs_repo, 
                      'branch': branch},
+                    {'name': 'neutron',
+                     'repository': neutron_repo,
+                     'branch': branch},
                     {'name': 'nova',
                      'repository': nova_repo,
                      'branch': branch},
@@ -94,10 +100,12 @@
                 'https_proxy': amulet_http_proxy,
             }
             nova_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
+            nova_cc_config['openstack-origin-git'] = yaml.dump(openstack_origin_git)
 
         keystone_config = {'admin-password': 'openstack',
                            'admin-token': 'ubuntutesting'}
-        configs = {'nova-compute': nova_config, 'keystone': keystone_config}
+        configs = {'nova-compute': nova_config, 'keystone': keystone_config,
+                   'nova-cloud-controller': nova_cc_config}
         super(NovaBasicDeployment, self)._configure_services(configs)
 
     def _initialize_tests(self):