Merge lp:~gandelman-a/charms/precise/swift-proxy/upgrade into lp:~openstack-charmers/charms/precise/swift-proxy/ha-support

[Adam Gandelman]

[James Page (james-page)]

review: Approve

=== modified file 'hooks/swift_hooks.py'
--- hooks/swift_hooks.py	2013-04-10 19:54:18 +0000
+++ hooks/swift_hooks.py	2013-05-22 21:51:24 +0000
@@ -166,6 +166,17 @@
 
 
 def config_changed():
+    # Determine whether or not we should do an upgrade, based on the
+    # the version offered in keyston-release.
+    src = utils.config_get('openstack-origin')
+    available = openstack.get_os_codename_install_source(src)
+    installed = openstack.get_os_codename_package('python-swift')
+    if (available and
+        openstack.get_os_version_codename(available) > \
+        openstack.get_os_version_codename(installed)):
+        pkgs = swift.determine_packages(available)
+        swift.do_openstack_upgrade(src, pkgs)
+
     relids = utils.relation_ids('identity-service')
     if relids:
         for relid in relids:

=== modified file 'hooks/swift_utils.py'
--- hooks/swift_utils.py	2013-04-11 04:27:47 +0000
+++ hooks/swift_utils.py	2013-05-22 21:51:24 +0000
@@ -449,3 +449,12 @@
         apache.setup_https(namespace="swift",
                            port_maps={api_port: target_port},
                            cert=cert, key=key, ca_cert=ca_cert)
+
+
+def do_openstack_upgrade(source, packages):
+    openstack.configure_installation_source(source)
+    os.environ['DEBIAN_FRONTEND'] = 'noninteractive'
+    subprocess.check_call(['apt-get', 'update'])
+    cmd = ['apt-get', '--option', 'Dpkg::Options::=--force-confnew', '-y',
+           'install'] + packages
+    subprocess.check_call(cmd)

=== modified file 'revision'
--- revision	2013-05-20 10:42:56 +0000
+++ revision	2013-05-22 21:51:24 +0000
@@ -1,1 +1,1 @@
-129
+132