Merge lp:~ev/uci-engine/ceph into lp:uci-engine

[Evan]

Add a deployer configuration for object storage on ceph and radosgw (implementing the Swift API). This kills one more need for public cloud credentials in the development deployment and brings us closer to what IS will be using in production.

Warning: you'll run into https://bugs.launchpad.net/juju-core/+bug/1307215 if you deploy this.

[Vincent Ladeuil (vila)]

I don't even know when I typed that inline comment :-/

Unmerged revisions

674. By Evan on 2014-07-14

Always specify the length of the file when uploading to object storage, since not all providers support chunked transfers.

673. By Evan on 2014-07-14

Add a deployer configuration for object storage on ceph and radosgw (implementing the Swift API). This kills one more need for public cloud credentials in the development deployment and brings us closer to what IS will be using in production.

=== modified file 'ci-utils/ci_utils/data_store.py'
--- ci-utils/ci_utils/data_store.py	2014-06-30 18:37:17 +0000
+++ ci-utils/ci_utils/data_store.py	2014-07-14 08:59:22 +0000
@@ -86,8 +86,20 @@
         self.ensure_swift_client()
         name = _get_file_name(filename)
         try:
+            # Move to the end of the file, record the position, then seek back
+            # to the beginning.
+            contents.seek(0, 2)
+            length = contents.tell()
+            contents.seek(0)
+        except AttributeError:
+            length = len(contents)
+        try:
+            # Not all object storage providers support chunked transfers, so
+            # err on the side of caution and always specify the length of the
+            # file.
             self.client.put_object(self.container_id, obj=name,
                                    contents=contents,
+                                   content_length=length,
                                    content_type=content_type)
         except ClientException as e:
             raise DataStoreException(
 
=== added file 'juju-deployer/object-storage.yaml'
--- juju-deployer/object-storage.yaml	1970-01-01 00:00:00 +0000
+++ juju-deployer/object-storage.yaml	2014-07-14 08:59:22 +0000
@@ -0,0 +1,25 @@
+uci-obstore:
+  series: trusty
+  services:
+    uci-ceph:
+      charm: ceph
+      branch: lp:~openstack-charmers/charms/trusty/ceph/trunk
+      # Needed for quorum. Will fail without.
+      num_units: 3
+      options:
+        fsid: ecbb8960-0e21-11e2-b495-83a88f44db01
+        monitor-secret: AQD1P2xQiKglDhAA4NGUF5j38Mhq56qwz+45wg==
+        osd-devices: /srv/ceph
+    uci-radosgw:
+      charm: ceph-radosgw
+      branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/trunk
+      expose: True
+    uci-keystone:
+      charm: keystone
+      branch: lp:~openstack-charmers/charms/trusty/keystone/trunk
+      expose: True
+      options:
+        admin-password: password
+  relations:
+    - ["uci-ceph", "uci-radosgw"]
+    - ["uci-keystone", "uci-radosgw"]