Merge lp:~james-page/charms/trusty/nova-compute-vmware/bug-1574657 into lp:charms/trusty/nova-compute-vmware

Proposed by James Page
Status: Merged
Merged at revision: 106
Proposed branch: lp:~james-page/charms/trusty/nova-compute-vmware/bug-1574657
Merge into: lp:charms/trusty/nova-compute-vmware
Diff against target: 13 lines (+2/-1)
1 file modified
hooks/nova_vmware_context.py (+2/-1)
To merge this branch: bzr merge lp:~james-page/charms/trusty/nova-compute-vmware/bug-1574657
Reviewer Review Type Date Requested Status
David Ames (community) Approve
Review via email: mp+296571@code.launchpad.net
To post a comment you must log in.
Revision history for this message
David Ames (thedac) wrote :

Traceback (most recent call last):
  File "hooks/config-changed", line 136, in <module>
    hooks.execute(sys.argv)
  File "/var/lib/juju/agents/unit-nova-compute-0/charm/hooks/charmhelpers/core/hookenv.py", line 478, in execute
    self._hooks[hook_name]()
  File "/var/lib/juju/agents/unit-nova-compute-0/charm/hooks/charmhelpers/core/host.py", line 232, in wrapped_f
    f(*args)
  File "hooks/config-changed", line 49, in config_changed
    CONFIGS.write_all()
  File "/var/lib/juju/agents/unit-nova-compute-0/charm/hooks/charmhelpers/contrib/openstack/templating.py", line 262, in write_all
    [self.write(k) for k in self.templates.iterkeys()]
  File "/var/lib/juju/agents/unit-nova-compute-0/charm/hooks/charmhelpers/contrib/openstack/templating.py", line 251, in write
    _out = self.render(config_file)
  File "/var/lib/juju/agents/unit-nova-compute-0/charm/hooks/charmhelpers/contrib/openstack/templating.py", line 222, in render
    ctxt = self.templates[config_file].context()
  File "/var/lib/juju/agents/unit-nova-compute-0/charm/hooks/charmhelpers/contrib/openstack/templating.py", line 88, in context
    _ctxt = context()
  File "/var/lib/juju/agents/unit-nova-compute-0/charm/hooks/nova_vmware_context.py", line 159, in __call__
    raise NovaVMwareIncompatable()
nova_vmware_context.NovaVMwareIncompatable

Revision history for this message
David Ames (thedac) wrote :

Disregard the above. That was a configuration problem. Confirmed this solves the Bug. Merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/nova_vmware_context.py'
2--- hooks/nova_vmware_context.py 2014-06-24 15:09:26 +0000
3+++ hooks/nova_vmware_context.py 2016-06-06 16:04:25 +0000
4@@ -117,7 +117,8 @@
5 return neutron_ctxt
6
7 def __call__(self):
8- if not is_relation_made('cloud-compute', ['network_manager']):
9+ if not is_relation_made('cloud-compute', ['network_manager',
10+ 'quantum_plugin']):
11 return {}
12 else:
13 self.validate_network_manager()

Subscribers

People subscribed via source and target branches

to all changes: