1
0
mirror of synced 2024-11-29 08:06:04 +03:00

Remove Ubuntu 16.04

- Remove Ubuntu 16.04 from templates, whose standard support will end on
  April 30, 2021.
This commit is contained in:
hwdsl2 2021-04-26 00:01:14 -05:00
parent 5d5bcf6857
commit 92d3835311
2 changed files with 1 additions and 14 deletions

View File

@ -2,10 +2,6 @@
"AWSTemplateFormatVersion": "2010-09-09", "AWSTemplateFormatVersion": "2010-09-09",
"Mappings": { "Mappings": {
"OS": { "OS": {
"Ubuntu1604": {
"HelperInstallationCommands": "export DEBIAN_FRONTEND=noninteractive\napt-get -yq update\napt-get -yq install python3-pip\npython3 -m pip install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz\n",
"InstallationLinks": "https://git.io/vpnsetup"
},
"Ubuntu1804": { "Ubuntu1804": {
"HelperInstallationCommands": "export DEBIAN_FRONTEND=noninteractive\napt-get -yq update\napt-get -yq install python3-pip\npython3 -m pip install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz\n", "HelperInstallationCommands": "export DEBIAN_FRONTEND=noninteractive\napt-get -yq update\napt-get -yq install python3-pip\npython3 -m pip install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-py3-latest.tar.gz\n",
"InstallationLinks": "https://git.io/vpnsetup" "InstallationLinks": "https://git.io/vpnsetup"
@ -667,7 +663,6 @@
" distribution = event['ResourceProperties']['Distribution']", " distribution = event['ResourceProperties']['Distribution']",
" ec2 = boto3.client('ec2',regionName)", " ec2 = boto3.client('ec2',regionName)",
" AMIName = {", " AMIName = {",
" 'Ubuntu1604': 'ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-*',",
" 'Ubuntu1804': 'ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*',", " 'Ubuntu1804': 'ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*',",
" 'Ubuntu2004': 'ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*',", " 'Ubuntu2004': 'ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*',",
" 'Debian9': 'debian-stretch-hvm-x86_64-gp2-*',", " 'Debian9': 'debian-stretch-hvm-x86_64-gp2-*',",
@ -824,7 +819,6 @@
"AllowedValues": [ "AllowedValues": [
"Ubuntu2004", "Ubuntu2004",
"Ubuntu1804", "Ubuntu1804",
"Ubuntu1604",
"Debian9", "Debian9",
"CentOS7", "CentOS7",
"CentOS8", "CentOS8",

View File

@ -26,12 +26,11 @@
"allowedValues": [ "allowedValues": [
"ubuntu20.04", "ubuntu20.04",
"ubuntu18.04", "ubuntu18.04",
"ubuntu16.04",
"debian9" "debian9"
], ],
"defaultValue": "ubuntu20.04", "defaultValue": "ubuntu20.04",
"metadata": { "metadata": {
"description": "OS to use. Ubuntu 20.04/18.04/16.04 or Debian 9." "description": "OS to use. Ubuntu 20.04/18.04 or Debian 9."
} }
}, },
"VMSize": { "VMSize": {
@ -74,12 +73,6 @@
"sku": "18.04-LTS", "sku": "18.04-LTS",
"version": "latest" "version": "latest"
}, },
"ubuntu16.04": {
"publisher": "Canonical",
"offer": "UbuntuServer",
"sku": "16.04-LTS",
"version": "latest"
},
"debian9": { "debian9": {
"publisher": "credativ", "publisher": "credativ",
"offer": "Debian", "offer": "Debian",