~damien/infrastructure

ff4396f26999b6ecebb8838cdd7c1d29a203fa69 — Damien Radtke 10 months ago e0cf5a2
Downsize and upgrade
2 files changed, 6 insertions(+), 7 deletions(-)

M terraform/main.tf
M terraform/nomad-server/main.tf
M terraform/main.tf => terraform/main.tf +6 -6
@@ 23,7 23,7 @@ locals {
module "consul-server" {
  source = "./consul-server"

  servers        = 2
  servers        = 1
  consul_version = "1.7.2"

  datacenter       = local.region


@@ 38,9 38,9 @@ module "consul-server" {
module "nomad-server" {
  source = "./nomad-server"

  servers           = 2
  servers           = 1
  consul_version    = "1.7.2"
  nomad_version     = "0.11.1"
  nomad_version     = "0.11.3"
  consul_server_ips = module.consul-server.ips

  datacenter       = local.region


@@ 58,7 58,7 @@ module "nomad-client" {

  clients           = 1
  consul_version    = "1.7.2"
  nomad_version     = "0.9.7"
  nomad_version     = "0.11.3"
  consul_server_ips = module.consul-server.ips

  datacenter       = local.region


@@ 75,7 75,7 @@ module "nomad-client-load-balancer" {

  clients           = 1
  consul_version    = "1.7.2"
  nomad_version     = "0.9.7"
  nomad_version     = "0.11.3"
	node_class        = "load-balancer"
  consul_server_ips = module.consul-server.ips



@@ 91,7 91,7 @@ module "nomad-client-load-balancer" {
module "vault-server" {
  source = "./vault-server"

  servers           = 2
  servers           = 1
  consul_version    = "1.7.2"
  vault_version     = "1.4.0"
  consul_server_ips = module.consul-server.ips

M terraform/nomad-server/main.tf => terraform/nomad-server/main.tf +0 -1
@@ 124,7 124,6 @@ resource "linode_instance" "servers" {
    destination = "/etc/profile.local"
    content     = <<-EOT
      export CONSUL_HTTP_ADDR=unix:///var/run/consul/consul_https.sock
			export CONSUL_HTTP_SSL=true
			export NOMAD_ADDR=https://localhost:4646
			export NOMAD_CACERT=/etc/ssl/nomad/ca.pem
			export NOMAD_CLIENT_CERT=/etc/ssl/nomad/cli.pem