Merge lp:~thedac/charms/trusty/nova-cloud-controller/lp1524448 into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

Proposed by David Ames
Status: Merged
Merged at revision: 216
Proposed branch: lp:~thedac/charms/trusty/nova-cloud-controller/lp1524448
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 16 lines (+6/-0)
1 file modified
hooks/nova_cc_hooks.py (+6/-0)
To merge this branch: bzr merge lp:~thedac/charms/trusty/nova-cloud-controller/lp1524448
Reviewer Review Type Date Requested Status
Liam Young Approve
Review via email: mp+285764@code.launchpad.net

Description of the change

Fixes lp bug#1524448. Do not run neutron-server if >= juno

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #209 nova-cloud-controller-next for thedac mp285764
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #233 nova-cloud-controller-next for thedac mp285764
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #115 nova-cloud-controller-next for thedac mp285764
    AMULET OK: passed

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

Revision history for this message
Liam Young (gnuoy) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/nova_cc_hooks.py'
2--- hooks/nova_cc_hooks.py 2016-01-08 13:46:56 +0000
3+++ hooks/nova_cc_hooks.py 2016-02-11 15:52:15 +0000
4@@ -219,6 +219,12 @@
5 active=config('service-guard'))
6 @restart_on_change(restart_map(), stopstart=True)
7 def config_changed():
8+ # neutron-server runs if < juno. Neutron-server creates mysql tables
9+ # which will subsequently cause db migratoins to fail if >= juno.
10+ # Disable neutron-server if >= juno
11+ if os_release('nova-common') >= 'juno':
12+ with open('/etc/init/neutron-server.override', 'wb') as out:
13+ out.write('manual\n')
14 if config('prefer-ipv6'):
15 status_set('maintenance', 'configuring ipv6')
16 setup_ipv6()

Subscribers

People subscribed via source and target branches