From 55fd28587f05e47d3c868d90c9e3c6dc1bd14a70 Mon Sep 17 00:00:00 2001
From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Wed, 31 Oct 2012 15:15:08 +0200
Subject: [PATCH] Make snf-image-creator compatible with kamaki 0.6
---
image_creator/kamaki_wrapper.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index 3e34095..131e204 100644
--- a/image_creator/kamaki_wrapper.py
+++ b/image_creator/kamaki_wrapper.py
@@ -48,7 +48,8 @@ class Kamaki(object):
@staticmethod
def get_account():
config = Config()
- return config.get('storage', 'account')
+ return config.get('store', 'account') or \
+ config.get('global', 'account')
@staticmethod
def get_token():
@@ -58,7 +59,7 @@ class Kamaki(object):
@staticmethod
def save_account(account):
config = Config()
- config.set('storage', 'account', account)
+ config.set('store', 'account', account)
config.write()
@staticmethod
@@ -74,7 +75,7 @@ class Kamaki(object):
config = Config()
- pithos_url = config.get('storage', 'url')
+ pithos_url = config.get('store', 'url')
self.container = CONTAINER
self.pithos_client = PithosClient(pithos_url, self.token, self.account,
self.container)
@@ -96,7 +97,7 @@ class Kamaki(object):
hash_cb = self.out.progress_generator(hp) if hp is not None else None
upload_cb = self.out.progress_generator(up) if up is not None else None
- self.pithos_client.create_object(path, file_obj, size, hash_cb,
+ self.pithos_client.upload_object(path, file_obj, size, hash_cb,
upload_cb)
return "pithos://%s/%s/%s" % (self.account, self.container, path)
--
GitLab