Skip to content

Commit 5809f7b

Browse files
committed
initial commit
1 parent 40ff91e commit 5809f7b

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

dle-logical-init.sh.tpl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,17 @@ sudo systemctl enable envoy
8787
sudo systemctl start envoy
8888

8989
#create zfs pools
90-
disks=(${dle_disks})
91-
for i in $${!disks[@]}; do
92-
sudo zpool create -f \
90+
disks=$(lsblk -ndp -e7 --output NAME)
91+
i=1
92+
for disk in $(lsblk -ndp -e7 --output NAME); do
93+
sudo zpool create -f \
9394
-O compression=on \
9495
-O atime=off \
9596
-O recordsize=128k \
9697
-O logbias=throughput \
9798
-m /var/lib/dblab/dblab_pool_0$i\
9899
dblab_pool_0$i \
99-
$${disks[$i]}
100+
$disk && ((i=i+1))
100101
done
101102

102103
# Adjust DLE config

terraform.tfvars

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
dle_version = "2.5.0"
1+
dle_version = "master"
22
joe_version = "0.10.0"
33

44
aws_ami_name = "DBLABserver*"
5-
aws_keypair = "YOUR_AWS_KEYPAIR"
65

76
aws_deploy_region = "us-east-1"
87
aws_deploy_ebs_availability_zone = "us-east-1a"
9-
aws_deploy_ec2_instance_type = "t2.large"
10-
aws_deploy_ec2_instance_tag_name = "DBLABserver-ec2instance"
8+
aws_deploy_ec2_instance_type = "c5.large"
9+
aws_deploy_ec2_instance_tag_name = "dmitry-DBLABserver-ec2instance"
1110
aws_deploy_ebs_size = "40"
1211
aws_deploy_ebs_type = "gp2"
1312
aws_deploy_allow_ssh_from_cidrs = ["0.0.0.0/0"]
14-
aws_deploy_dns_api_subdomain = "tf-test" # subdomain in aws.postgres.ai, fqdn will be ${dns_api_subdomain}.aws.postgres.ai
13+
aws_deploy_dns_api_subdomain = "dmitry-tf-test" # subdomain in aws.postgres.ai, fqdn will be ${dns_api_subdomain}.aws.postgres.ai
1514

1615
source_postgres_version = "13"
1716
source_postgres_host = "ec2-3-215-57-87.compute-1.amazonaws.com"
@@ -24,3 +23,5 @@ dle_retrieval_refresh_timetable = "0 0 * * 0"
2423
postgres_config_shared_preload_libraries = "pg_stat_statements,logerrors" # DB Migration Checker requires logerrors extension
2524

2625
platform_project_name = "aws_test_tf"
26+
27+
ssh_public_keys_files_list = ["/home/ubuntu/.ssh/id_rsa.pub"]

variables.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ variable "aws_deploy_ec2_instance_type" {
2727
default = "t2.micro"
2828
}
2929

30-
variable "aws_keypair" {
31-
description = "Key pair to access the EC2 instance"
32-
default = "default"
33-
}
34-
3530
variable "aws_deploy_allow_ssh_from_cidrs" {
3631
description = "List of CIDRs allowed to connect to SSH"
3732
default = ["0.0.0.0/0"]

0 commit comments

Comments
 (0)