Juju Charms Collection
hacluster package

Merge lp:~hopem/charms/trusty/hacluster/dont-allow-pacemaker-upgrade into lp:~openstack-charmers/charms/trusty/hacluster/next

  1. Trusty Tahr (14.04)
  2. dont-allow-pacemaker-upgrade
  3. Merge into next
Proposed by Edward Hope-Morley
Status: Merged
Approved by: Edward Hope-Morley
Approved revision: 41
Merged at revision: 40
Proposed branch: lp:~hopem/charms/trusty/hacluster/dont-allow-pacemaker-upgrade
Merge into: lp:~openstack-charmers/charms/trusty/hacluster/next
Diff against target: 24 lines (+5/-2)
1 file modified
hooks/hooks.py (+5/-2)
To merge this branch: bzr merge lp:~hopem/charms/trusty/hacluster/dont-allow-pacemaker-upgrade
Reviewer Review Type Date Requested Status
Billy Olsen Approve
Jorge Niedbalski (community) Approve
Review via email: mp+245014@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

LGTM , after 1382842 is fixed this could be removed.

review: Approve
Revision history for this message
Billy Olsen (billy-olsen) wrote :

LGTM

review: Approve
lp:~hopem/charms/trusty/hacluster/dont-allow-pacemaker-upgrade updated
41. By Edward Hope-Morley

added comment

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/hooks.py'
2--- hooks/hooks.py 2014-12-15 12:55:12 +0000
3+++ hooks/hooks.py 2014-12-17 17:17:38 +0000
4@@ -44,7 +44,8 @@
5
6 from charmhelpers.fetch import (
7 apt_install,
8- apt_purge
9+ apt_purge,
10+ filter_installed_packages,
11 )
12
13 from charmhelpers.contrib.hahelpers.cluster import (
14@@ -73,7 +74,9 @@
15
16 @hooks.hook()
17 def install():
18- apt_install(PACKAGES, fatal=True)
19+ # NOTE(dosaboy): we currently disallow upgrades due to bug #1382842. This
20+ # should be removed once the pacemaker package is fixed.
21+ apt_install(filter_installed_packages(PACKAGES), fatal=True)
22 # NOTE(adam_g) rbd OCF only included with newer versions of
23 # ceph-resource-agents. Bundle /w charm until we figure out a
24 # better way to install it.

Subscribers

People subscribed via source and target branches