From abda0c061d36fa4e4d211ca4a60b285ad42461a4 Mon Sep 17 00:00:00 2001
From: Paul Czarkowski <username.taken@gmail.com>
Date: Mon, 15 Jan 2024 09:41:09 -0500
Subject: [PATCH] mobb extra_tags should not be defaulted to in roles

Signed-off-by: Paul Czarkowski <username.taken@gmail.com>
---
 environment/default/group_vars/all.yaml                | 8 +++++++-
 environment/hcp/group_vars/all.yaml                    | 6 ++++++
 environment/multi-az/group_vars/all.yaml               | 6 ++++++
 environment/private-link/group_vars/all.yaml           | 8 +++++++-
 environment/transit-gateway-egress/group_vars/all.yaml | 6 ++++++
 galaxy.yml                                             | 2 +-
 install.yml                                            | 9 ---------
 roles/_vars/defaults/main.yml                          | 6 +-----
 8 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/environment/default/group_vars/all.yaml b/environment/default/group_vars/all.yaml
index 06f913f..580c3c5 100644
--- a/environment/default/group_vars/all.yaml
+++ b/environment/default/group_vars/all.yaml
@@ -19,4 +19,10 @@ rosa_compute_machine_type: m5.xlarge
 rosa_create_admin: true
 
 # uncomment to enable custom kms workflow
-# rosa_kms_key_arn: "" #arn:aws:kms:us-east-2:<redacted>:key/<redacted>
\ No newline at end of file
+# rosa_kms_key_arn: "" #arn:aws:kms:us-east-2:<redacted>:key/<redacted>
+
+extra_tags:
+  cost-center: CC468
+  service-phase: lab
+  app-code: MOBB-001
+  owner: "{{ ansible_user_id }}@redhat.com"
diff --git a/environment/hcp/group_vars/all.yaml b/environment/hcp/group_vars/all.yaml
index a9cba13..1433dc8 100644
--- a/environment/hcp/group_vars/all.yaml
+++ b/environment/hcp/group_vars/all.yaml
@@ -20,3 +20,9 @@ rosa_multi_az: true
 
 # uncomment to enable custom kms workflow
 # rosa_kms_key_arn: "" #arn:aws:kms:us-east-2:<redacted>:key/<redacted>
+
+extra_tags:
+  cost-center: CC468
+  service-phase: lab
+  app-code: MOBB-001
+  owner: "{{ ansible_user_id }}@redhat.com"
diff --git a/environment/multi-az/group_vars/all.yaml b/environment/multi-az/group_vars/all.yaml
index ba871ff..107e870 100644
--- a/environment/multi-az/group_vars/all.yaml
+++ b/environment/multi-az/group_vars/all.yaml
@@ -16,3 +16,9 @@ rosa_create_admin: true
 
 # uncomment to enable custom kms workflow
 # rosa_kms_key_arn: "" #arn:aws:kms:us-east-2:<redacted>:key/<redacted>
+
+extra_tags:
+  cost-center: CC468
+  service-phase: lab
+  app-code: MOBB-001
+  owner: "{{ ansible_user_id }}@redhat.com"
diff --git a/environment/private-link/group_vars/all.yaml b/environment/private-link/group_vars/all.yaml
index f50f7df..aa32cb9 100644
--- a/environment/private-link/group_vars/all.yaml
+++ b/environment/private-link/group_vars/all.yaml
@@ -7,7 +7,7 @@ rosa_sts: true
 #delete_account_roles: false
 
 #uncomment to add a custom kms key arn
-#rosa_kms_key_arn: "" 
+#rosa_kms_key_arn: ""
 
 # uncomment to pin to a version
 # rosa_version: 4.13.10
@@ -29,3 +29,9 @@ rosa_create_admin: true
 
 # uncomment to enable custom kms workflow
 # rosa_kms_key_arn: "" #arn:aws:kms:us-east-2:<redacted>:key/<redacted>
+
+extra_tags:
+  cost-center: CC468
+  service-phase: lab
+  app-code: MOBB-001
+  owner: "{{ ansible_user_id }}@redhat.com"
diff --git a/environment/transit-gateway-egress/group_vars/all.yaml b/environment/transit-gateway-egress/group_vars/all.yaml
index db287d4..e518c03 100644
--- a/environment/transit-gateway-egress/group_vars/all.yaml
+++ b/environment/transit-gateway-egress/group_vars/all.yaml
@@ -43,3 +43,9 @@ rosa_custom_domain_vars:
 
 # uncomment to enable custom kms workflow
 # rosa_kms_key_arn: "" #arn:aws:kms:us-east-2:<redacted>:key/<redacted>
+
+extra_tags:
+  cost-center: CC468
+  service-phase: lab
+  app-code: MOBB-001
+  owner: "{{ ansible_user_id }}@redhat.com"
diff --git a/galaxy.yml b/galaxy.yml
index d63045a..56b08c1 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: rh_mobb
 name: rosa
-version: 2.3.0
+version: 2.3.1
 readme: README.md
 authors:
   - Paul Czarkowski <pczarkow@redhat.com>
diff --git a/install.yml b/install.yml
index efdf0f1..255c37d 100644
--- a/install.yml
+++ b/install.yml
@@ -24,15 +24,6 @@
       aws_caller_info:
       register: _aws_caller_info
 
-    - name: "set default resource tags"
-      set_fact:
-        extra_tags:
-          cost-center: CC468
-          service-phase: lab
-          app-code: MOBB-001
-          owner: "{{ ansible_user_id }}@redhat.com"
-      when: not extra_tags | default({}) | bool
-
     - ansible.builtin.set_fact:
         aws_account_id: "{{ _aws_caller_info.account }}"
 
diff --git a/roles/_vars/defaults/main.yml b/roles/_vars/defaults/main.yml
index 81f377f..15092cd 100644
--- a/roles/_vars/defaults/main.yml
+++ b/roles/_vars/defaults/main.yml
@@ -63,11 +63,7 @@ rosa_vpc_cidr: "10.0.0.0/16"
 
 rosa_region: "us-east-2"
 
-extra_tags:
-  cost-center: CC468
-  service-phase: lab
-  app-code: MOBB-001
-  owner: "{{ ansible_user_id }}@redhat.com"
+extra_tags: {}
 
 ## when not set the role `network_math` will attempt to figure it out
 ## using subnet math