From 838e417390b3a72a23cb0e1e43c9efc75bd07512 Mon Sep 17 00:00:00 2001
From: Robert Mayr <robyduck@fedoraproject.org>
Date: Jul 07 2017 20:39:06 +0000
Subject: remove paravirt AMI sections from cloud.fp.o


---

diff --git a/alt.fedoraproject.org/build/fedimg_vars.py b/alt.fedoraproject.org/build/fedimg_vars.py
index 6d7a381..1fe13ab 100755
--- a/alt.fedoraproject.org/build/fedimg_vars.py
+++ b/alt.fedoraproject.org/build/fedimg_vars.py
@@ -78,14 +78,10 @@ def collect(release):
         ("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',
-            'PV_base_AMI':      lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'standard',
-            'GP2_PV_base_AMI':  lambda e: e.get('virt_type') == 'paravirtual' 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',
-        #    'pre_PV_base_AMI':      lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'standard',
-        #    'pre_GP2_PV_base_AMI':  lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'gp2',
         #}),
     ]
 
@@ -133,8 +129,6 @@ def sanity_check(globalvar, collected_fedimg_vars):
     names = [
         'pre_HVM_base_AMI',
         'pre_GP2_HVM_base_AMI',
-        'pre_PV_base_AMI',
-        'pre_GP2_PV_base_AMI',
         'pre_HVM_atomic_AMI',
         'pre_GP2_HVM_atomic_AMI',
     ]
diff --git a/alt.fedoraproject.org/data/content/cloud/index.html b/alt.fedoraproject.org/data/content/cloud/index.html
index cce5fc7..a75f329 100644
--- a/alt.fedoraproject.org/data/content/cloud/index.html
+++ b/alt.fedoraproject.org/data/content/cloud/index.html
@@ -280,7 +280,6 @@
         <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>
-        <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">
@@ -358,80 +357,6 @@
             </div>
             </div>
           </div>
-          <div class="white">
-            <div class="col-sm-1">
-            <img src="/static/images/cloud.png" />
-            </div>
-            <div class="col-sm-7">
-            <h3>${_('GP2 PV AMIs')}</h3>
-            </div>
-            <div class="col-sm-4">
-            <p class="download ec2" data-toggle="modal" data-target=".GP2-base-EC2-PV-desktop">${_('Click to launch')}</p>
-            <div class="modal fade 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 GP2 Base Cloud PV 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>${_(r.long)}</td>
-                        <td py:if="r.code in global_variables.GP2_PV_base_AMI" class="hidden-xs">${global_variables.GP2_PV_base_AMI[r.code]}</td>
-                        <td py:if="r.code in global_variables.GP2_PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.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-1">
-            <img src="/static/images/cloud.png" />
-            </div>
-            <div class="col-sm-7">
-            <h3>${_('Standard PV AMIs')}</h3>
-            </div>
-            <div class="col-sm-4">
-            <p class="download ec2" data-toggle="modal" data-target=".base-EC2-PV-desktop">${_('Click to launch')}</p>
-            <div class="modal fade 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 Standard Base Cloud PV 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>${_(r.long)}</td>
-                        <td py:if="r.code in global_variables.PV_base_AMI" class="hidden-xs">${global_variables.PV_base_AMI[r.code]}</td>
-                        <td py:if="r.code in global_variables.PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.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>
     </div>
   </div>
@@ -522,76 +447,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>${_('GP2 PV AMIs')}</h3>
-            <p class="download ec2" data-toggle="modal" data-target=".GP2-base-EC2-PV-mobile">${_('Click to launch')}</p>
-            <div class="modal fade 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 GP2 Base Cloud PV 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>${_(r.long)}</td>
-                        <td py:if="r.code in global_variables.GP2_PV_base_AMI" class="hidden-xs">${global_variables.GP2_PV_base_AMI[r.code]}</td>
-                        <td py:if="r.code in global_variables.GP2_PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.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-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=".base-EC2-PV-mobile">${_('Click to launch')}</p>
-            <div class="modal fade 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 Standard Base Cloud PV 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>${_(r.long)}</td>
-                        <td py:if="r.code in global_variables.PV_base_AMI" class="hidden-xs">${global_variables.PV_base_AMI[r.code]}</td>
-                        <td py:if="r.code in global_variables.PV_base_AMI" class="text-center"><a href="${global_variables.path_stats['path']}/${global_variables.path_stats[r.short]}${global_variables.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>
     </div>
   </div>