-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
1c3ee70
commit c1f7b3c
Showing
1 changed file
with
38 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,43 @@ | ||
| # 16/7/24: The following resources were removed from the state file due to the issue discussed | ||
| # here https://github.com/usegalaxy-eu/issues/issues/579. However, the resources are still running | ||
| # in the cloud to avoid downtime. A total redeployment will happen as part of this issue | ||
| # https://github.com/usegalaxy-eu/issues/issues/573. | ||
| # resource "openstack_compute_instance_v2" "dokku" { | ||
| # name = "apps.galaxyproject.eu" | ||
| # image_name = "Ubuntu 22.04" | ||
| # flavor_name = "m1.xlarge" | ||
| # key_pair = "cloud2" | ||
| # security_groups = ["egress", "public-ssh", "public-ping", "public-web2"] | ||
| resource "openstack_compute_instance_v2" "dokku" { | ||
| name = "apps.galaxyproject.eu" | ||
| image_name = "Ubuntu 22.04" | ||
| flavor_name = "m1.xlarge" | ||
| key_pair = "cloud2" | ||
| security_groups = ["egress", "public-ssh", "public-ping", "public-web2"] | ||
|
|
||
| # network { | ||
| # name = "public" | ||
| # } | ||
| # } | ||
|
|
||
| # # 17.4.2024: This resource creation is commented out because the volume | ||
| # # from the old cloud is being attached to the instance in the new cloud. | ||
| # # resource "openstack_blockstorage_volume_v3" "dokku-data" { | ||
| # # name = "stats" | ||
| # # description = "Data volume for dokku" | ||
| # # size = 50 | ||
| # # } | ||
| network { | ||
| name = "public" | ||
| } | ||
| } | ||
|
|
||
| # resource "openstack_compute_volume_attach_v2" "dokku-va" { | ||
| # instance_id = openstack_compute_instance_v2.dokku.id | ||
| # volume_id = "6cbce9f7-1ffd-4848-9ec8-0a2ccfd52225" | ||
| # device = "/dev/vdb" | ||
| # 17.4.2024: This resource creation is commented out because the volume | ||
| # from the old cloud is being attached to the instance in the new cloud. | ||
| # resource "openstack_blockstorage_volume_v3" "dokku-data" { | ||
| # name = "stats" | ||
| # description = "Data volume for dokku" | ||
| # size = 50 | ||
| # } | ||
|
|
||
| # resource "aws_route53_record" "dokku-dns" { | ||
| # allow_overwrite = true | ||
| # zone_id = var.zone_galaxyproject_eu | ||
| # name = "apps.galaxyproject.eu" | ||
| # type = "A" | ||
| # ttl = "3600" | ||
| # records = ["${openstack_compute_instance_v2.dokku.access_ip_v4}"] | ||
| # } | ||
| resource "openstack_compute_volume_attach_v2" "dokku-va" { | ||
| instance_id = openstack_compute_instance_v2.dokku.id | ||
| volume_id = "6cbce9f7-1ffd-4848-9ec8-0a2ccfd52225" | ||
| device = "/dev/vdb" | ||
| } | ||
|
|
||
| # resource "aws_route53_record" "dokku-dns-wildcard" { | ||
| # allow_overwrite = true | ||
| # zone_id = var.zone_galaxyproject_eu | ||
| # name = "*.apps.galaxyproject.eu" | ||
| # type = "CNAME" | ||
| # ttl = "3600" | ||
| # records = ["apps.galaxyproject.eu"] | ||
| # } | ||
| resource "aws_route53_record" "dokku-dns" { | ||
| allow_overwrite = true | ||
| zone_id = var.zone_galaxyproject_eu | ||
| name = "apps.galaxyproject.eu" | ||
| type = "A" | ||
| ttl = "3600" | ||
| records = ["${openstack_compute_instance_v2.dokku.access_ip_v4}"] | ||
| } | ||
|
|
||
| resource "aws_route53_record" "dokku-dns-wildcard" { | ||
| allow_overwrite = true | ||
| zone_id = var.zone_galaxyproject_eu | ||
| name = "*.apps.galaxyproject.eu" | ||
| type = "CNAME" | ||
| ttl = "3600" | ||
| records = ["apps.galaxyproject.eu"] | ||
| } |