Fix common RHEL AMIs - use the proper arch (x86_64)

Guillaume Coré

2020-03-12 71cb379db3d16dd3ba248b6677a40bb3528ad764

Fix common RHEL AMIs - use the proper arch (x86_64)

Also update the script `find_amis.sh` to make sure this don't happen.

 ansible/roles/infra-ec2-template-generate/defaults/main.yml

@@ -101,7 +101,7 @@
    RHEL77GOLD: ami-0d31935d7e0ac3841 # RHEL-7.7_HVM-20191119-x86_64-2-Access2-GP2
    RHEL75GOLD: ami-a039b6de # RHEL-7.5_HVM-20180813-x86_64-0-Access2-GP2
    RHEL74GOLD: ami-a839b6d6 # RHEL-7.4_HVM_GA-20180122-x86_64-0-Access2-GP2
    RHEL81: ami-06bfeec4f9fddcd86 # RHEL-8.1.0_HVM-20191029-arm64-0-Hourly2-GP2
    RHEL81: ami-09af526e9efb7f54f # RHEL-8.1.0_HVM-20191029-x86_64-0-Hourly2-GP2
    RHEL75: ami-5c39b622 # RHEL-7.5_HVM-20180813-x86_64-0-Hourly2-GP2
    RHEL74: ami-a939b6d7 # RHEL-7.4_HVM_GA-20180122-x86_64-0-Hourly2-GP2
    WIN2012R2: ami-044b94f59acfe23ce # Windows_Server-2012-R2_RTM-English-64Bit-Base-2020.02.12
@@ -111,7 +111,7 @@
    RHEL77GOLD: ami-0fb14ee64b7f3ec5f # RHEL-7.7_HVM-20191119-x86_64-2-Access2-GP2
    RHEL75GOLD: ami-0c6ec6988a8df3acc # RHEL-7.5_HVM-20180813-x86_64-0-Access2-GP2
    RHEL74GOLD: ami-952879fa # RHEL-7.4_HVM-20180122-x86_64-1-Access2-GP2
    RHEL81: ami-06b5b777e3e44349e # RHEL-8.1.0_HVM-20191029-arm64-0-Hourly2-GP2
    RHEL81: ami-0dfd6c47961875b86 # RHEL-8.1.0_HVM-20191029-x86_64-0-Hourly2-GP2
    RHEL75: ami-0aa4317636e016115 # RHEL-7.5_HVM-20180813-x86_64-0-Hourly2-GP2
    RHEL74: ami-5c2f7e33 # RHEL-7.4_HVM-20180122-x86_64-1-Hourly2-GP2
    WIN2012R2: ami-045e1f06f29929467 # Windows_Server-2012-R2_RTM-English-64Bit-Base-2020.02.12
@@ -121,7 +121,7 @@
    RHEL77GOLD: ami-0bdbd51afecffe769 # RHEL-7.7_HVM-20191119-x86_64-2-Access2-GP2
    RHEL75GOLD: ami-0a0167e3e2a1d1d9b # RHEL-7.5_HVM-20180813-x86_64-0-Access2-GP2
    RHEL74GOLD: ami-69d06614 # RHEL-7.4_HVM-20180122-x86_64-1-Access2-GP2
    RHEL81: ami-07882d86edcb79e90 # RHEL-8.1.0_HVM-20191029-arm64-0-Hourly2-GP2
    RHEL81: ami-0b9d191a8259d92e2 # RHEL-8.1.0_HVM-20191029-x86_64-0-Hourly2-GP2
    RHEL75: ami-039346fed23fb53ad # RHEL-7.5_HVM-20180813-x86_64-0-Hourly2-GP2
    RHEL74: ami-66d0661b # RHEL-7.4_HVM-20180122-x86_64-1-Hourly2-GP2
    WIN2012R2: ami-0d6e54e3504cc1615 # Windows_Server-2012-R2_RTM-English-64Bit-Base-2020.02.12
@@ -131,7 +131,7 @@
    RHEL77GOLD: ami-032a151c5ec1cece8 # RHEL-7.7_HVM-20191119-x86_64-2-Access2-GP2
    RHEL75GOLD: ami-01f010afd559615b9 # RHEL-7.5_HVM-20180813-x86_64-0-Access2-GP2
    RHEL74GOLD: ami-55bca731 # RHEL-7.4_HVM-20180122-x86_64-1-Access2-GP2
    RHEL81: ami-014aa36438fd9a1f9 # RHEL-8.1.0_HVM-20191029-arm64-0-Hourly2-GP2
    RHEL81: ami-0964d8bb6ca66d551 # RHEL-8.1.0_HVM-20191029-x86_64-0-Hourly2-GP2
    RHEL75: ami-0ac5fae255ddac6f6 # RHEL-7.5_HVM-20180813-x86_64-0-Hourly2-GP2
    RHEL74: ami-b4b3a8d0 # RHEL-7.4_HVM-20180122-x86_64-1-Hourly2-GP2
    WIN2012R2: ami-0998a91bb1756752d # Windows_Server-2012-R2_RTM-English-64Bit-Base-2020.02.12
@@ -151,7 +151,7 @@
    RHEL77GOLD: ami-0d98ba73652f180ea # RHEL-7.7_HVM-20191119-x86_64-2-Access2-GP2
    RHEL75GOLD: ami-031161cd3182e012a # RHEL-7.5_HVM-20180813-x86_64-0-Access2-GP2
    RHEL74GOLD: ami-9fa201f1 # RHEL-7.4_HVM-20180122-x86_64-1-Access2-GP2
    RHEL81: ami-06858f111b26784e7 # RHEL-8.1.0_HVM-20191029-arm64-0-Hourly2-GP2
    RHEL81: ami-0dbadd8c47cf535fd # RHEL-8.1.0_HVM-20191029-x86_64-0-Hourly2-GP2
    RHEL75: ami-0d226f15e3e46903a # RHEL-7.5_HVM-20180813-x86_64-0-Hourly2-GP2
    RHEL74: ami-90a201fe # RHEL-7.4_HVM-20180122-x86_64-1-Hourly2-GP2
    WIN2012R2: ami-050e65d9f2ec90145 # Windows_Server-2012-R2_RTM-English-64Bit-Base-2020.02.12
@@ -161,7 +161,7 @@
    RHEL77GOLD: ami-0f273695c45b7e367 # RHEL-7.7_HVM-20191119-x86_64-2-Access2-GP2
    RHEL75GOLD: ami-0bf9ecb88f5719e17 # RHEL-7.5_HVM-20180813-x86_64-0-Access2-GP2
    RHEL74GOLD: ami-ccf695aa # RHEL-7.4_HVM-20180122-x86_64-1-Access2-GP2
    RHEL81: ami-08471dfdb9a833c1f # RHEL-8.1.0_HVM-20191029-arm64-0-Hourly2-GP2
    RHEL81: ami-0302fadfb901ae198 # RHEL-8.1.0_HVM-20191029-x86_64-0-Hourly2-GP2
    RHEL75: ami-0b517025bb2f0ad4a # RHEL-7.5_HVM-20180813-x86_64-0-Hourly2-GP2
    RHEL74: ami-36f09350 # RHEL-7.4_HVM-20180122-x86_64-1-Hourly2-GP2
    WIN2012R2: ami-06823103be2218b98 # Windows_Server-2012-R2_RTM-English-64Bit-Base-2020.02.12
@@ -171,7 +171,7 @@
    RHEL77GOLD: ami-0294f6385758777e1 # RHEL-7.7_HVM-20191119-x86_64-2-Access2-GP2
    RHEL75GOLD: ami-0a419d7f7b8b07b64 # RHEL-7.5_HVM-20180813-x86_64-0-Access2-GP2
    RHEL74GOLD: ami-dc014db0 # RHEL-7.4_HVM-20180122-x86_64-1-Access2-GP2
    RHEL81: ami-01baef9c6ac55fc58 # RHEL-8.1.0_HVM-20191029-arm64-0-Hourly2-GP2
    RHEL81: ami-0bac1917c46ed1418 # RHEL-8.1.0_HVM-20191029-x86_64-0-Hourly2-GP2
    RHEL75: ami-01c56172f9db84834 # RHEL-7.5_HVM-20180813-x86_64-0-Hourly2-GP2
    RHEL74: ami-1a064a76 # RHEL-7.4_HVM-20180122-x86_64-1-Hourly2-GP2
    WIN2012R2: ami-044d56b6baa621d7d # Windows_Server-2012-R2_RTM-English-64Bit-Base-2020.02.12
@@ -181,7 +181,7 @@
    RHEL77GOLD: ami-03032a0742c22a056 # RHEL-7.7_HVM-20191119-x86_64-2-Access2-GP2
    RHEL75GOLD: ami-e320ad87 # RHEL-7.5_HVM-20180813-x86_64-0-Access2-GP2
    RHEL74GOLD: ami-2a00854e # RHEL-7.4_HVM-20180122-x86_64-1-Access2-GP2
    RHEL81: ami-0a45f50cee93a0284 # RHEL-8.1.0_HVM-20191029-arm64-0-Hourly2-GP2
    RHEL81: ami-0eec8704b9b12656a # RHEL-8.1.0_HVM-20191029-x86_64-0-Hourly2-GP2
    RHEL75: ami-fc20ad98 # RHEL-7.5_HVM-20180813-x86_64-0-Hourly2-GP2
    RHEL74: ami-71018415 # RHEL-7.4_HVM-20180122-x86_64-1-Hourly2-GP2
    WIN2012R2: ami-0850dfaa3ee6f6233 # Windows_Server-2012-R2_RTM-English-64Bit-Base-2020.02.12
@@ -191,7 +191,7 @@
    RHEL77GOLD: ami-0d9e62f68aaf879c4 # RHEL-7.7_HVM-20191119-x86_64-2-Access2-GP2
    RHEL75GOLD: ami-0f44e46fa59e902b6 # RHEL-7.5_HVM-20180813-x86_64-0-Access2-GP2
    RHEL74GOLD: ami-8193eafd # RHEL-7.4_HVM-20180122-x86_64-1-Access2-GP2
    RHEL81: ami-053b211db8dde2a7e # RHEL-8.1.0_HVM-20191029-arm64-0-Hourly2-GP2
    RHEL81: ami-00d042f59a75c06e7 # RHEL-8.1.0_HVM-20191029-x86_64-0-Hourly2-GP2
    RHEL75: ami-09fc728e15fbfb535 # RHEL-7.5_HVM-20180813-x86_64-0-Hourly2-GP2
    RHEL74: ami-8d90e9f1 # RHEL-7.4_HVM-20180122-x86_64-1-Hourly2-GP2
    WIN2012R2: ami-0c322369af7718803 # Windows_Server-2012-R2_RTM-English-64Bit-Base-2020.02.12
@@ -211,7 +211,7 @@
    RHEL77GOLD: ami-04a404842b13c6d1b # RHEL-7.7_HVM-20191119-x86_64-2-Access2-GP2
    RHEL75GOLD: ami-07d3f0705bebac978 # RHEL-7.5_HVM-20180813-x86_64-0-Access2-GP2
    RHEL74GOLD: ami-b3d841dc # RHEL-7.4_HVM-20180122-x86_64-1-Access2-GP2
    RHEL81: ami-03bc95cbfec5910cf # RHEL-8.1.0_HVM-20191029-arm64-0-Hourly2-GP2
    RHEL81: ami-067e4f6fa56351e07 # RHEL-8.1.0_HVM-20191029-x86_64-0-Hourly2-GP2
    RHEL75: ami-05ba90b00a46d83fa # RHEL-7.5_HVM-20180813-x86_64-0-Hourly2-GP2
    RHEL74: ami-8a21bfe5 # RHEL-7.4_HVM-20180122-x86_64-1-Hourly2-GP2
    WIN2012R2: ami-024652d0a3df40e74 # Windows_Server-2012-R2_RTM-English-64Bit-Base-2020.02.12
@@ -231,7 +231,7 @@
    RHEL77GOLD: ami-0a2af046b8ba7bb31 # RHEL-7.7_HVM-20191119-x86_64-2-Access2-GP2
    RHEL75GOLD: ami-04268981d7c33264d # RHEL-7.5_HVM-20180813-x86_64-0-Access2-GP2
    RHEL74GOLD: ami-9db09af8 # RHEL-7.4_HVM-20180122-x86_64-1-Access2-GP2
    RHEL81: ami-09e10245c18bb3fdb # RHEL-8.1.0_HVM-20191029-arm64-0-Hourly2-GP2
    RHEL81: ami-0fdea47967124a409 # RHEL-8.1.0_HVM-20191029-x86_64-0-Hourly2-GP2
    RHEL75: ami-0376bbf9be9eac670 # RHEL-7.5_HVM-20180813-x86_64-0-Hourly2-GP2
    RHEL74: ami-cebe94ab # RHEL-7.4_HVM-20180122-x86_64-1-Hourly2-GP2
    WIN2012R2: ami-0a1a54d8690206089 # Windows_Server-2012-R2_RTM-English-64Bit-Base-2020.02.12
@@ -241,7 +241,7 @@
    RHEL77GOLD: ami-0da8de134b84f0f3f # RHEL-7.7_HVM-20191119-x86_64-2-Access2-GP2
    RHEL75GOLD: ami-02574210e91c38419 # RHEL-7.5_HVM-20180813-x86_64-0-Access2-GP2
    RHEL74GOLD: ami-6f030e0f # RHEL-7.4_HVM-20180122-x86_64-1-Access2-GP2
    RHEL81: ami-0f1585b15207b3855 # RHEL-8.1.0_HVM-20191029-arm64-0-Hourly2-GP2
    RHEL81: ami-008d471ffd812f4b8 # RHEL-8.1.0_HVM-20191029-x86_64-0-Hourly2-GP2
    RHEL75: ami-0bdc0ff10fb093057 # RHEL-7.5_HVM-20180813-x86_64-0-Hourly2-GP2
    RHEL74: ami-c8020fa8 # RHEL-7.4_HVM-20180122-x86_64-1-Hourly2-GP2
    WIN2012R2: ami-094dcbdb1aa24c8da # Windows_Server-2012-R2_RTM-English-64Bit-Base-2020.02.12
@@ -251,7 +251,7 @@
    RHEL77GOLD: ami-0b7630e8f95462671 # RHEL-7.7_HVM-20191119-x86_64-2-Access2-GP2
    RHEL75GOLD: ami-0e6bab6682ec471c0 # RHEL-7.5_HVM-20180813-x86_64-0-Access2-GP2
    RHEL74GOLD: ami-c405b8bc # RHEL-7.4_HVM-20180122-x86_64-1-Access2-GP2
    RHEL81: ami-0fd5b776e0a6e2ae2 # RHEL-8.1.0_HVM-20191029-arm64-0-Hourly2-GP2
    RHEL81: ami-0ae93796700af07d3 # RHEL-8.1.0_HVM-20191029-x86_64-0-Hourly2-GP2
    RHEL75: ami-096510cab1b6b2c6d # RHEL-7.5_HVM-20180813-x86_64-0-Hourly2-GP2
    RHEL74: ami-1607ba6e # RHEL-7.4_HVM-20180122-x86_64-1-Hourly2-GP2
    WIN2012R2: ami-0f8967b5f815400c0 # Windows_Server-2012-R2_RTM-English-64Bit-Base-2020.02.12

 tools/find_ami.sh

@@ -22,25 +22,25 @@
do
    echo "${region}:"
    echo -n "  RHEL81GOLD: "
    search_images 309956199498 'RHEL-8.1*Access*' false
    search_images 309956199498 'RHEL-8.1*x86_64*Access*' false

    echo -n "  RHEL77GOLD: "
    search_images 309956199498 'RHEL-7.7*Access*' false
    search_images 309956199498 'RHEL-7.7*x86_64*Access*' false

    echo -n "  RHEL75GOLD: "
    search_images 309956199498 'RHEL-7.5*Access*' false
    search_images 309956199498 'RHEL-7.5*x86_64*Access*' false

    echo -n "  RHEL74GOLD: "
    search_images 309956199498 'RHEL-7.4*Access*' false
    search_images 309956199498 'RHEL-7.4*x86_64*Access*' false

    echo -n "  RHEL81: "
    search_images 309956199498 'RHEL-8.1*' true
    search_images 309956199498 'RHEL-8.1*x86_64*' true

    echo -n "  RHEL75: "
    search_images 309956199498 'RHEL-7.5*' true
    search_images 309956199498 'RHEL-7.5*x86_64*' true

    echo -n "  RHEL74: "
    search_images 309956199498 'RHEL-7.4*' true
    search_images 309956199498 'RHEL-7.4*x86_64*' true

    echo -n "  WIN2012R2: "
    search_images 801119661308 'Windows_Server-2012-R2_RTM-English-64Bit-Base*' true