mobb extra_tags should not be defaulted to in roles

Signed-off-by: Paul Czarkowski <[email protected]>
rh-mobb · Jan 15, 2024 · abda0c0 · abda0c0
1 parent 29c392b
commit abda0c0
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 17 deletions.
diff --git 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>
+# 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 namespace: rh_mobb
 name: rosa
-version: 2.3.0
+version: 2.3.1
 readme: README.md
 authors:
   - Paul Czarkowski <[email protected]>

diff --git 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
@@ -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