Merge lp:~gandelman-a/charms/precise/nova-compute/unused_func into lp:~charmers/charms/precise/nova-compute/trunk

Proposed by Adam Gandelman
Status: Merged
Merged at revision: 53
Proposed branch: lp:~gandelman-a/charms/precise/nova-compute/unused_func
Merge into: lp:~charmers/charms/precise/nova-compute/trunk
Diff against target: 29 lines (+0/-19)
1 file modified
hooks/nova_compute_utils.py (+0/-19)
To merge this branch: bzr merge lp:~gandelman-a/charms/precise/nova-compute/unused_func
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+202777@code.launchpad.net

Description of the change

Drops an unused and obsolete function. This apparently confused people into thinking live migration setup was a noop, but its actually handled elsewhere in the charm.

To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py 2013-11-29 15:35:28 +0000
+++ hooks/nova_compute_utils.py 2014-01-23 01:27:01 +0000
@@ -336,25 +336,6 @@
336 _hosts.write(b64decode(hosts))336 _hosts.write(b64decode(hosts))
337337
338338
339def configure_live_migration(configs=None):
340 """
341 Ensure libvirt live migration is properly configured or disabled,
342 depending on current config setting.
343 """
344 # dont think we need this
345 return
346 configs = configs or register_configs()
347 configs.write(LIBVIRTD_CONF)
348 configs.write(LIBVIRT_BIN)
349 configs.write(NOVA_CONF)
350
351 if not migration_enabled():
352 return
353
354 if config('migration-auth-type') == 'ssh':
355 initialize_ssh_keys()
356
357
358def do_openstack_upgrade(configs):339def do_openstack_upgrade(configs):
359 new_src = config('openstack-origin')340 new_src = config('openstack-origin')
360 new_os_rel = get_os_codename_install_source(new_src)341 new_os_rel = get_os_codename_install_source(new_src)

Subscribers

People subscribed via source and target branches