TF: Rename ionosphere-named variables

This commit is contained in:
Blockstream Satellite 2023-05-22 15:07:31 -03:00
parent d941a4f9a3
commit 7db6fcd314
6 changed files with 27 additions and 27 deletions

View file

@ -166,8 +166,8 @@ plan_staging:
&& terraform workspace select staging
&& terraform init -input=false
&& terraform plan
-var "ionosphere_docker=$API_IMAGE:$CI_COMMIT_SHA"
-var "ionosphere_sse_docker=$SSE_IMAGE:$CI_COMMIT_SHA"
-var "sat_api_docker=$API_IMAGE:$CI_COMMIT_SHA"
-var "sat_api_sse_docker=$SSE_IMAGE:$CI_COMMIT_SHA"
-var "region=$REGION"
-var "zone=$ZONE"
-var "instance_type=$INSTANCE_TYPE"
@ -199,8 +199,8 @@ deploy_staging:
&& terraform workspace select staging
&& terraform init -input=false
&& terraform apply
-var "ionosphere_docker=$API_IMAGE:$CI_COMMIT_SHA"
-var "ionosphere_sse_docker=$SSE_IMAGE:$CI_COMMIT_SHA"
-var "sat_api_docker=$API_IMAGE:$CI_COMMIT_SHA"
-var "sat_api_sse_docker=$SSE_IMAGE:$CI_COMMIT_SHA"
-var "region=$REGION"
-var "zone=$ZONE"
-var "instance_type=$INSTANCE_TYPE"
@ -231,8 +231,8 @@ plan_production:
&& terraform workspace select prod
&& terraform init -input=false
&& terraform plan
-var "ionosphere_docker=$API_IMAGE:$CI_COMMIT_SHA"
-var "ionosphere_sse_docker=$SSE_IMAGE:$CI_COMMIT_SHA"
-var "sat_api_docker=$API_IMAGE:$CI_COMMIT_SHA"
-var "sat_api_sse_docker=$SSE_IMAGE:$CI_COMMIT_SHA"
-var "region=$REGION"
-var "zone=$ZONE"
-var "instance_type=$INSTANCE_TYPE"
@ -264,8 +264,8 @@ deploy_production:
&& terraform workspace select prod
&& terraform init -input=false
&& terraform apply
-var "ionosphere_docker=$API_IMAGE:$CI_COMMIT_SHA"
-var "ionosphere_sse_docker=$SSE_IMAGE:$CI_COMMIT_SHA"
-var "sat_api_docker=$API_IMAGE:$CI_COMMIT_SHA"
-var "sat_api_sse_docker=$SSE_IMAGE:$CI_COMMIT_SHA"
-var "region=$REGION"
-var "zone=$ZONE"
-var "instance_type=$INSTANCE_TYPE"
@ -296,8 +296,8 @@ plan_production_testnet:
&& terraform workspace select testnet-prod
&& terraform init -input=false
&& terraform plan
-var "ionosphere_docker=$API_IMAGE:$CI_COMMIT_SHA"
-var "ionosphere_sse_docker=$SSE_IMAGE:$CI_COMMIT_SHA"
-var "sat_api_docker=$API_IMAGE:$CI_COMMIT_SHA"
-var "sat_api_sse_docker=$SSE_IMAGE:$CI_COMMIT_SHA"
-var "region=$REGION"
-var "zone=$ZONE"
-var "instance_type=$INSTANCE_TYPE"
@ -326,8 +326,8 @@ deploy_production_testnet:
&& terraform workspace select testnet-prod
&& terraform init -input=false
&& terraform apply
-var "ionosphere_docker=$API_IMAGE:$CI_COMMIT_SHA"
-var "ionosphere_sse_docker=$SSE_IMAGE:$CI_COMMIT_SHA"
-var "sat_api_docker=$API_IMAGE:$CI_COMMIT_SHA"
-var "sat_api_sse_docker=$SSE_IMAGE:$CI_COMMIT_SHA"
-var "region=$REGION"
-var "zone=$ZONE"
-var "instance_type=$INSTANCE_TYPE"

View file

@ -31,8 +31,8 @@ module "blc-mainnet" {
network = "default"
lightning_docker = var.lightning_docker
charge_docker = var.charge_docker
ionosphere_docker = var.ionosphere_docker
ionosphere_sse_docker = var.ionosphere_sse_docker
sat_api_docker = var.sat_api_docker
sat_api_sse_docker = var.sat_api_sse_docker
node_exporter_docker = var.node_exporter_docker
autossh_docker = var.autossh_docker
certbot_docker = var.certbot_docker
@ -65,8 +65,8 @@ module "blc-testnet" {
network = "default"
lightning_docker = var.lightning_docker
charge_docker = var.charge_docker
ionosphere_docker = var.ionosphere_docker
ionosphere_sse_docker = var.ionosphere_sse_docker
sat_api_docker = var.sat_api_docker
sat_api_sse_docker = var.sat_api_sse_docker
node_exporter_docker = var.node_exporter_docker
autossh_docker = var.autossh_docker
certbot_docker = var.certbot_docker

View file

@ -225,7 +225,7 @@ write_files:
RestartSec=3
Environment=HOME=/home/bs
ExecStartPre=/usr/bin/docker-credential-gcr configure-docker
ExecStartPre=/usr/bin/docker pull ${ionosphere_docker}
ExecStartPre=/usr/bin/docker pull ${sat_api_docker}
ExecStartPre=/sbin/iptables -A INPUT -p tcp -s 10.138.0.0/16 --dport 9292 -j ACCEPT
ExecStart=/usr/bin/docker run \
--network=host \
@ -240,7 +240,7 @@ write_files:
-e "CHARGE_API_TOKEN=${charge_token}" \
-e "MIN_PER_BYTE_BID=1" \
-e "REDIS_URI=redis://localhost:6379" \
"${ionosphere_docker}"
"${sat_api_docker}"
ExecStop=/usr/bin/docker stop api-server
ExecStopPost=/usr/bin/docker rm api-server
ExecStopPost=/sbin/iptables -D INPUT -p tcp -s 10.138.0.0/16 --dport 9292 -j ACCEPT
@ -259,7 +259,7 @@ write_files:
RestartSec=3
Environment=HOME=/home/bs
ExecStartPre=/usr/bin/docker-credential-gcr configure-docker
ExecStartPre=/usr/bin/docker pull ${ionosphere_sse_docker}
ExecStartPre=/usr/bin/docker pull ${sat_api_sse_docker}
ExecStartPre=/sbin/iptables -A INPUT -p tcp -s 10.138.0.0/16 --dport 4500 -j ACCEPT
ExecStart=/usr/bin/docker run \
--network=host \
@ -267,7 +267,7 @@ write_files:
--name=sse-server \
-e "SUB_CHANNELS=transmissions,gossip,btc-src,auth" \
-e "REDIS_URI=redis://localhost:6379" \
"${ionosphere_sse_docker}"
"${sat_api_sse_docker}"
ExecStop=/usr/bin/docker stop sse-server
ExecStopPost=/usr/bin/docker rm sse-server
ExecStopPost=/sbin/iptables -D INPUT -p tcp -s 10.138.0.0/16 --dport 4500 -j ACCEPT
@ -292,7 +292,7 @@ write_files:
-v /mnt/disks/data/ionosphere:/data \
-e ENV="production" \
-e "REDIS_URI=redis://localhost:6379" \
"${ionosphere_docker}" workers.sh
"${sat_api_docker}" workers.sh
ExecStop=/usr/bin/docker stop api-workers
ExecStopPost=/usr/bin/docker rm api-workers

View file

@ -18,8 +18,8 @@ data "template_file" "blc" {
lightning_docker = var.lightning_docker
charge_docker = var.charge_docker
redis_port = 6379
ionosphere_docker = var.ionosphere_docker
ionosphere_sse_docker = var.ionosphere_sse_docker
sat_api_docker = var.sat_api_docker
sat_api_sse_docker = var.sat_api_sse_docker
node_exporter_docker = var.node_exporter_docker
autossh_docker = var.autossh_docker
certbot_docker = var.certbot_docker

View file

@ -88,11 +88,11 @@ variable "lightning_docker" {
type = string
}
variable "ionosphere_docker" {
variable "sat_api_docker" {
type = string
}
variable "ionosphere_sse_docker" {
variable "sat_api_sse_docker" {
type = string
}

View file

@ -188,12 +188,12 @@ variable "station2" {
default = ""
}
variable "ionosphere_docker" {
variable "sat_api_docker" {
type = string
default = ""
}
variable "ionosphere_sse_docker" {
variable "sat_api_sse_docker" {
type = string
default = ""
}