fix desc

Author: MariuszJozwiak

site.maintenance.find-untagged.yml

@@ -7,8 +7,9 @@
       - "pending"
       - "shutting-down"
       - "stopping"
-    _ec2_ebs_list_review: []
+    _ec2_ebs_list_to_review: []
     _ec2_untagged_list: []
+    _ec2_list_to_review :
   roles:
      - role: cs.aws-rds-facts
   tasks:
@@ -28,9 +29,9 @@
         region: "{{ aws_region }}"
       register: _ec2_list_all
 
-    - name: Generate list EC2 to review
+    - name: Generate difference between both list
       set_fact:
-        _ec2_untagged_list: "{{ _ec2_untagged_list + [{ 'id' : item.instance_id, 'name' : item.tags.Name }] }}"
+        _ec2_untagged_list: "{{ _ec2_untagged_list + [{ 'id' : item.instance_id, 'name' : item.tags.Name | default('') }] }}"
       when: item.instance_id not in aws_ec2_whitelist
       with_items: "{{ _ec2_list_all.instances | difference(_ec2_list_mageops.instances) }}"
 
@@ -41,19 +42,20 @@
         region: "{{ aws_region }}"
       register: _ec2_ebs_list
 
-    - name: Set unused EBS volumes
+    - name: Set unused EBS volumes list
       set_fact:
-        _ec2_ebs_list_review: "{{ _ec2_ebs_list_review + [item.id] }}"
+        _ec2_ebs_list_to_review: "{{ _ec2_ebs_list_to_review + [item.id] }}"
       with_items: "{{ _ec2_ebs_list.volumes }}"
 
-    - name: Set _ec2_list_review
+    - name: Generate string to EC2 end output
       set_fact:
-        _ec2_list_review: "{{ _ec2_list_review | default() + 'ID : ' + item.id + ' Name : ' + item.name | default() '\n' }}"
+        _ec2_list_to_review: "{{ (_ec2_list_to_review) }} ID :  {{ item.id }} Name : {{ item.name }}"
       with_items: "{{ _ec2_untagged_list }}"
 
-
     - name: Failed when some resources found
       fail:
-        msg: "{% if (_ec2_ebs_list.volumes | length) > 0 %} EBS volumes to review: {{ _ec2_ebs_list_review | join(',') }} \n {% endif %} \
-        {% if (_ec2_untagged_list | length) > 0 %} EC2 instances to review: \n {{ _ec2_list_review }} {% endif %} "
+        msg: |
+          {% if (_ec2_ebs_list.volumes | length) > 0 %} EBS volumes to review: {{ _ec2_ebs_list_to_review | join(',') }} {% endif %}
+          {% if (_ec2_untagged_list | length) > 0 %} EC2 instances to review:
+          {{ _ec2_list_to_review }} {% endif %}
       when: "{{ (_ec2_untagged_list | length > 0) or (_ec2_ebs_list.volumes | length >0) }}"