Change hardcode for Fedora utility image

redhat-imaging · Mar 16, 2016 · 0e7b1b3 · 0e7b1b3
1 parent 73aa3ea
commit 0e7b1b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/imagefactory.conf b/imagefactory.conf
@@ -13,7 +13,7 @@
   "max_concurrent_local_sessions": 2,
   "max_concurrent_ec2_sessions": 4,
   "ec2-32bit-util": "m1.small",
-  "ec2-64bit-util": "m1.large",
+  "ec2-64bit-util": "t2.micro",
   "image_manager": "file",
   "image_manager_args": { "storage_path": "/var/lib/imagefactory/storage" },
   "tdl_require_root_pw": 0,

diff --git a/imagefactory_plugins/EC2/EC2.py b/imagefactory_plugins/EC2/EC2.py
@@ -993,12 +993,12 @@ def ec2_push_image_upload_ebs(self, target_image_id, provider, credentials, virt
 
         # Use our F20 - 32 bit JEOS image as the utility image for uploading to the EBS volume
         try:
-            ami_info = self.ec2_jeos_amis['ec2-' + region_conf['host']]['Fedora']['20']['i386']
+            ami_info = self.ec2_jeos_amis['ec2-' + region_conf['host']]['Fedora']['23']['x86_64']
         except KeyError:
             raise ImageFactoryException("No Fedora 16 i386 JEOS/utility image in region (%s) - aborting" % (provider))
 
         # i386
-        instance_type=self.app_config.get('ec2-32bit-util','m1.small')
+        instance_type=self.app_config.get('ec2-64bit-util','t2.micro')
 
         self.activity("Initializing connection to ec2 region (%s)" % region_conf['host'])
         ec2region = boto.ec2.get_region(region_conf['host'], aws_access_key_id=self.ec2_access_key, aws_secret_access_key=self.ec2_secret_key)