Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SAAS-501: Re-jig cloud_storage.conf

This commit is contained in:
drigato 2014-11-27 15:50:40 -05:00
parent 8601452c71
commit 92feacd46f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/amazon/Amazon_S3.php
View File

@ -26,9 +26,9 @@ class Amazon_S3
{
$CC_CONFIG = Config::getConfig();
$this->setBucket($CC_CONFIG['cloud_storage']['bucket']);
$this->setAccessKey($CC_CONFIG['cloud_storage']['api_key']);
$this->setSecretKey($CC_CONFIG['cloud_storage']['api_key_secret']);
$this->setBucket($CC_CONFIG['storage_backend']['bucket']);
$this->setAccessKey($CC_CONFIG['storage_backend']['api_key']);
$this->setSecretKey($CC_CONFIG['storage_backend']['api_key_secret']);
$this->zendServiceAmazonS3 = new Zend_Service_Amazon_S3(
$this->getAccessKey(),

6
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
View File

@ -6,7 +6,7 @@ from libcloud.storage.providers import get_driver
from libcloud.storage.types import Provider, ContainerDoesNotExistError, ObjectDoesNotExistError
CONFIG_PATH = '/etc/airtime-saas/amazon.conf'
CONFIG_PATH = '/etc/airtime-saas/cloud_storage.conf'
class CloudStorageUploader:
""" A class that uses Apache Libcloud's Storage API to upload objects into
@ -27,7 +27,8 @@ class CloudStorageUploader:
def __init__(self):
config = aa.AirtimeAnalyzerServer.read_config_file(CONFIG_PATH)
CLOUD_STORAGE_CONFIG_SECTION = "cloud_storage"
CLOUD_STORAGE_CONFIG_SECTION = config.get("current_backend", "storage_backend")
self._storage_backend = CLOUD_STORAGE_CONFIG_SECTION
self._provider = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'provider')
self._bucket = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'bucket')
self._api_key = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'api_key')
@ -90,5 +91,6 @@ class CloudStorageUploader:
metadata["filename"] = file_base_name
metadata["resource_id"] = object_name
metadata["storage_backend"] = self._storage_backend
return metadata