From 1fac7d457531a9aa709eb97da96157f7542f3086 Mon Sep 17 00:00:00 2001 From: Xavier2p Date: Mon, 11 Sep 2023 13:08:58 +0200 Subject: [PATCH] deploy successfully passed --- ansible/preprocess.yml | 1 + hosts.tf | 12 ++++++------ networks.tf | 8 ++++---- providers.tf | 8 ++++---- stacks/monitoring/grafana.tf | 5 ----- stacks/monitoring/prometheus.tf | 5 ----- 6 files changed, 15 insertions(+), 24 deletions(-) diff --git a/ansible/preprocess.yml b/ansible/preprocess.yml index f43e325..13f8c61 100644 --- a/ansible/preprocess.yml +++ b/ansible/preprocess.yml @@ -20,3 +20,4 @@ state: present loop: - htop + - tree diff --git a/hosts.tf b/hosts.tf index 3ef20ca..906fd07 100644 --- a/hosts.tf +++ b/hosts.tf @@ -37,13 +37,13 @@ module "exegol" { user_surrealdb = var.user_surrealdb } -module "eadu" { - source = "./hosts/eadu" +# module "eadu" { +# source = "./hosts/eadu" - providers = { - docker = docker.eadu - } -} +# providers = { +# docker = docker.eadu +# } +# } module "common-exegol" { source = "./hosts/common" diff --git a/networks.tf b/networks.tf index dad711a..a5ee95b 100644 --- a/networks.tf +++ b/networks.tf @@ -4,11 +4,11 @@ resource "docker_network" "exegol" { name = "${var.exegol.host_name}-${var.exegol.env}" } -resource "docker_network" "eadu" { - provider = docker.eadu +# resource "docker_network" "eadu" { +# provider = docker.eadu - name = "${var.eadu.host_name}-${var.eadu.env}" -} +# name = "${var.eadu.host_name}-${var.eadu.env}" +# } resource "docker_network" "scariff" { provider = docker.scariff diff --git a/providers.tf b/providers.tf index 3747e81..8d9e00b 100644 --- a/providers.tf +++ b/providers.tf @@ -3,10 +3,10 @@ provider "docker" { alias = "exegol" } -provider "docker" { - host = "tcp://${var.eadu.ip}:2375" - alias = "eadu" -} +# provider "docker" { +# host = "tcp://${var.eadu.ip}:2375" +# alias = "eadu" +# } provider "docker" { host = "tcp://${var.scariff.ip}:2375" diff --git a/stacks/monitoring/grafana.tf b/stacks/monitoring/grafana.tf index 7fd0981..3c6b422 100644 --- a/stacks/monitoring/grafana.tf +++ b/stacks/monitoring/grafana.tf @@ -14,11 +14,6 @@ resource "docker_container" "grafana" { read_only = false } - ports { - internal = 3000 - external = 3000 - } - labels { label = "traefik.http.services.grafana.loadbalancer.server.port" value = "3000" diff --git a/stacks/monitoring/prometheus.tf b/stacks/monitoring/prometheus.tf index 9b60962..f873d4b 100644 --- a/stacks/monitoring/prometheus.tf +++ b/stacks/monitoring/prometheus.tf @@ -23,11 +23,6 @@ resource "docker_container" "prometheus" { read_only = false } - ports { - internal = 9090 - external = 9090 - } - labels { label = "traefik.http.services.prometheus.loadbalancer.server.port" value = "9090"