From 198b973063cca053a5d042cb369df8b8e4ac6b31 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Nov 14 2017 19:24:07 +0000 Subject: getfedora: update for f27 atomic host - update curr_atomic_id, next_atomic_id - use curr_atomic_id instead of curr_cloud_AMI_id when looking up AMIs - mention vagrant cloud rather than atlas --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index 53da2c4..1b0cd0f 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -21,13 +21,13 @@ release={ 'curr_arm_id': '27', 'curr_alt_id': '27', 'curr_cloud_id': '27', - 'curr_atomic_id': '26', + 'curr_atomic_id': '27', 'curr_server_id': '26', 'curr_cloud_AMI_id': '27', 'next_arm_id': '28', 'next_alt_id': '28', 'next_cloud_id': '28', - 'next_atomic_id': '27', + 'next_atomic_id': '28', 'next_server_id': '27', 'next_cloud_AMI_id': '28', 'composedate': '20160616', diff --git a/getfedora.org/build/fedimg_vars.py b/getfedora.org/build/fedimg_vars.py index 74ddb0a..3a3ea19 100755 --- a/getfedora.org/build/fedimg_vars.py +++ b/getfedora.org/build/fedimg_vars.py @@ -50,7 +50,7 @@ def collect(release): # '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-Atomic-{curr_cloud_AMI_id}-{atomic_composedate}.x86_64", { + ("Fedora-Atomic-{curr_atomic_id}-{atomic_composedate}.x86_64", { 'HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard', 'GP2_HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2', }), diff --git a/getfedora.org/data/content/atomic/download/index.html b/getfedora.org/data/content/atomic/download/index.html index e5f004c..14da94c 100644 --- a/getfedora.org/data/content/atomic/download/index.html +++ b/getfedora.org/data/content/atomic/download/index.html @@ -209,7 +209,7 @@

${_('Atomic Host Images for Vagrant')}

-

${Markup(_('Vagrant Boxes for Fedora Atomic Host are available for the VirtualBox and Libvirt providers. You can bring up Fedora Atomic Host in a vagrant box by downloading the images from Fedora or using the vagrant tools to pull the images from <a href="%s">HashiCorp\'s Atlas</a>.') % ('https://atlas.hashicorp.com/fedora'))}

+

${Markup(_('Vagrant Boxes for Fedora Atomic Host are available for the VirtualBox and Libvirt providers. You can bring up Fedora Atomic Host in a vagrant box by downloading the images from Fedora or using the vagrant tools to pull the images from <a href="%s">HashiCorp\'s Vagrant Cloud</a>.') % ('https://app.vagrantup.com/fedora'))}

${_('View Vagrant Downloads')}