Skip to content

Commit 92d3835

Browse files
committed
Remove Ubuntu 16.04
- Remove Ubuntu 16.04 from templates, whose standard support will end on April 30, 2021.
1 parent 5d5bcf6 commit 92d3835

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

aws/cloudformation-template-ipsec.json

-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
"AWSTemplateFormatVersion": "2010-09-09",
33
"Mappings": {
44
"OS": {
5-
"Ubuntu1604": {
6-
"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",
7-
"InstallationLinks": "https://git.io/vpnsetup"
8-
},
95
"Ubuntu1804": {
106
"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",
117
"InstallationLinks": "https://git.io/vpnsetup"
@@ -667,7 +663,6 @@
667663
" distribution = event['ResourceProperties']['Distribution']",
668664
" ec2 = boto3.client('ec2',regionName)",
669665
" AMIName = {",
670-
" 'Ubuntu1604': 'ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-*',",
671666
" 'Ubuntu1804': 'ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*',",
672667
" 'Ubuntu2004': 'ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*',",
673668
" 'Debian9': 'debian-stretch-hvm-x86_64-gp2-*',",
@@ -824,7 +819,6 @@
824819
"AllowedValues": [
825820
"Ubuntu2004",
826821
"Ubuntu1804",
827-
"Ubuntu1604",
828822
"Debian9",
829823
"CentOS7",
830824
"CentOS8",

azure/azuredeploy.json

+1-8
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@
2626
"allowedValues": [
2727
"ubuntu20.04",
2828
"ubuntu18.04",
29-
"ubuntu16.04",
3029
"debian9"
3130
],
3231
"defaultValue": "ubuntu20.04",
3332
"metadata": {
34-
"description": "OS to use. Ubuntu 20.04/18.04/16.04 or Debian 9."
33+
"description": "OS to use. Ubuntu 20.04/18.04 or Debian 9."
3534
}
3635
},
3736
"VMSize": {
@@ -74,12 +73,6 @@
7473
"sku": "18.04-LTS",
7574
"version": "latest"
7675
},
77-
"ubuntu16.04": {
78-
"publisher": "Canonical",
79-
"offer": "UbuntuServer",
80-
"sku": "16.04-LTS",
81-
"version": "latest"
82-
},
8376
"debian9": {
8477
"publisher": "credativ",
8578
"offer": "Debian",

0 commit comments

Comments
 (0)