add changes for diff nm networks

mojaloop · May 30, 2023 · e18a06e · e18a06e
1 parent c5db44c
commit e18a06e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/terraform/aws/base-k8s/outputs.tf b/terraform/aws/base-k8s/outputs.tf
@@ -87,30 +87,32 @@ output "master_hosts_var_maps" {
     gitlab_project_id = var.current_gitlab_project_id
     repo_username = var.gitlab_username
     repo_password = var.gitlab_token
+    netmaker_join_token = module.post_config.netmaker_k8s_token
   }
 }
 
 output "all_hosts_var_maps" {
-  sensitive = true
+  sensitive = false
   value = {
     ansible_ssh_user             = var.os_user_name
     ansible_ssh_retries          = "10"
     base_domain                  = local.base_domain
-    netmaker_join_token = module.post_config.netmaker_token
   }
 }
 
 output "agent_hosts_var_maps" {
-  sensitive = false
+  sensitive = true
   value = {
     master_ip = data.aws_instances.master.private_ips[0]
+    netmaker_join_token = module.post_config.netmaker_k8s_token
   }
 }
 
 output "bastion_hosts_var_maps" {
   sensitive = true
   value = {
     ansible_ssh_common_args = "-o StrictHostKeyChecking=no"
+    netmaker_join_token = module.post_config.netmaker_ops_token
   }
 }
 

diff --git a/terraform/aws/post-config-k8s/gitlab-variables.tf b/terraform/aws/post-config-k8s/gitlab-variables.tf
@@ -56,7 +56,12 @@ data "gitlab_project_variable" "cloud_region" {
   key       = "CLOUD_REGION"
 }
 
-data "gitlab_project_variable" "netmaker_token" {
+data "gitlab_project_variable" "netmaker_k8s_token" {
   project   = var.current_gitlab_project_id
-  key       = "NETMAKER_TOKEN"
+  key       = "NETMAKER_K8S_TOKEN"
+}
+
+data "gitlab_project_variable" "netmaker_ops_token" {
+  project   = var.current_gitlab_project_id
+  key       = "NETMAKER_OPS_TOKEN"
 }
diff --git a/terraform/aws/post-config-k8s/output.tf b/terraform/aws/post-config-k8s/output.tf
@@ -29,7 +29,12 @@ output "gitlab_key_vault_iam_user_secret_key" {
 output "vault_kms_seal_kms_key_id" {
   value = aws_kms_key.vault_unseal_key.id
 }
-output "netmaker_token" {
-  value = data.gitlab_project_variable.netmaker_token.value
+output "netmaker_ops_token" {
+  value = data.gitlab_project_variable.netmaker_ops_token.value
   sensitive = true
 }
+
+output "netmaker_k8s_token" {
+  value = data.gitlab_project_variable.netmaker_k8s_token.value
+  sensitive = true
+}