← Back to branch summary

~niedbalski/charms/trusty/swift-storage/fix-lp-1308557

« back to all changes in this revision

Viewing changes to hooks/swift_storage_utils.py

  • Committer: James Page
  • Date: 2014-04-16 08:34:53 UTC
  • mfrom: (24.1.17 swift-storage)
  • Revision ID: james.page@canonical.com-20140416083453-3n4gz51lk3p8tojd
[james-page,r=james-page,t=*]

Support for Icehouse on 12.04 and 14.04

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/swift_storage_utils.py
16
16
    RsyncContext,
17
17
)
18
18
 
19
 
from charmhelpers.fetch import apt_install, apt_update
 
19
from charmhelpers.fetch import apt_upgrade, apt_update
20
20
 
21
21
from charmhelpers.core.host import (
22
22
    mkdir,
60
60
 
61
61
CONTAINER_SVCS = [
62
62
    'swift-container', 'swift-container-auditor',
63
 
    'swift-container-updater', 'swift-container-replicator'
 
63
    'swift-container-updater', 'swift-container-replicator',
 
64
    'swift-container-sync'
64
65
]
65
66
 
66
67
OBJECT_SVCS = [
127
128
        '--option', 'Dpkg::Options::=--force-confdef',
128
129
    ]
129
130
    apt_update()
130
 
    apt_install(packages=PACKAGES, options=dpkg_opts, fatal=True)
 
131
    apt_upgrade(options=dpkg_opts, fatal=True, dist=True)
131
132
    configs.set_release(openstack_release=new_os_rel)
132
133
    configs.write_all()
133
134
    [service_restart(svc) for svc in