Fix ASG tagging

roles/openshift_aws/defaults/main.yml

@@ -245,7 +245,6 @@ openshift_aws_node_groups:
     host-type: node
     sub-host-type: compute
     runtime: docker
-
 - name: "{{ openshift_aws_clusterid }} infra group"
   group: infra
   node_group_config: node-config-infra

roles/openshift_aws/tasks/build_node_group.yml

@@ -67,6 +67,18 @@
   - openshift_aws_node_group_upgrade | default(False)
   - asgs.results|length == 2
 
+- set_fact:
+    l_instance_tags: "{{ openshift_aws_node_group_config_tags
+    | combine(openshift_aws_node_group.tags)
+    | combine({'deployment_serial': l_deployment_serial, 'ami': openshift_aws_ami_map[openshift_aws_node_group.group] | default(openshift_aws_ami)})
+    | combine({'openshift-node-group-config': openshift_aws_node_group.node_group_config | default('unset') }) }}"
+    l_node_group_name: "{{ openshift_aws_node_group.name }} {{ l_deployment_serial }}"
+
+- name: Set scale group instances autonaming
+  set_fact:
+    l_instance_tags: "{{ l_instance_tags | combine({'Name': l_node_group_name }) }}"
+  when: openshift_aws_autoname_scale_group_instances | default(false)
+
 - when:
   - openshift_aws_create_iam_role
   - asgs.results|length != 2

roles/openshift_aws/tasks/scale_group.yml

@@ -1,16 +1,4 @@
 ---
-- name: set node group name
-  set_fact:
-    l_node_group_name: "{{ openshift_aws_node_group.name }} {{ l_deployment_serial }}"
-
-- set_fact:
-    l_openshift_aws_node_group_config_tags: "{{ openshift_aws_node_group_config_tags }}"
-
-- name: Set scale group instances autonaming
-  set_fact:
-    l_openshift_aws_node_group_config_tags: "{{ l_openshift_aws_node_group_config_tags | combine({'Name': l_node_group_name }) }}"
-  when: openshift_aws_autoname_scale_group_instances | default(false)
-
 - name: Create the scale group
   ec2_asg:
     name: "{{ l_node_group_name }}"
@@ -29,10 +17,7 @@
     replace_all_instances: "{{ omit if openshift_aws_node_group_replace_instances != []
                                     else (l_node_group_config[openshift_aws_node_group.group].replace_all_instances | default(omit)) }}"
     tags:
-    - "{{ l_openshift_aws_node_group_config_tags
-          | combine(openshift_aws_node_group.tags)
-          | combine({'deployment_serial': l_deployment_serial, 'ami': openshift_aws_ami_map[openshift_aws_node_group.group] | default(openshift_aws_ami)})
-          | combine({'openshift-node-group-config': openshift_aws_node_group.node_group_config | default('unset') }) }}"
+    - "{{ l_instance_tags }}"
 
 - name: append the asg name to the openshift_aws_created_asgs fact
   set_fact: