#1041 alt: cloud: pull aarch64 info from fedimg, remove x86_64 standard images
Merged 2 years ago by codeblock. Opened 2 years ago by dustymabe.
dustymabe/fedora-websites dusty-fix-arm-cloud-base  into  master

@@ -43,17 +43,18 @@ 

  

      # 1 - transform release vars into an image name we want to query for

      templates = [

-         # The F22 released AMIs uploads didn't appear to go through fedimg, so

-         # we can't use this scheme for them.  Stuff for F23 should all go that

-         # route though, so we can hopefully switch over soon.

          ("Fedora-Cloud-Base-{curr_cloud_AMI_id}-{RC_gold}.x86_64", {

-             'HVM_base_AMI':     lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard',

-             'GP2_HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2',

+             'X86_64_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2',

+         }),

+         ("Fedora-Cloud-Base-{curr_cloud_AMI_id}-{RC_gold}.aarch64", {

+             'AARCH64_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2',

+         }),

+         ("Fedora-Cloud-Base-{next_cloud_AMI_id}_{curr_cloud_AMI_state}-{RC_pre_gold}.x86_64", {

+             'pre_X86_64_base_AMI':  lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2',

+         }),

+         ("Fedora-Cloud-Base-{next_cloud_AMI_id}-{curr_cloud_AMI_state}-{RC_pre_gold}.aarch64", {

+             'pre_AARCH64_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2',

          }),

-         #("Fedora-Cloud-Base-{next_cloud_AMI_id}_{curr_cloud_AMI_state}-{RC_pre_gold}.x86_64", {

-         #    'pre_HVM_base_AMI':     lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard',

-         #    'pre_GP2_HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2',

-         #}),

      ]

  

      if not os.path.exists('/var/fedora_websites_live_fedimg'):

@@ -279,7 +279,6 @@ 

        <div class="row">

          <div class="col-sm-12 product-feature">

          <p>${_('The links below will provide you listings of available AMIs by region with buttons to launch them in your Amazon Web Services account. AMI IDs for usage with the AWS Console or command-line tools are also provided.')}</p>

-         <p>${_('All images are available in two formats: a GP2 format which uses faster SSD storage, and a standard format which is more suitable if you have infrequently accessed data and you want to keep storage cost low.')}</p>

          </div>

        </div>

        <div class="row">
@@ -288,16 +287,16 @@ 

              <img src="/static/images/cloud.png" />

              </div>

              <div class="col-sm-7">

-             <h3>${_('GP2 HVM AMIs')}</h3>

+             <h3>${_('x86_64 AMIs')}</h3>

              </div>

              <div class="col-sm-4">

-             <p class="download ec2" data-toggle="modal" data-target=".GP2-base-EC2-desktop">${_('Click to launch')}</p>

-             <div class="modal fade GP2-base-EC2-desktop" tabindex="-1" role="dialog" aria-hidden="true">

+             <p class="download ec2" data-toggle="modal" data-target=".x86_64-base-EC2-desktop">${_('Click to launch')}</p>

+             <div class="modal fade x86_64-base-EC2-desktop" tabindex="-1" role="dialog" aria-hidden="true">

                <div class="modal-dialog modal-cloud">

                  <div class="modal-content">

                    <div class="modal-header">

                      <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                     <h4 class="modal-title">${Markup(_('Fedora %(rel)s GP2 Base Cloud HVM AMIs')) % {'rel':global_variables.release['curr_id']}}</h4>

+                     <h4 class="modal-title">${Markup(_('Fedora %(rel)s x86_64 Cloud Base AMIs')) % {'rel':global_variables.release['curr_id']}}</h4>

                    </div>

                    <table class="table table-hover">

                      <thead>
@@ -309,9 +308,9 @@ 

                      </thead>

                      <tbody>

                        <tr py:for="r in global_variables.EC2_regions">

-                         <td py:if="r.code in global_variables.GP2_HVM_base_AMI">${_(r.long)}</td>

-                         <td py:if="r.code in global_variables.GP2_HVM_base_AMI" class="hidden-xs">${global_variables.GP2_HVM_base_AMI[r.code]}</td>

-                         <td py:if="r.code in global_variables.GP2_HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.GP2_HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                         <td py:if="r.code in global_variables.X86_64_base_AMI">${_(r.long)}</td>

+                         <td py:if="r.code in global_variables.X86_64_base_AMI" class="hidden-xs">${global_variables.X86_64_base_AMI[r.code]}</td>

+                         <td py:if="r.code in global_variables.X86_64_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.X86_64_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                        </tr>

                      </tbody>

                    </table>
@@ -325,16 +324,16 @@ 

              <img src="/static/images/cloud.png" />

              </div>

              <div class="col-sm-7">

-             <h3>${_('arm64 AMIs')}</h3>

+             <h3>${_('aarch64 AMIs')}</h3>

              </div>

              <div class="col-sm-4">

-             <p class="download ec2" data-toggle="modal" data-target=".ARM64-base-EC2-desktop">${_('Click to launch')}</p>

-             <div class="modal fade ARM64-base-EC2-desktop" tabindex="-1" role="dialog" aria-hidden="true">

+             <p class="download ec2" data-toggle="modal" data-target=".aarch64-base-EC2-desktop">${_('Click to launch')}</p>

+             <div class="modal fade aarch64-base-EC2-desktop" tabindex="-1" role="dialog" aria-hidden="true">

                <div class="modal-dialog modal-cloud">

                  <div class="modal-content">

                    <div class="modal-header">

                      <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                     <h4 class="modal-title">${Markup(_('Fedora %(rel)s arm64 Base Cloud AMIs')) % {'rel':global_variables.release['curr_id']}} (2018-11-28)</h4>

+                     <h4 class="modal-title">${Markup(_('Fedora %(rel)s aarch64 Cloud Base AMIs')) % {'rel':global_variables.release['curr_id']}}</h4>

                    </div>

                    <table class="table table-hover">

                      <thead>
@@ -345,47 +344,10 @@ 

                        </tr>

                      </thead>

                      <tbody>

-                       <tr py:for="r in global_variables.EC2_regions">

-                         <td py:if="r.code in global_variables.ARM64_base_AMI">${_(r.long)}</td>

-                         <td py:if="r.code in global_variables.ARM64_base_AMI" class="hidden-xs">${global_variables.ARM64_base_AMI[r.code]}</td>

-                         <td py:if="r.code in global_variables.ARM64_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.ARM64_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

-                       </tr>

-                     </tbody>

-                   </table>

-                 </div>

-               </div>

-             </div>

-             </div>

-           </div>

-           <div class="white">

-             <div class="col-sm-1">

-             <img src="/static/images/cloud.png" />

-             </div>

-             <div class="col-sm-7">

-             <h3>${_('Standard HVM AMIs')}</h3>

-             </div>

-             <div class="col-sm-4">

-             <p class="download ec2" data-toggle="modal" data-target=".base-EC2-desktop">${_('Click to launch')}</p>

-             <div class="modal fade base-EC2-desktop" tabindex="-1" role="dialog" aria-hidden="true">

-               <div class="modal-dialog modal-cloud">

-                 <div class="modal-content">

-                   <div class="modal-header">

-                     <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                     <h4 class="modal-title">${Markup(_('Fedora %(rel)s Standard Base Cloud HVM AMIs')) % {'rel':global_variables.release['curr_id']}}</h4>

-                   </div>

-                   <table class="table table-hover">

-                     <thead>

-                       <tr>

-                         <th>${_('Region')}</th>

-                         <th class="hidden-xs">${_('AMI ID')}</th>

-                         <th class="text-center">${_('Launch')}</th>

-                       </tr>

-                     </thead>

-                     <tbody>

-                       <tr py:for="r in global_variables.EC2_regions">

-                         <td py:if="r.code in global_variables.HVM_base_AMI">${_(r.long)}</td>

-                         <td py:if="r.code in global_variables.HVM_base_AMI" class="hidden-xs">${global_variables.HVM_base_AMI[r.code]}</td>

-                         <td py:if="r.code in global_variables.HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                       <tr py:for="r in global_variables.aarch64_EC2_regions">

+                         <td py:if="r.code in global_variables.AARCH64_base_AMI">${_(r.long)}</td>

+                         <td py:if="r.code in global_variables.AARCH64_base_AMI" class="hidden-xs">${global_variables.AARCH64_base_AMI[r.code]}</td>

+                         <td py:if="r.code in global_variables.AARCH64_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.AARCH64_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                        </tr>

                      </tbody>

                    </table>
@@ -409,8 +371,6 @@ 

        <div class="row">

          <div class="col-xs-12 product-feature">

          <p>${_('The links below will provide you listings of available AMIs by region with buttons to launch them in your Amazon Web Services account. AMI IDs for usage with the AWS Console or command-line tools are also provided.')}</p>

-         <p>${_('All images are available in two formats: a GP2 format which uses faster SSD storage, and a standard format which is more suitable if you have infrequently accessed data and you want to keep storage cost low.')}</p>

-         <p>${_('If you know you need a paravirtual format image for EC2, use the Paravirtual (PV) format. If you\'re unsure which image to choose, use the Hardware Virtual Machine (HVM) format. It can provide the same or better performance than PV images.')}</p>

          </div>

        </div>

        <div class="row">
@@ -419,14 +379,14 @@ 

              <img src="/static/images/cloud.png" />

              </div>

              <div class="col-xs-9">

-             <h3>${_('GP2 HVM AMIs')}</h3>

-             <p class="download ec2" data-toggle="modal" data-target=".GP2-base-EC2-mobile">${_('Click to launch')}</p>

-             <div class="modal fade GP2-base-EC2-mobile" tabindex="-1" role="dialog" aria-hidden="true">

+             <h3>${_('x86_64 AMIs')}</h3>

+             <p class="download ec2" data-toggle="modal" data-target=".base-EC2-mobile">${_('Click to launch')}</p>

+             <div class="modal fade base-EC2-mobile" tabindex="-1" role="dialog" aria-hidden="true">

                <div class="modal-dialog modal-cloud">

                  <div class="modal-content">

                    <div class="modal-header">

                      <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                     <h4 class="modal-title">${Markup(_('Fedora %(rel)s GP2 Base Cloud HVM AMIs')) % {'rel':global_variables.release['curr_id']}}</h4>

+                     <h4 class="modal-title">${Markup(_('Fedora %(rel)s x86_64 Cloud Base AMIs')) % {'rel':global_variables.release['curr_id']}}</h4>

                    </div>

                    <table class="table table-hover">

                      <thead>
@@ -438,9 +398,9 @@ 

                      </thead>

                      <tbody>

                        <tr py:for="r in global_variables.EC2_regions">

-                         <td py:if="r.code in global_variables.GP2_HVM_base_AMI">${_(r.long)}</td>

-                         <td py:if="r.code in global_variables.GP2_HVM_base_AMI" class="hidden-xs">${global_variables.GP2_HVM_base_AMI[r.code]}</td>

-                         <td py:if="r.code in global_variables.GP2_HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.GP2_HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                         <td py:if="r.code in global_variables.X86_64_base_AMI">${_(r.long)}</td>

+                         <td py:if="r.code in global_variables.X86_64_base_AMI" class="hidden-xs">${global_variables.X86_64_base_AMI[r.code]}</td>

+                         <td py:if="r.code in global_variables.X86_64_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.X86_64_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                        </tr>

                      </tbody>

                    </table>
@@ -454,14 +414,14 @@ 

              <img src="/static/images/cloud.png" />

              </div>

              <div class="col-xs-9">

-             <h3>${_('arm64 AMIs')}</h3>

-             <p class="download ec2" data-toggle="modal" data-target=".ARM64-base-EC2-mobile">${_('Click to launch')}</p>

-             <div class="modal fade ARM64-base-EC2-mobile" tabindex="-1" role="dialog" aria-hidden="true">

+             <h3>${_('aarch64 AMIs')}</h3>

+             <p class="download ec2" data-toggle="modal" data-target=".AARCH64-base-EC2-mobile">${_('Click to launch')}</p>

+             <div class="modal fade AARCH64-base-EC2-mobile" tabindex="-1" role="dialog" aria-hidden="true">

                <div class="modal-dialog modal-cloud">

                  <div class="modal-content">

                    <div class="modal-header">

                      <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                     <h4 class="modal-title">${Markup(_('Fedora %(rel)s arm64 Base Cloud HVM AMIs')) % {'rel':global_variables.release['curr_id']}} (2018-11-28)</h4>

+                     <h4 class="modal-title">${Markup(_('Fedora %(rel)s aarch64 Cloud Base AMIs')) % {'rel':global_variables.release['curr_id']}}</h4>

                    </div>

                    <table class="table table-hover">

                      <thead>
@@ -472,10 +432,10 @@ 

                        </tr>

                      </thead>

                      <tbody>

-                       <tr py:for="r in global_variables.EC2_regions">

-                         <td py:if="r.code in global_variables.ARM64_base_AMI">${_(r.long)}</td>

-                         <td py:if="r.code in global_variables.ARM64_base_AMI" class="hidden-xs">${global_variables.ARM64_base_AMI[r.code]}</td>

-                         <td py:if="r.code in global_variables.ARM64_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.ARM64_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                       <tr py:for="r in global_variables.aarch64_EC2_regions">

+                         <td py:if="r.code in global_variables.AARCH64_base_AMI">${_(r.long)}</td>

+                         <td py:if="r.code in global_variables.AARCH64_base_AMI" class="hidden-xs">${global_variables.AARCH64_base_AMI[r.code]}</td>

+                         <td py:if="r.code in global_variables.AARCH64_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.AARCH64_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                        </tr>

                      </tbody>

                    </table>
@@ -484,41 +444,6 @@ 

              </div>

              </div>

          </div>

-         <div class="white">

-             <div class="col-xs-3">

-             <img src="/static/images/cloud.png" />

-             </div>

-             <div class="col-xs-9">

-             <h3>${_('Standard HVM AMIs')}</h3>

-             <p class="download ec2" data-toggle="modal" data-target=".base-EC2-mobile">${_('Click to launch')}</p>

-             <div class="modal fade base-EC2-mobile" tabindex="-1" role="dialog" aria-hidden="true">

-               <div class="modal-dialog modal-cloud">

-                 <div class="modal-content">

-                   <div class="modal-header">

-                     <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                     <h4 class="modal-title">${Markup(_('Fedora %(rel)s Standard Base Cloud HVM AMIs')) % {'rel':global_variables.release['curr_id']}}</h4>

-                   </div>

-                   <table class="table table-hover">

-                     <thead>

-                       <tr>

-                         <th>${_('Region')}</th>

-                         <th class="hidden-xs">${_('AMI ID')}</th>

-                         <th class="text-center">${_('Launch')}</th>

-                       </tr>

-                     </thead>

-                     <tbody>

-                       <tr py:for="r in global_variables.EC2_regions">

-                         <td py:if="r.code in global_variables.HVM_base_AMI">${_(r.long)}</td>

-                         <td py:if="r.code in global_variables.HVM_base_AMI" class="hidden-xs">${global_variables.HVM_base_AMI[r.code]}</td>

-                         <td py:if="r.code in global_variables.HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

-                       </tr>

-                     </tbody>

-                   </table>

-                 </div>

-               </div>

-             </div>

-             </div>

-           </div>

        </div>

      </div>

    </div>

@@ -498,16 +498,16 @@ 

              <img src="/static/images/cloud.png" />

              </div>

              <div class="col-md-4">

-             <h3>${_('GP2 HVM AMIs')}</h3>

+             <h3>${_('x86_64 AMIs')}</h3>

              </div>

              <div class="col-md-4 col-md-offset-3">

-               <p class="download ec2" data-toggle="modal" data-target=".pre-GP2-base-EC2-desktop">${_('Click to launch')}</p>

-                 <div class="modal fade pre-GP2-base-EC2-desktop" tabindex="-1" role="dialog" aria-hidden="true">

+               <p class="download ec2" data-toggle="modal" data-target=".pre-x86_64-base-EC2-desktop">${_('Click to launch')}</p>

+                 <div class="modal fade pre-x86_64-base-EC2-desktop" tabindex="-1" role="dialog" aria-hidden="true">

                    <div class="modal-dialog modal-cloud">

                      <div class="modal-content">

                        <div class="modal-header">

                          <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s GP2 Base Cloud HVM AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

+                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s x86_64 Cloud Base AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

                        </div>

                        <table class="table table-hover">

                          <thead>
@@ -519,9 +519,9 @@ 

                          </thead>

                          <tbody>

                            <tr py:for="r in global_variables.EC2_regions">

-                             <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI">${_(r.long)}</td>

-                             <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI" class="hidden-xs">${global_variables.pre_GP2_HVM_base_AMI[r.code]}</td>

-                             <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_GP2_HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                             <td py:if="r.code in global_variables.pre_X86_64_base_AMI">${_(r.long)}</td>

+                             <td py:if="r.code in global_variables.pre_X86_64_base_AMI" class="hidden-xs">${global_variables.pre_X86_64_base_AMI[r.code]}</td>

+                             <td py:if="r.code in global_variables.pre_X86_64_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_X86_64_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                            </tr>

                          </tbody>

                        </table>
@@ -535,16 +535,16 @@ 

              <img src="/static/images/cloud.png" />

              </div>

              <div class="col-md-4">

-             <h3>${_('Standard HVM AMIs')}</h3>

+             <h3>${_('aarch64 AMIs')}</h3>

              </div>

              <div class="col-md-4 col-md-offset-3">

-               <p class="download ec2" data-toggle="modal" data-target=".pre_base-EC2-desktop">${_('Click to launch')}</p>

-                 <div class="modal fade pre_base-EC2-desktop" tabindex="-1" role="dialog" aria-hidden="true">

+               <p class="download ec2" data-toggle="modal" data-target=".pre-aarch64-EC2-desktop">${_('Click to launch')}</p>

+                 <div class="modal fade pre-aarch64-EC2-desktop" tabindex="-1" role="dialog" aria-hidden="true">

                    <div class="modal-dialog modal-cloud">

                      <div class="modal-content">

                        <div class="modal-header">

                          <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s Standard Base Cloud HVM AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

+                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s aarch64 Cloud Base AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

                        </div>

                        <table class="table table-hover">

                          <thead>
@@ -555,10 +555,10 @@ 

                            </tr>

                          </thead>

                          <tbody>

-                           <tr py:for="r in global_variables.EC2_regions">

-                             <td py:if="r.code in global_variables.pre_HVM_base_AMI">${_(r.long)}</td>

-                             <td py:if="r.code in global_variables.pre_HVM_base_AMI" class="hidden-xs">${global_variables.pre_HVM_base_AMI[r.code]}</td>

-                             <td py:if="r.code in global_variables.pre_HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                           <tr py:for="r in global_variables.aarch64_EC2_regions">

+                             <td py:if="r.code in global_variables.pre_AARCH64_base_AMI">${_(r.long)}</td>

+                             <td py:if="r.code in global_variables.pre_AARCH64_base_AMI" class="hidden-xs">${global_variables.pre_AARCH64_base_AMI[r.code]}</td>

+                             <td py:if="r.code in global_variables.pre_AARCH64_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_AARCH64_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                            </tr>

                          </tbody>

                        </table>
@@ -567,80 +567,6 @@ 

                  </div>

              </div>

            </div>

- <!--          <div class="white">

-             <div class="col-md-1">

-             <img src="/static/images/cloud.png" />

-             </div>

-             <div class="col-md-4">

-             <h3>${_('GP2 PV AMIs')}</h3>

-             </div>

-             <div class="col-md-4 col-md-offset-3">

-               <p class="download ec2" data-toggle="modal" data-target=".pre_GP2-base-EC2-PV-desktop">${_('Click to launch')}</p>

-                 <div class="modal fade pre_GP2-base-EC2-PV-desktop" tabindex="-1" role="dialog" aria-hidden="true">

-                   <div class="modal-dialog modal-cloud">

-                     <div class="modal-content">

-                       <div class="modal-header">

-                         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s GP2 Base Cloud PV AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

-                       </div>

-                       <table class="table table-hover">

-                         <thead>

-                           <tr>

-                             <th>${_('Region')}</th>

-                             <th class="hidden-xs">${_('AMI ID')}</th>

-                             <th class="text-center">${_('Launch')}</th>

-                           </tr>

-                         </thead>

-                         <tbody>

-                           <tr py:for="r in global_variables.EC2_regions">

-                             <td>${_(r.long)}</td>

-                             <td py:if="r.code in global_variables.pre_GP2_PV_base_AMI" class="hidden-xs">${global_variables.pre_GP2_PV_base_AMI[r.code]}</td>

-                             <td py:if="r.code in global_variables.pre_GP2_PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_GP2_PV_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

-                           </tr>

-                         </tbody>

-                       </table>

-                     </div>

-                   </div>

-                 </div>

-             </div>

-           </div>

-           <div class="white">

-             <div class="col-md-1">

-             <img src="/static/images/cloud.png" />

-             </div>

-             <div class="col-md-4">

-             <h3>${_('Standard PV AMIs')}</h3>

-             </div>

-             <div class="col-md-4 col-md-offset-3">

-               <p class="download ec2" data-toggle="modal" data-target=".pre_base-EC2-PV-desktop">${_('Click to launch')}</p>

-                 <div class="modal fade pre_base-EC2-PV-desktop" tabindex="-1" role="dialog" aria-hidden="true">

-                   <div class="modal-dialog modal-cloud">

-                     <div class="modal-content">

-                       <div class="modal-header">

-                         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s Standard Base Cloud PV AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

-                       </div>

-                       <table class="table table-hover">

-                         <thead>

-                           <tr>

-                             <th>${_('Region')}</th>

-                             <th class="hidden-xs">${_('AMI ID')}</th>

-                             <th class="text-center">${_('Launch')}</th>

-                           </tr>

-                         </thead>

-                         <tbody>

-                           <tr py:for="r in global_variables.EC2_regions">

-                             <td>${_(r.long)}</td>

-                             <td py:if="r.code in global_variables.pre_PV_base_AMI" class="hidden-xs">${global_variables.pre_PV_base_AMI[r.code]}</td>

-                             <td py:if="r.code in global_variables.pre_PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_PV_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

-                           </tr>

-                         </tbody>

-                       </table>

-                     </div>

-                   </div>

-                 </div>

-             </div>

-           </div> -->

            <!-- end EC2 images Desktop -->

          </div>

        </div>
@@ -703,9 +629,9 @@ 

              <img src="/static/images/cloud.png" />

              </div>

              <div class="col-xs-9">

-             <h3>${_('GP2 HVM AMIs')}</h3>

-               <p class="download ec2" data-toggle="modal" data-target=".pre-GP2-base-EC2-mobile">${_('Click to launch')}</p>

-                 <div class="modal fade pre-GP2-base-EC2-mobile" tabindex="-1" role="dialog" aria-hidden="true">

+             <h3>${_('x86_64 AMIs')}</h3>

+               <p class="download ec2" data-toggle="modal" data-target=".pre-x86_64-base-EC2-mobile">${_('Click to launch')}</p>

+                 <div class="modal fade pre-x86_64-base-EC2-mobile" tabindex="-1" role="dialog" aria-hidden="true">

                    <div class="modal-dialog modal-cloud">

                      <div class="modal-content">

                        <div class="modal-header">
@@ -722,9 +648,9 @@ 

                          </thead>

                          <tbody>

                            <tr py:for="r in global_variables.EC2_regions">

-                             <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI">${_(r.long)}</td>

-                             <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI" class="hidden-xs">${global_variables.pre_GP2_HVM_base_AMI[r.code]}</td>

-                             <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_GP2_HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                             <td py:if="r.code in global_variables.pre_X86_64_base_AMI">${_(r.long)}</td>

+                             <td py:if="r.code in global_variables.pre_X86_64_base_AMI" class="hidden-xs">${global_variables.pre_X86_64_base_AMI[r.code]}</td>

+                             <td py:if="r.code in global_variables.pre_X86_64_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_X86_64_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                            </tr>

                          </tbody>

                        </table>
@@ -756,45 +682,10 @@ 

                            </tr>

                          </thead>

                          <tbody>

-                           <tr py:for="r in global_variables.EC2_regions">

-                             <td py:if="r.code in global_variables.pre_HVM_base_AMI">${_(r.long)}</td>

-                             <td py:if="r.code in global_variables.pre_HVM_base_AMI" class="hidden-xs">${global_variables.pre_HVM_base_AMI[r.code]}</td>

-                             <td py:if="r.code in global_variables.pre_HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

-                           </tr>

-                         </tbody>

-                       </table>

-                     </div>

-                   </div>

-                 </div>

-             </div>

-           </div>

- <!--          <div class="white">

-             <div class="col-xs-3">

-             <img src="/static/images/cloud.png" />

-             </div>

-             <div class="col-xs-9">

-             <h3>${_('GP2 PV AMIs')}</h3>

-               <p class="download ec2" data-toggle="modal" data-target=".pre_GP2-base-EC2-PV-mobile">${_('Click to launch')}</p>

-                 <div class="modal fade pre_GP2-base-EC2-PV-mobile" tabindex="-1" role="dialog" aria-hidden="true">

-                   <div class="modal-dialog modal-cloud">

-                     <div class="modal-content">

-                       <div class="modal-header">

-                         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s GP2 Base Cloud PV AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

-                       </div>

-                       <table class="table table-hover">

-                         <thead>

-                           <tr>

-                             <th>${_('Region')}</th>

-                             <th class="hidden-xs">${_('AMI ID')}</th>

-                             <th class="text-center">${_('Launch')}</th>

-                           </tr>

-                         </thead>

-                         <tbody>

-                           <tr py:for="r in global_variables.EC2_regions">

-                             <td>${_(r.long)}</td>

-                             <td py:if="r.code in global_variables.pre_GP2_PV_base_AMI" class="hidden-xs">${global_variables.pre_GP2_PV_base_AMI[r.code]}</td>

-                             <td py:if="r.code in global_variables.pre_GP2_PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_GP2_PV_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                           <tr py:for="r in global_variables.aarch64_EC2_regions">

+                             <td py:if="r.code in global_variables.pre_AARCH64_base_AMI">${_(r.long)}</td>

+                             <td py:if="r.code in global_variables.pre_AARCH64_base_AMI" class="hidden-xs">${global_variables.pre_AARCH64_base_AMI[r.code]}</td>

+                             <td py:if="r.code in global_variables.pre_AARCH64_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_AARCH64_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                            </tr>

                          </tbody>

                        </table>
@@ -803,41 +694,6 @@ 

                  </div>

              </div>

            </div>

-           <div class="white">

-             <div class="col-xs-3">

-             <img src="/static/images/cloud.png" />

-             </div>

-             <div class="col-xs-9">

-             <h3>${_('Standard PV AMIs')}</h3>

-               <p class="download ec2" data-toggle="modal" data-target=".pre_base-EC2-PV-mobile">${_('Click to launch')}</p>

-                 <div class="modal fade pre_base-EC2-PV-mobile" tabindex="-1" role="dialog" aria-hidden="true">

-                   <div class="modal-dialog modal-cloud">

-                     <div class="modal-content">

-                       <div class="modal-header">

-                         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s Standard Base Cloud PV AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

-                       </div>

-                       <table class="table table-hover">

-                         <thead>

-                           <tr>

-                             <th>${_('Region')}</th>

-                             <th class="hidden-xs">${_('AMI ID')}</th>

-                             <th class="text-center">${_('Launch')}</th>

-                           </tr>

-                         </thead>

-                         <tbody>

-                           <tr py:for="r in global_variables.EC2_regions">

-                             <td>${_(r.long)}</td>

-                             <td py:if="r.code in global_variables.pre_PV_base_AMI" class="hidden-xs">${global_variables.pre_PV_base_AMI[r.code]}</td>

-                             <td py:if="r.code in global_variables.pre_PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_PV_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

-                           </tr>

-                         </tbody>

-                       </table>

-                     </div>

-                   </div>

-                 </div>

-             </div>

-           </div> -->

            <!-- end EC2 images Phone -->

        </div>

      </div>
@@ -907,16 +763,16 @@ 

            <img src="/static/images/cloud.png" />

            </div>

            <div class="col-sm-5">

-           <h3>${_('GP2 HVM AMIs')}</h3>

+           <h3>${_('x86_64 AMIs')}</h3>

            </div>

            <div class="col-sm-4">

-             <p class="download ec2" data-toggle="modal" data-target=".pre-GP2-base-EC2-tablet">${_('Click to launch')}</p>

-                 <div class="modal fade pre-GP2-base-EC2-tablet" tabindex="-1" role="dialog" aria-hidden="true">

+             <p class="download ec2" data-toggle="modal" data-target=".pre-x86_64-base-EC2-tablet">${_('Click to launch')}</p>

+                 <div class="modal fade pre-x86_64-base-EC2-tablet" tabindex="-1" role="dialog" aria-hidden="true">

                    <div class="modal-dialog modal-cloud">

                      <div class="modal-content">

                        <div class="modal-header">

                          <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s GP2 Base Cloud HVM AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

+                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s x86_64 Cloud Base AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

                        </div>

                        <table class="table table-hover">

                          <thead>
@@ -928,9 +784,9 @@ 

                          </thead>

                          <tbody>

                            <tr py:for="r in global_variables.EC2_regions">

-                             <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI">${_(r.long)}</td>

-                             <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI" class="hidden-xs">${global_variables.pre_GP2_HVM_base_AMI[r.code]}</td>

-                             <td py:if="r.code in global_variables.pre_GP2_HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_GP2_HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                             <td py:if="r.code in global_variables.pre_X86_64_base_AMI">${_(r.long)}</td>

+                             <td py:if="r.code in global_variables.pre_X86_64_base_AMI" class="hidden-xs">${global_variables.pre_X86_64_base_AMI[r.code]}</td>

+                             <td py:if="r.code in global_variables.pre_X86_64_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_X86_64_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                            </tr>

                          </tbody>

                        </table>
@@ -944,16 +800,16 @@ 

            <img src="/static/images/cloud.png" />

            </div>

            <div class="col-sm-5">

-           <h3>${_('Standard HVM AMIs')}</h3>

+           <h3>${_('aarch64 AMIs')}</h3>

            </div>

            <div class="col-sm-4">

-             <p class="download ec2" data-toggle="modal" data-target=".pre_base-EC2-tablet">${_('Click to launch')}</p>

-                 <div class="modal fade pre_base-EC2-tablet" tabindex="-1" role="dialog" aria-hidden="true">

+             <p class="download ec2" data-toggle="modal" data-target=".pre-aarch64-base-EC2-tablet">${_('Click to launch')}</p>

+                 <div class="modal fade pre-aarch64-base-EC2-tablet" tabindex="-1" role="dialog" aria-hidden="true">

                    <div class="modal-dialog modal-cloud">

                      <div class="modal-content">

                        <div class="modal-header">

                          <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s Standard Base Cloud HVM AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

+                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s aarch64 Cloud Base AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

                        </div>

                        <table class="table table-hover">

                          <thead>
@@ -964,10 +820,10 @@ 

                            </tr>

                          </thead>

                          <tbody>

-                           <tr py:for="r in global_variables.EC2_regions">

-                             <td py:if="r.code in global_variables.pre_HVM_base_AMI">${_(r.long)}</td>

-                             <td py:if="r.code in global_variables.pre_HVM_base_AMI" class="hidden-xs">${global_variables.pre_HVM_base_AMI[r.code]}</td>

-                             <td py:if="r.code in global_variables.pre_HVM_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_HVM_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

+                           <tr py:for="r in global_variables.aarch64_EC2_regions">

+                             <td py:if="r.code in global_variables.pre_AARCH64_base_AMI">${_(r.long)}</td>

+                             <td py:if="r.code in global_variables.pre_AARCH64_base_AMI" class="hidden-xs">${global_variables.pre_AARCH64_base_AMI[r.code]}</td>

+                             <td py:if="r.code in global_variables.pre_AARCH64_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_AARCH64_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

                            </tr>

                          </tbody>

                        </table>
@@ -976,80 +832,6 @@ 

                  </div>

            </div>

          </div>

- <!--        <div class="white">

-           <div class="col-sm-3">

-           <img src="/static/images/cloud.png" />

-           </div>

-           <div class="col-sm-5">

-           <h3>${_('GP2 PV AMIs')}</h3>

-           </div>

-           <div class="col-sm-4">

-             <p class="download ec2" data-toggle="modal" data-target=".pre_GP2-base-EC2-PV-tablet">${_('Click to launch')}</p>

-                 <div class="modal fade pre_GP2-base-EC2-PV-tablet" tabindex="-1" role="dialog" aria-hidden="true">

-                   <div class="modal-dialog modal-cloud">

-                     <div class="modal-content">

-                       <div class="modal-header">

-                         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s GP2 Base Cloud PV AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

-                       </div>

-                       <table class="table table-hover">

-                         <thead>

-                           <tr>

-                             <th>${_('Region')}</th>

-                             <th class="hidden-xs">${_('AMI ID')}</th>

-                             <th class="text-center">${_('Launch')}</th>

-                           </tr>

-                         </thead>

-                         <tbody>

-                           <tr py:for="r in global_variables.EC2_regions">

-                             <td>${_(r.long)}</td>

-                             <td py:if="r.code in global_variables.pre_GP2_PV_base_AMI" class="hidden-xs">${global_variables.pre_GP2_PV_base_AMI[r.code]}</td>

-                             <td py:if="r.code in global_variables.pre_GP2_PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_GP2_PV_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

-                           </tr>

-                         </tbody>

-                       </table>

-                     </div>

-                   </div>

-                 </div>

-           </div>

-         </div>

-         <div class="white">

-           <div class="col-sm-3">

-           <img src="/static/images/cloud.png" />

-           </div>

-           <div class="col-sm-5">

-           <h3>${_('Standard PV AMIs')}</h3>

-           </div>

-           <div class="col-sm-4">

-             <p class="download ec2" data-toggle="modal" data-target=".pre_base-EC2-PV-tablet">${_('Click to launch')}</p>

-                 <div class="modal fade pre_base-EC2-PV-tablet" tabindex="-1" role="dialog" aria-hidden="true">

-                   <div class="modal-dialog modal-cloud">

-                     <div class="modal-content">

-                       <div class="modal-header">

-                         <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">${_('Close')}</span></button>

-                         <h4 class="modal-title">${Markup(_('Fedora %(rel)s %(state)s Standard Base Cloud PV AMIs')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}</h4>

-                       </div>

-                       <table class="table table-hover">

-                         <thead>

-                           <tr>

-                             <th>${_('Region')}</th>

-                             <th class="hidden-xs">${_('AMI ID')}</th>

-                             <th class="text-center">${_('Launch')}</th>

-                           </tr>

-                         </thead>

-                         <tbody>

-                           <tr py:for="r in global_variables.EC2_regions">

-                             <td>${_(r.long)}</td>

-                             <td py:if="r.code in global_variables.pre_PV_base_AMI" class="hidden-xs">${global_variables.pre_PV_base_AMI[r.code]}</td>

-                             <td py:if="r.code in global_variables.pre_PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.pre_PV_base_AMI[r.code]}"><span class="fa fa-cloud" aria-hidden="true"></span></a></td>

-                           </tr>

-                         </tbody>

-                       </table>

-                     </div>

-                   </div>

-                 </div>

-           </div>

-         </div> -->

          <!-- end EC2 images Phone -->

        </div>

      </div>

file modified
+6 -124
@@ -369,76 +369,17 @@ 

  

  

  # EC2 AMI IDs

- 

- ARM64_base_AMI={

-     'ap-northeast-1':  'ami-053da64aaf77eb27a',

-     'ap-south-1':      'ami-0b2e07c377839c44c',

-     'ap-southeast-2':  'ami-0769832d06acb4fdb',

-     'eu-central-1':    'ami-0a6aa3176dca0548e',

-     'eu-west-1':       'ami-010f0ac509b6d5c90',

-     'us-east-1':       'ami-05927168596f8f271',

-     'us-east-2':       'ami-04e5f7d4b25051814',

-     'us-west-1':       'ami-09e4ae93f90e20603',

-     'us-west-2':       'ami-0b7237050e6efd06d'

+ # values populated by searching datagrepper during website build

+ AARCH64_base_AMI={

  }

- 

- HVM_base_AMI={

-     'ap-northeast-1':  'ami-028fa48fe1aaca19e',

-     'ap-northeast-2':  'ami-0734c2673e727fe39',

-     'ap-south-1':      'ami-0fdf744fe7a87cee4',

-     'ap-southeast-1':  'ami-04a22e2324377cdbd',

-     'ap-southeast-2':  'ami-06b1cc1d1e719ec37',

-     'ca-central-1':    'ami-000a5122ac0f9e2d9',

-     'eu-central-1':    'ami-0a0608443984de7eb',

-     'eu-west-1':       'ami-02765e71fe7b1e036',

-     'eu-west-2':       'ami-0efbedc7174d3250e',

-     'sa-east-1':       'ami-0a8506c591298cd13',

-     'us-east-1':       'ami-0fcbe88944a53b4c8',

-     'us-east-2':       'ami-0a32ccde4ea923cc3',

-     'us-west-1':       'ami-0f0d716ff62dea395',

-     'us-west-2':       'ami-03e0bcb36412ff6e4'

+ X86_64_base_AMI={

  }

- 

- GP2_HVM_base_AMI={

-     'ap-northeast-1':  'ami-0d8e872ddc3206741',

-     'ap-northeast-2':  'ami-08a47fe608e852f01',

-     'ap-south-1':      'ami-0a0a5815e614466e4',

-     'ap-southeast-1':  'ami-049d4c4233514a931',

-     'ap-southeast-2':  'ami-033b4a0bd9a622f58',

-     'ca-central-1':    'ami-06449af04bac4eac0',

-     'eu-central-1':    'ami-0417b5ec8768794f9',

-     'eu-west-1':       'ami-0ce2a6144475cf269',

-     'eu-west-2':       'ami-0f6b2a3d45505c6ae',

-     'sa-east-1':       'ami-0e5c67f0e4306e372',

-     'us-east-1':       'ami-0c830793775595d4b',

-     'us-east-2':       'ami-04f8478f9bc7f1453',

-     'us-west-1':       'ami-0e76ece0a3a8ad72f',

-     'us-west-2':       'ami-0e82cc6ce8f393d4b'

+ # EC2 AMI IDs PRERELEASE!!!

+ pre_AARCH64_base_AMI={

  }

- 

- PV_base_AMI={

-     #'us-east-1':        'ami-015b9c6c',     # Virginia

-     #'us-west-2':        'ami-3c05c05c',     # Oregon

-     #'us-west-1':        'ami-189edb78',     # California

-     #'eu-west-1':        'ami-2afd6359',     # Ireland

-     #'eu-central-1':     'ami-f561889a',     # Frankfurt

-     #'ap-southeast-1':   'ami-f7e13294',     # Singapore

-     #'ap-northeast-1':   'ami-6a0ee40b',     # Tokyo

-     #'ap-southeast-2':   'ami-28a38a4b',     # Sydney

-     #'sa-east-1':        'ami-e34fc58f'      # Sao Paolo

+ pre_X86_64_base_AMI={

  }

  

- GP2_PV_base_AMI={

-     #'us-east-1':        'ami-095b9c64',     # Virginia

-     #'us-west-2':        'ami-fa06c39a',     # Oregon

-     #'us-west-1':        'ami-a99fdac9',     # California

-     #'eu-west-1':        'ami-28ff615b',     # Ireland

-     #'eu-central-1':     'ami-6e638a01',     # Frankfurt

-     #'ap-southeast-1':   'ami-28e1324b',     # Singapore

-     #'ap-northeast-1':   'ami-b30ae0d2',     # Tokyo

-     #'ap-southeast-2':   'ami-f4a58c97',     # Sydney

-     #'sa-east-1':        'ami-4346cc2f'      # Sao Paolo

- }

  

  HVM_atomic_AMI={

      #'us-east-1':        'ami-f18fff9b',     # Virginia
@@ -466,65 +407,6 @@ 

  

  AARCH64_GP2_HVM_atomic_AMI={}

  

- # EC2 AMI IDs PRERELEASE!!!

- pre_HVM_base_AMI={

-     'ap-northeast-1':  'ami-053db6774d7445008',

-     'ap-northeast-2':  'ami-0442ce2f15031feb4',

-     'ap-south-1':      'ami-06fc0551e1d52cef7',

-     'ap-southeast-1':  'ami-01aa690f13cd7c4cb',

-     'ap-southeast-2':  'ami-0d5379ab9e543f8c9',

-     'ca-central-1':    'ami-039195f65eace16e5',

-     'eu-central-1':    'ami-0ae7e51b5eacc4cfa',

-     'eu-west-1':       'ami-02e9b94502ffdd3b9',

-     'eu-west-2':       'ami-0fac4adf87a0b23be',

-     'sa-east-1':       'ami-02226636bef6e4bfe',

-     'us-east-1':       'ami-0f4f76118f4ca5b59',

-     'us-east-2':       'ami-08387bf7d423dd979',

-     'us-west-1':       'ami-067f7c28153092394',

-     'us-west-2':       'ami-07650985f321a99f3'

- }

- 

- pre_GP2_HVM_base_AMI={

-     'ap-northeast-1':  'ami-0a3e5ecd1af437cf6',

-     'ap-northeast-2':  'ami-0b045a55b71328675',

-     'ap-south-1':      'ami-0af5597b67dca44b2',

-     'ap-southeast-1':  'ami-0f7c110aa63ebf24f',

-     'ap-southeast-2':  'ami-06a13536a962bff9f',

-     'ca-central-1':    'ami-0500fc6a8144abc1e',

-     'eu-central-1':    'ami-0bfe51e7af68b9980',

-     'eu-west-1':       'ami-000b9d8c6830276dd',

-     'eu-west-2':       'ami-0be03c632b49517eb',

-     'sa-east-1':       'ami-067b6e5526e573986',

-     'us-east-1':       'ami-06c522b66d738d1b4',

-     'us-east-2':       'ami-0d4391c189dbf5314',

-     'us-west-1':       'ami-036700754636cd5d6',

-     'us-west-2':       'ami-0b5bffa2ebe93b6b1'

- }

- 

- pre_PV_base_AMI={

-     #'us-east-1':        'ami-55791a42',     # Virginia

-     #'us-west-2':        'ami-3657a556',     # Oregon

-     #'us-west-1':        'ami-8a4039ea',     # California

-     #'eu-west-1':        'ami-ef40cb9c',     # Ireland

-     #'eu-central-1':     'ami-aa9974c5',     # Frankfurt

-     #'ap-southeast-1':   'ami-d571a6b6',     # Singapore

-     #'ap-northeast-1':   'ami-ff6a8f9e',     # Tokyo

-     #'ap-southeast-2':   'ami-7de5c91e',     # Sydney

-     #'sa-east-1':        'ami-bd1099d1'      # Sao Paolo

- }

- 

- pre_GP2_PV_base_AMI={

-     #'us-east-1':        'ami-2f751638',     # Virginia

-     #'us-west-2':        'ami-c357a5a3',     # Oregon

-     #'us-west-1':        'ami-5f4a333f',     # California

-     #'eu-west-1':        'ami-f840cb8b',     # Ireland

-     #'eu-central-1':     'ami-1f987570',     # Frankfurt

-     #'ap-southeast-1':   'ami-d071a6b3',     # Singapore

-     #'ap-northeast-1':   'ami-ba6f8adb',     # Tokyo

-     #'ap-southeast-2':   'ami-39e6ca5a',     # Sydney

-     #'sa-east-1':        'ami-8b159ce7'      # Sao Paolo

- }

- 

  pre_HVM_atomic_AMI={

      'eu-west-2':       'ami-0dd9376c148025bda',

      'ap-northeast-1':  'ami-0c8c3a243f8fa9389',

This commit removes the standarm images for x86_64 so that we now only
have one x86_64 image and one aarch64 image on the website. It also
changes it so that the aarch64 image information is pulled from datagrepper
(the messages that were published by fedimg).

Pull-Request has been merged by codeblock

2 years ago