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

Proposed by Adam Gandelman on 2014-01-23
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 2014-01-23 Approve on 2014-01-24
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.
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/nova_compute_utils.py'
2--- hooks/nova_compute_utils.py 2013-11-29 15:35:28 +0000
3+++ hooks/nova_compute_utils.py 2014-01-23 01:27:01 +0000
4@@ -336,25 +336,6 @@
5 _hosts.write(b64decode(hosts))
6
7
8-def configure_live_migration(configs=None):
9- """
10- Ensure libvirt live migration is properly configured or disabled,
11- depending on current config setting.
12- """
13- # dont think we need this
14- return
15- configs = configs or register_configs()
16- configs.write(LIBVIRTD_CONF)
17- configs.write(LIBVIRT_BIN)
18- configs.write(NOVA_CONF)
19-
20- if not migration_enabled():
21- return
22-
23- if config('migration-auth-type') == 'ssh':
24- initialize_ssh_keys()
25-
26-
27 def do_openstack_upgrade(configs):
28 new_src = config('openstack-origin')
29 new_os_rel = get_os_codename_install_source(new_src)

Subscribers

People subscribed via source and target branches