removed extra fields

shadowman-lab · Nov 10, 2023 · 7624c8a · 7624c8a
1 parent 8c22c8d
commit 7624c8a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 31 deletions.
diff --git a/.ansible-sign/sha256sum.txt b/.ansible-sign/sha256sum.txt
@@ -129,7 +129,7 @@ d2214c71dbbaa463d8c81cbb91a881ea1e773b5ba57b8e8d2b309cf8a4d313a5  roles/aws_opt_
 fb0accc3dc53f4a533ca517de57c71ebf8752e04e3be6bf23096ec36e06bd5ad  roles/aws_opt_in_stop/tasks/main.yml
 4cb7ea6a459bb3d191fbe3b9fbb52bc6dbfe31e1b76adabf7b5c9e0ccf0b4f94  roles/aws_retrieve_info/defaults/main.yml
 a426eb8fbffc99ade4cdce996e6c18d2cec0572632ea5ec3be9cf4af9d03831b  roles/aws_retrieve_info/tasks/main.yml
-35ee51d3c5f69d4b6c2378de483a5b8102774b13886821296c777b5f066d07c1  roles/aws_retrieve_info/tasks/retrieve_info.yml
+589b37c25262ef29faaf469dcedc9008803b2a1a1c8e63e77c4645785ffdbca3  roles/aws_retrieve_info/tasks/retrieve_info.yml
 6c8b0dca0627067f90cf42f2eb4909022d5460bb7326949d98ce33c0232844b3  roles/aws_schedule_parking/tasks/main.yml
 030b09eb3b997831369b4928ba145b5e5530999259ae60fc613e8ac17d92a812  roles/build_report_aws/README.md
 85a58f5ab2fe784d4da58faa8e806d596b715dd2e956e5d24c1880bcbcbd3825  roles/build_report_aws/defaults/main.yml
@@ -139,8 +139,8 @@ a426eb8fbffc99ade4cdce996e6c18d2cec0572632ea5ec3be9cf4af9d03831b  roles/aws_retr
 2bfe24d4f6ca202fec0c7218897bda32340ec0cfd52329d5e37297a200ca781b  roles/build_report_aws/files/webpage_logo.png
 8656f39933ecb711379e46f4add535d86f1b244a741f6772282523502aec253b  roles/build_report_aws/meta/main.yml
 6e63b20277d99ffe50e945c75e43273349815e48ae189b099aba5d8cb7453615  roles/build_report_aws/tasks/main.yml
-bef25e2f63c4302c0bb788e1df4fd2c6942cf73511f8e194c6389b714131cc29  roles/build_report_aws/templates/ansible.j2
-3835dae122a039a7e9c28b3f96f6943a822c8c44f1919e41361e653303264202  roles/build_report_aws/templates/fullreport.j2
+1020dc7dced8d6364eab8a6288206e97b412621a0a4411c568eb652d54eb1e01  roles/build_report_aws/templates/ansible.j2
+26efbca220d46debc6058a876ea9f9e2ca9e75c8cb26343ec6d1e4d0c7000f4a  roles/build_report_aws/templates/fullreport.j2
 9f323ad6ccd1e98424e82df19fc8f1a23fba135d560fa40e00e2da2be6ef8d7e  roles/build_report_aws/templates/header.j2
 7a0f9cf2df62ee7d32115a933867daeb8dbaeafc2a598cdd6ecef58b4611c567  roles/build_report_aws/templates/report.j2
 6dd97b061c6e99597d170dfa49068192e29194d15b494f82c8959d81458f5539  roles/build_report_aws/templates/vpc.j2

diff --git a/.ansible-sign/sha256sum.txt.sig b/.ansible-sign/sha256sum.txt.sig
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQGzBAABCAAdFiEE/bJvyFHKKJdaZDOLTiIiIXrUDNEFAmVOVhkACgkQTiIiIXrU
-DNEfIAwAqcFWhdV9AqOj4ym68ecOXgDCvrdyGHhb1hgHwX9jvBfCE50kBfdsL2A+
-qBiYMg0k7YSY74IBBf4/dNWHqYgdRSgqeWjuXluZiuwtIMabWUkwONuvNTF5hETc
-rkKBAIRKyAHfRA9ifF15io8hOYoJNB/HxiCVcGqSkPEgqNBp3hfkfaA3+23kRknm
-vSW75zXjSraN9pLWDHnmF5gfxbfip+GZjJZnvq3UBQszgMTiIpTRNEAQBNomLs8a
-44KnJWoA0CmlyZzrf9AG1SFj8ayji5AIZkivRyc3r2Shi+DB6Ni1ZHuhLgFa6Lh2
-ci4yNmu/kUq1MCOwntcIT6kNDrmLxrIwElQTfL0zGLyAwTS/bbjX3AWjWKURoSjr
-QDi2AdYvoatFFVwDdvHRCSLBsR7RXClkQG2ATeCqhluJ/v5s+DtCYgSzi+y/DG2E
-X30Jf2kuha+DUMtVK8Tr941WdpustqOHcU14LtKHrE052hn35IWN4pZMt8C5EHsk
-CVIq68sd
-=TmmF
+iQGzBAABCAAdFiEE/bJvyFHKKJdaZDOLTiIiIXrUDNEFAmVOVvwACgkQTiIiIXrU
+DNF+7gv/c3tOHZ7fi7pt54kUZSgRh8N9wGAT/TMEwivlSo3yWK3B8q7FclMIH5Wm
+EvOyi5k9pfVEbpgCU/Icm7LnLD8tLuP82U5KKaNyOZevk6WvobgERvG9HNSdbz0Y
+eOWyHg55Q0nTa4M3EPoYMxJ3uox9QvwnFJprkgAimCayHgZCVzwCqbOLq9ef78Ol
+0yWKAOpok9VzgM47qt8MJQacPu7x6MI5BtkbmZt77UFPqsLQL9sRP63EFfGCJyN3
+itkoh8UJkiuVw+rBRpxTjlDsi00i2uL48j/HjCsN6x6iMlDfeaG3fmdNV3Rrcz9C
+KNJxZaspjHA+1S2El6Ak6fvb+JpaASYYbQnkN8aJJP/R29EGuPf1gfpOmzD8QA9Q
+PFuPihOotRG6hiZnUO0hO59BlrRXxIyfJwuC3cVTqvFyCBNEF9bX4kcQj5tHCvNf
+B25WbC4DG5k8gUwBClBau5pYlkPlrqKrACGUYzXWPE7OQ3e5FSiGtPDwjJBJ70mB
+B9cYYSH6
+=1ONk
 -----END PGP SIGNATURE-----
diff --git a/roles/aws_retrieve_info/tasks/retrieve_info.yml b/roles/aws_retrieve_info/tasks/retrieve_info.yml
@@ -27,4 +27,4 @@
 
 - name: Set facts all info for {{ item }}
   ansible.builtin.set_fact:
-    all_ec2_regions: "{{ all_ec2_regions | default ([]) + [{ item | replace('-','_'): hostvars[inventory_hostname][item | replace('-','_')]}] }}"
+    all_ec2_regions: "{{ all_ec2_regions | default([]) + [{item | replace('-', '_'): hostvars[inventory_hostname][item | replace('-', '_')]}] }}"
diff --git a/roles/build_report_aws/templates/ansible.j2 b/roles/build_report_aws/templates/ansible.j2
@@ -5,14 +5,6 @@
 <div class="net_content">
 <table class="net_info">
 <tbody>
-  <tr>
-    <td>Ansible user</td>
-    <td class="sub_net_info">{{ ansible_user_id | default('unknown') }}</td>
-  </tr>
-  <tr>
-    <td>Ansible FQDN</td>
-    <td class="sub_net_info">{{ ansible_fqdn | default('unknown') }}</td>
-  </tr>
   <tr>
     <td>Ansible core version</td>
     <td class="sub_net_info">{{ ansible_version.full }}</td>

diff --git a/roles/build_report_aws/templates/fullreport.j2 b/roles/build_report_aws/templates/fullreport.j2
@@ -79,14 +79,6 @@ collapsible: true
 <div class="net_content">
 <table class="net_info">
 <tbody>
-  <tr>
-    <td>Ansible user</td>
-    <td class="sub_net_info">{{ ansible_user_id | default('unknown') }}</td>
-  </tr>
-  <tr>
-    <td>Ansible FQDN</td>
-    <td class="sub_net_info">{{ ansible_fqdn | default('unknown') }}</td>
-  </tr>
   <tr>
     <td>Ansible core version</td>
     <td class="sub_net_info">{{ ansible_version.full }}</td>