From cf027d9dc02ce890668e7ac80a0015881f159899 Mon Sep 17 00:00:00 2001 From: Craig Willis Date: Tue, 11 Dec 2018 18:52:22 +0000 Subject: [PATCH 1/2] Removed subdomain variable and use --- assets/traefik/traefik.tpl | 10 ++-------- dns.tf | 2 +- stack.tf | 10 +++------- stacks/core/swarm-compose.tpl | 12 ++++++------ variables.tf | 5 ----- 5 files changed, 12 insertions(+), 27 deletions(-) diff --git a/assets/traefik/traefik.tpl b/assets/traefik/traefik.tpl index 0b7ba79..1d3b1ad 100644 --- a/assets/traefik/traefik.tpl +++ b/assets/traefik/traefik.tpl @@ -34,20 +34,14 @@ provider = "godaddy" delayBeforeCheck = 0 [[acme.domains]] -main = "*.${subdomain}.${domain}" - -[[acme.domains]] -main = "dashboard-${subdomain}.${domain}" - -[[acme.domains]] -main = "data.${domain}" +main = "*.${domain}" [web] address = ":8080" [docker] endpoint = "unix:///var/run/docker.sock" -domain = "${subdomain}.${domain}" +domain = "${domain}" watch = true exposedbydefault = true swarmmode = true diff --git a/dns.tf b/dns.tf index 992a70f..e6d29df 100644 --- a/dns.tf +++ b/dns.tf @@ -2,7 +2,7 @@ resource "null_resource" "update_dns" { depends_on = ["openstack_compute_floatingip_associate_v2.fip_master"] provisioner "local-exec" { - command = "docker run -v `pwd`/scripts:/scripts jfloff/alpine-python:2.7-slim -p requests -- python scripts/godaddy-update-dns.py -k ${var.godaddy_api_key} -s ${var.godaddy_api_secret} -d ${var.domain} -n ${var.subdomain} -a ${openstack_networking_floatingip_v2.swarm_master_ip.address}" + command = "docker run -v `pwd`/scripts:/scripts jfloff/alpine-python:2.7-slim -p requests -- python scripts/godaddy-update-dns.py -k ${var.godaddy_api_key} -s ${var.godaddy_api_secret} -d ${var.domain} -n ${var.cluster_name} -a ${openstack_networking_floatingip_v2.swarm_master_ip.address}" } } diff --git a/stack.tf b/stack.tf index 6d06174..012df08 100644 --- a/stack.tf +++ b/stack.tf @@ -3,7 +3,6 @@ data "template_file" "traefik" { vars { domain = "${var.domain}" - subdomain = "${var.subdomain}" } } @@ -12,7 +11,6 @@ data "template_file" "stack" { vars { domain = "${var.domain}" - subdomain = "${var.subdomain}" mtu = "${var.docker_mtu}" version = "${var.version}" godaddy_api_key = "${var.godaddy_api_key}" @@ -92,8 +90,6 @@ resource "null_resource" "deploy_stack" { provisioner "remote-exec" { inline = [ "chmod 600 /home/core/wholetale/traefik/acme/acme.json", - "sed -i 's/dashboard\\.prod/dashboard/g' /home/core/wholetale/swarm-compose.yaml", - "sed -i 's/dashboard-prod/dashboard/g' /home/core/wholetale/traefik/traefik.toml", "docker stack deploy --compose-file /home/core/wholetale/swarm-compose.yaml wt", "docker stack deploy --compose-file /home/core/wholetale/monitoring.yaml omd" ] @@ -102,14 +98,14 @@ resource "null_resource" "deploy_stack" { provisioner "remote-exec" { inline = [ "chmod +x /home/core/wholetale/init-mongo.sh", - "/home/core/wholetale/init-mongo.sh ${var.subdomain}.${var.domain} ${var.globus_client_id} ${var.globus_client_secret}" + "/home/core/wholetale/init-mongo.sh ${var.domain} ${var.globus_client_id} ${var.globus_client_secret}" ] } provisioner "remote-exec" { inline = [ "chmod +x /home/core/wholetale/start-worker.sh", - "/home/core/wholetale/start-worker.sh ${var.subdomain}.${var.domain} manager ${var.registry_user} ${var.registry_pass} ${var.version}" + "/home/core/wholetale/start-worker.sh ${var.domain} manager ${var.registry_user} ${var.registry_pass} ${var.version}" ] } } @@ -138,7 +134,7 @@ resource "null_resource" "start_worker" { provisioner "remote-exec" { inline = [ "chmod +x /home/core/wholetale/start-worker.sh", - "/home/core/wholetale/start-worker.sh ${var.subdomain}.${var.domain} celery ${var.registry_user} ${var.registry_pass} ${var.version}" + "/home/core/wholetale/start-worker.sh ${var.domain} celery ${var.registry_user} ${var.registry_pass} ${var.version}" ] } } diff --git a/stacks/core/swarm-compose.tpl b/stacks/core/swarm-compose.tpl index a3c099f..8327fa9 100644 --- a/stacks/core/swarm-compose.tpl +++ b/stacks/core/swarm-compose.tpl @@ -88,7 +88,7 @@ services: - traefik-net - mongo environment: - - DASHBOARD_URL=https://dashboard.${subdomain}.${domain} + - DASHBOARD_URL=https://dashboard.${domain} - GOSU_USER=girder:girder - "GOSU_CHOWN=/tmp/wt-home-dirs /tmp/wt-tale-dirs /tmp/ps" volumes: @@ -98,7 +98,7 @@ services: deploy: replicas: 1 labels: - - "traefik.frontend.rule=Host:girder.${subdomain}.${domain},data.${domain}" + - "traefik.frontend.rule=Host:girder.${domain},data.${domain}" - "traefik.port=8080" - "traefik.enable=true" - "traefik.docker.network=wt_traefik-net" @@ -120,14 +120,14 @@ services: networks: - traefik-net environment: - - GIRDER_API_URL=https://girder.${subdomain}.${domain} - - DASHBOARD_URL=https://dashboard.${subdomain}.${domain} + - GIRDER_API_URL=https://girder.${domain} + - DASHBOARD_URL=https://dashboard.${domain} - DATAONE_URL=${dataone_url} deploy: replicas: 1 labels: - "traefik.port=80" - - "traefik.frontend.rule=Host:dashboard.${subdomain}.${domain}" + - "traefik.frontend.rule=Host:dashboard.${domain}" - "traefik.enable=true" - "traefik.docker.network=wt_traefik-net" - "traefik.frontend.passHostHeader=true" @@ -148,7 +148,7 @@ services: labels: - "traefik.enable=true" - "traefik.port=5000" - - "traefik.frontend.rule=Host:registry.${subdomain}.${domain}" + - "traefik.frontend.rule=Host:registry.${domain}" - "traefik.docker.network=wt_traefik-net" - "traefik.frontend.passHostHeader=true" placement: diff --git a/variables.tf b/variables.tf index 1494bf4..f5e0063 100644 --- a/variables.tf +++ b/variables.tf @@ -62,11 +62,6 @@ variable "domain" { description = "Site domain name" } -variable "subdomain" { - default = "dev" - description = "Site subdomain name" -} - variable "globus_client_id" { default = "" description = "Globus client ID" From 9a70bdb27e557e286a3fe9975f0fe67c1e78a9f0 Mon Sep 17 00:00:00 2001 From: Craig Willis Date: Wed, 12 Dec 2018 15:48:52 +0000 Subject: [PATCH 2/2] Changed handling of journald.conf, which was causing errors during deploy --- scripts/pre-setup-all.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/pre-setup-all.sh b/scripts/pre-setup-all.sh index d4190f3..2a497cc 100755 --- a/scripts/pre-setup-all.sh +++ b/scripts/pre-setup-all.sh @@ -14,10 +14,6 @@ docker network create \ # Set the maximum journal size -sudo cat << EOF > /etc/systemd/journald.conf -[Journal] -SystemMaxUse=500M -EOF +sudo sh -c "printf '[Journal]\nSystemMaxUse=500\n' > /etc/systemd/journald.conf" -sudo systemctl reload systemd-journald sudo systemctl restart systemd-journald