config: Move the config in a single configuration file

Signed-off-by: Sayan Chowdhury <[email protected]>
fedora-infra · Dec 22, 2017 · db17bb5 · db17bb5
1 parent f39c64a
commit db17bb5
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 49 deletions.
diff --git a/fedimg/config.py b/fedimg/config.py
@@ -32,3 +32,16 @@
 ACTIVE_SERVICES = config['general']['active_services']
 CLEAN_UP_ON_FAILURE = config['general']['clean_up_on_failure']
 DELETE_IMAGES_ON_FAILURE = config['general']['delete_images_on_failure']
+
+AWS_UTIL_USER = config.get('aws', {}).get('util_username', {})
+AWS_TEST_USER = config.get('aws', {}).get('test_username', {})
+AWS_ACCESS_ID = config.get('aws', {}).get('access_id')
+AWS_SECRET_KEY = config.get('aws', {}).get('secret_key')
+AWS_VOLUME_SIZE = config.get('aws', {}).get('volume_size')
+AWS_VOLUME_TYPES = config.get('aws', {}).get('volume_types')
+AWS_VOLUME_VIA_S3 = config.get('aws', {}).get('volume_via_s3')
+AWS_IAM_PROFILE = config.get('aws', {}).get('iam_profile')
+AWS_REGIONS = config.get('aws', {}).get('regions', {})
+AWS_ROOT_VOLUME_SIZE = config.get('aws', {}).get('root_volume_size', {})
+AWS_BASE_REGION = config.get('aws', {}).get('base_region', {})
+AWS_DELETE_RESOURCES = config.get('aws', {}).get('delete_resources', True)
diff --git a/fedimg/services/ec2/config.py b/fedimg/services/ec2/config.py
diff --git a/fedimg/services/ec2/ec2copy.py b/fedimg/services/ec2/ec2copy.py
@@ -24,7 +24,7 @@
 """
 import logging
 
-from fedimg.services.ec2.config import AWS_BASE_REGION
+from fedimg.config import AWS_BASE_REGION
 from fedimg.services.ec2.ec2imgpublisher import EC2ImagePublisher
 
 LOG = logging.getLogger(__name__)

diff --git a/fedimg/services/ec2/ec2imgpublisher.py b/fedimg/services/ec2/ec2imgpublisher.py
@@ -148,7 +148,7 @@ def get_volume_type_from_image(self, image):
         blk_mapping = image.extra['block_device_mapping']
         if not blk_mapping:
             blk_mapping = self._retry_till_blk_mapping_is_available(image)
-    
+
         return blk_mapping[0]['ebs']['volume_type']
 
     def get_virt_type_from_image(self, image):
@@ -159,7 +159,7 @@ def get_virt_type_from_image(self, image):
         blk_mapping = image.extra['block_device_mapping']
         if not blk_mapping:
             blk_mapping = self._retry_till_blk_mapping_is_available(image)
-    
+
         device_name = blk_mapping[0]['ebs']['volume_type']
 
         if device_name.endswith('sda1'):

diff --git a/fedimg/services/ec2/ec2imguploader.py b/fedimg/services/ec2/ec2imguploader.py
@@ -27,7 +27,7 @@
 import fedimg.messenger
 
 from fedimg.utils import external_run_command, get_item_from_regex
-from fedimg.services.ec2.config import AWS_DELETE_RESOURCES
+from fedimg.config import AWS_DELETE_RESOURCES
 from fedimg.services.ec2.ec2base import EC2Base
 
 

diff --git a/fedimg/services/ec2/ec2initiate.py b/fedimg/services/ec2/ec2initiate.py
@@ -31,8 +31,8 @@
 
 import fedimg.messenger
 
-from fedimg.services.ec2.config import AWS_VOLUME_TYPES, AWS_BASE_REGION
-from fedimg.services.ec2.config import AWS_ROOT_VOLUME_SIZE
+from fedimg.config import AWS_VOLUME_TYPES, AWS_BASE_REGION
+from fedimg.config import AWS_ROOT_VOLUME_SIZE
 from fedimg.services.ec2.ec2imguploader import EC2ImageUploader
 from fedimg.services.ec2.ec2imgpublisher import EC2ImagePublisher
 from fedimg.utils import get_virt_types_from_url, get_source_from_image

diff --git a/fedimg/uploader.py b/fedimg/uploader.py
@@ -29,8 +29,9 @@
 from fedimg.config import ACTIVE_SERVICES
 from fedimg.services.ec2.ec2initiate import main as ec2main
 from fedimg.services.ec2.ec2copy import main as ec2copy
-from fedimg.services.ec2.config import AWS_ACCESS_ID, AWS_SECRET_KEY
-from fedimg.services.ec2.config import AWS_BASE_REGION, AWS_REGIONS
+from fedimg.config import AWS_ACCESS_ID, AWS_SECRET_KEY
+from fedimg.config import AWS_BASE_REGION, AWS_REGIONS
+
 
 LOG = logging.getLogger(__name__)