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

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 192
Proposed branch: lp:~hopem/charms/trusty/nova-cloud-controller/lp1499435
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 20 lines (+5/-6)
1 file modified
hooks/nova_cc_utils.py (+5/-6)
To merge this branch: bzr merge lp:~hopem/charms/trusty/nova-cloud-controller/lp1499435
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+272289@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #9869 nova-cloud-controller-next for hopem mp272289
    UNIT OK: passed

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

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

charm_amulet_test #6727 nova-cloud-controller-next for hopem mp272289
    AMULET OK: passed

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

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

charm_lint_check #10700 nova-cloud-controller-next for hopem mp272289
    LINT OK: passed

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

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

Approve

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_utils.py'
2--- hooks/nova_cc_utils.py 2015-09-24 16:29:26 +0000
3+++ hooks/nova_cc_utils.py 2015-09-24 16:42:16 +0000
4@@ -1056,12 +1056,11 @@
5 raise Exception("IPv6 is not supported in the charms for Ubuntu "
6 "versions less than Trusty 14.04")
7
8- # NOTE(xianghui): Need to install haproxy(1.5.3) from trusty-backports
9- # to support ipv6 address, so check is required to make sure not
10- # breaking other versions, IPv6 only support for >= Trusty
11- if ubuntu_rel == 'trusty':
12- add_source('deb http://archive.ubuntu.com/ubuntu trusty-backports'
13- ' main')
14+ # Need haproxy >= 1.5.3 for ipv6 so for Trusty if we are <= Kilo we need to
15+ # use trusty-backports otherwise we can use the UCA.
16+ if ubuntu_rel == 'trusty' and os_release('nova-api') < 'liberty':
17+ add_source('deb http://archive.ubuntu.com/ubuntu trusty-backports '
18+ 'main')
19 apt_update()
20 apt_install('haproxy/trusty-backports', fatal=True)
21

Subscribers

People subscribed via source and target branches