blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Switch to upstream AMIs for non-CUDA EC2 testnets

This commit is contained in:
Michael Vines 2019-02-18 17:58:04 -08:00
parent 1e714eb6b2
commit a444cac2aa
2 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
net/gce.sh
View File

@ -168,6 +168,11 @@ case $cloudProvider in
gce) gce)
if $enableGpu; then if $enableGpu; then
# Custom Ubuntu 18.04 LTS image with CUDA 9.2 and CUDA 10.0 installed # Custom Ubuntu 18.04 LTS image with CUDA 9.2 and CUDA 10.0 installed
#
# TODO: Unfortunately this image is not public. When this becomes an issue,
# use the stock Ubuntu 18.04 image and programmatically install CUDA after the
# instance boots
#
imageName="ubuntu-1804-bionic-v20181029-with-cuda-10-and-cuda-9-2" imageName="ubuntu-1804-bionic-v20181029-with-cuda-10-and-cuda-9-2"
else else
# Upstream Ubuntu 18.04 LTS image # Upstream Ubuntu 18.04 LTS image
@ -175,10 +180,15 @@ gce)
fi fi
;; ;;
ec2) ec2)
if $enableGpu; then
# #
# Custom Ubuntu 18.04 LTS image with CUDA 9.2 and CUDA 10.0 installed # Custom Ubuntu 18.04 LTS image with CUDA 9.2 and CUDA 10.0 installed
# #
case $region in # (region global variable is set by cloud_SetZone) # TODO: Unfortunately these AMIs are not public. When this becomes an issue,
# use the stock Ubuntu 18.04 image and programmatically install CUDA after the
# instance boots
#
case $region in
us-east-1) us-east-1)
imageName="ami-0a8bd6fb204473f78" imageName="ami-0a8bd6fb204473f78"
;; ;;
@ -192,6 +202,23 @@ ec2)
usage "Unsupported region: $region" usage "Unsupported region: $region"
;; ;;
esac esac
else
# Select an upstream Ubuntu 18.04 AMI from https://cloud-images.ubuntu.com/locator/ec2/
case $region in
us-east-1)
imageName="ami-0a313d6098716f372"
;;
us-west-1)
imageName="ami-06397100adf427136"
;;
us-west-2)
imageName="ami-0dc34f4b016c9ce49"
;;
*)
usage "Unsupported region: $region"
;;
esac
fi
;; ;;
*) *)
echo "Error: Unknown cloud provider: $cloudProvider" echo "Error: Unknown cloud provider: $cloudProvider"

2
net/scripts/gce-provider.sh
View File

@ -86,7 +86,7 @@ cloud_FindInstance() {
# This function will be called before |cloud_CreateInstances| # This function will be called before |cloud_CreateInstances|
cloud_Initialize() { cloud_Initialize() {
declare networkName="$1" declare networkName="$1"
# ec2-provider.sh creates firewall rules programmatically, should to the same # ec2-provider.sh creates firewall rules programmatically, should do the same
# here. # here.
echo "TODO: create $networkName firewall rules programmatically instead of assuming the 'testnet' tag exists" echo "TODO: create $networkName firewall rules programmatically instead of assuming the 'testnet' tag exists"
} }