config/instances/ausyd1nxvm2099/config.yaml

@@ -1,7 +0,0 @@
-description: VicMet-vmagent
-cobbler_mgmt_classes:
-  - roles::infra::metrics::vmagent
-profiles:
-  - disk20
-  - net_com1_eth0
-  - 2core2048

config/instances/ausyd1nxvm2099/terragrunt.hcl

@@ -1,52 +0,0 @@
-locals {
-  node_name     = "prodnxsr0011"
-  config_common     = yamldecode(file("${get_terragrunt_dir()}/../config_common.yaml"))
-  config_specific   = yamldecode(file("${get_terragrunt_dir()}/config.yaml"))
-  config            = merge(local.config_common, local.config_specific)
-  instance_name     = basename(get_terragrunt_dir())
-}
-
-inputs = merge(
-  {
-    name = local.instance_name
-  },
-  local.config
-)
-
-include "root" {
-  path   = find_in_parent_folders("root.hcl")
-}
-
-include "instances" {
-  path   = find_in_parent_folders("instances.hcl")
-  expose = true
-  merge_strategy = "deep"
-}
-
-dependencies {
-  paths = ["${get_repo_root()}/config/nodes/${local.node_name}"]
-}
-
-terraform {
-  source = "${get_repo_root()}/modules/instance"
-}
-
-generate "incus" {
-  path      = "incus.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<-EOF
-    provider "incus" {
-      generate_client_certificates = true
-      accept_remote_certificate    = true
-
-      remote {
-        name    = "${basename(get_terragrunt_dir())}"
-        scheme  = "https"
-        address = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_addr}"
-        port    = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_port}"
-        token   = "${get_env("INCUS_TOKEN_${upper(local.node_name)}")}"
-        default = true
-      }
-    }
-  EOF
-}

config/instances/ausyd1nxvm2100/config.yaml

@@ -1,7 +0,0 @@
-description: VicMet-vmagent
-cobbler_mgmt_classes:
-  - roles::infra::metrics::vmagent
-profiles:
-  - disk20
-  - net_com1_eth0
-  - 2core2048

config/instances/ausyd1nxvm2100/terragrunt.hcl

@@ -1,52 +0,0 @@
-locals {
-  node_name     = "prodnxsr0012"
-  config_common     = yamldecode(file("${get_terragrunt_dir()}/../config_common.yaml"))
-  config_specific   = yamldecode(file("${get_terragrunt_dir()}/config.yaml"))
-  config            = merge(local.config_common, local.config_specific)
-  instance_name     = basename(get_terragrunt_dir())
-}
-
-inputs = merge(
-  {
-    name = local.instance_name
-  },
-  local.config
-)
-
-include "root" {
-  path   = find_in_parent_folders("root.hcl")
-}
-
-include "instances" {
-  path   = find_in_parent_folders("instances.hcl")
-  expose = true
-  merge_strategy = "deep"
-}
-
-dependencies {
-  paths = ["${get_repo_root()}/config/nodes/${local.node_name}"]
-}
-
-terraform {
-  source = "${get_repo_root()}/modules/instance"
-}
-
-generate "incus" {
-  path      = "incus.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<-EOF
-    provider "incus" {
-      generate_client_certificates = true
-      accept_remote_certificate    = true
-
-      remote {
-        name    = "${basename(get_terragrunt_dir())}"
-        scheme  = "https"
-        address = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_addr}"
-        port    = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_port}"
-        token   = "${get_env("INCUS_TOKEN_${upper(local.node_name)}")}"
-        default = true
-      }
-    }
-  EOF
-}

config/instances/ausyd1nxvm2101/config.yaml

@@ -1,7 +0,0 @@
-description: VicMet-vmagent
-cobbler_mgmt_classes:
-  - roles::infra::metrics::vmagent
-profiles:
-  - disk20
-  - net_com1_eth0
-  - 2core2048

config/instances/ausyd1nxvm2101/terragrunt.hcl

@@ -1,52 +0,0 @@
-locals {
-  node_name     = "prodnxsr0013"
-  config_common     = yamldecode(file("${get_terragrunt_dir()}/../config_common.yaml"))
-  config_specific   = yamldecode(file("${get_terragrunt_dir()}/config.yaml"))
-  config            = merge(local.config_common, local.config_specific)
-  instance_name     = basename(get_terragrunt_dir())
-}
-
-inputs = merge(
-  {
-    name = local.instance_name
-  },
-  local.config
-)
-
-include "root" {
-  path   = find_in_parent_folders("root.hcl")
-}
-
-include "instances" {
-  path   = find_in_parent_folders("instances.hcl")
-  expose = true
-  merge_strategy = "deep"
-}
-
-dependencies {
-  paths = ["${get_repo_root()}/config/nodes/${local.node_name}"]
-}
-
-terraform {
-  source = "${get_repo_root()}/modules/instance"
-}
-
-generate "incus" {
-  path      = "incus.tf"
-  if_exists = "overwrite_terragrunt"
-  contents  = <<-EOF
-    provider "incus" {
-      generate_client_certificates = true
-      accept_remote_certificate    = true
-
-      remote {
-        name    = "${basename(get_terragrunt_dir())}"
-        scheme  = "https"
-        address = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_addr}"
-        port    = "${yamldecode(file("${get_repo_root()}/config/nodes/${local.node_name}/config.yaml")).node_port}"
-        token   = "${get_env("INCUS_TOKEN_${upper(local.node_name)}")}"
-        default = true
-      }
-    }
-  EOF
-}

templates/base/boilerplate.yml

@@ -62,10 +62,9 @@ variables:
       - roles::infra::k8s::worker
       - roles::infra::metrics::grafana
       - roles::infra::metrics::prometheus
-      - roles::infra::metrics::vmagent
+      - roles::infra::metrics::vmstorage
       - roles::infra::metrics::vminsert
       - roles::infra::metrics::vmselect
-      - roles::infra::metrics::vmstorage
       - roles::infra::nomad::agent
       - roles::infra::nomad::agentv2
       - roles::infra::nomad::server