From bc922fde4bd3d3954d6829b46d3f912bf7d41c4d Mon Sep 17 00:00:00 2001
From: Sinny Kumari <sinny@redhat.com>
Date: Apr 27 2018 18:44:59 +0000
Subject: Hardcode AMI for us-east-2 and eu-west-3 regions for Cloud-Base


Fedmsg topic 'org.fedoraproject.prod.fedimg.image.upload'
doesn't have AMI information for these two regions. We have
made AMIs available for these regions. So, hardcode these AMIs
for F28 Cloud-Base

Signed-off-by: Sinny Kumari <sinny@redhat.com>

---

diff --git a/alt.fedoraproject.org/build/fedimg_vars.py b/alt.fedoraproject.org/build/fedimg_vars.py
index 474099a..59aa839 100755
--- a/alt.fedoraproject.org/build/fedimg_vars.py
+++ b/alt.fedoraproject.org/build/fedimg_vars.py
@@ -88,6 +88,14 @@ def collect(release):
                     region = upload['destination']
                     results[name][region] = ami
 
+    # Hardcode AMIs for regions eu-west-3 and us-east-2 for F28 cloud-base
+    # This is because fedmsg topic 'org.fedoraproject.prod.fedimg.image.upload'
+    # doesn't have AMI information for these two regions.
+    results['HVM_base_AMI']['us-east-2'] = 'ami-8d3b09e8'
+    results['HVM_base_AMI']['eu-west-3'] = 'ami-fdcc7d80'
+    results['GP2_HVM_base_AMI']['us-east-2'] = 'ami-013b0964'
+    results['GP2_HVM_base_AMI']['eu-west-3'] = 'ami-a5cc7dd8'
+
     shelf['timestamp'] = datetime.utcnow()
     shelf['collected'] = results
     shelf.close()
diff --git a/build.d/globalvar.py b/build.d/globalvar.py
index c7eaeea..2af1166 100644
--- a/build.d/globalvar.py
+++ b/build.d/globalvar.py
@@ -318,11 +318,13 @@ region = collections.namedtuple('EC2_region', ['long', 'short', 'code'])
 EC2_regions = [
     # long,                                    short,           code
     region(u'US East (N. Virginia)',           u'Virginia',     u'us-east-1'),
+    region(u'US East (Ohio)',                  u'Ohio',         u'us-east-2'),
     region(u'US West (Oregon)',                u'Oregon',       u'us-west-2'),
     region(u'US West (N. California)',         u'California',   u'us-west-1'),
     region(u'EU West (Ireland)',               u'Ireland',      u'eu-west-1'),
     region(u'EU Central (Frankfurt)',          u'Frankfurt',    u'eu-central-1'),
     region(u'EU West (London)',                u'London',       u'eu-west-2'),
+    region(u'EU West (Paris)',                 u'Paris',        u'eu-west-3'),
     region(u'Asia Pacific SE (Singapore)',     u'Singapore',    u'ap-southeast-1'),
     region(u'Asia Pacific NE (Tokyo)',         u'Tokyo',        u'ap-northeast-1'),
     region(u'Asia Pacific SE (Sydney)',        u'Sydney',       u'ap-southeast-2'),
diff --git a/tools/fedimg_vars_lib.py b/tools/fedimg_vars_lib.py
index fdfab7d..b9d5bd9 100755
--- a/tools/fedimg_vars_lib.py
+++ b/tools/fedimg_vars_lib.py
@@ -117,7 +117,7 @@ def sanity_check(globalvar, collected_fedimg_vars):
 def mocked_fedimg(templates):
     regions = ['us-east-1', 'ap-northeast-1', 'sa-east-1', 'ap-southeast-1', 'ap-southeast-2',
                'us-west-2', 'us-west-1', 'eu-central-1', 'eu-west-1', 'ap-northeast-2',
-               'ap-south-1', 'ca-central-1', 'eu-west-2']
+               'ap-south-1', 'ca-central-1', 'eu-west-2', 'us-east-2', 'eu-west-3']
     mockdata = {}
     for region in regions:
         mockdata[region] = 'ami-mocked'