From aebcc6c5e53960f260dd1c06068206cb8e7516da Mon Sep 17 00:00:00 2001 From: Geoff Jacobs Date: Wed, 21 Aug 2024 11:00:03 +1000 Subject: [PATCH 1/7] ITPLT-3984 also setting user agent for lookup(url) --- roles/product_install/defaults/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml index d86c346..4137542 100644 --- a/roles/product_install/defaults/main.yml +++ b/roles/product_install/defaults/main.yml @@ -1,4 +1,6 @@ --- +# set the user_agent for lookup(url) requests +ansible_lookup_url_agent: "ansible-httpget_{{ ansible_play_name }}" # Empty values to simplify logic (no undefineds) atl_latest_version: '' From 3b498f503a33f16fa10b4ee0d9fd21ba1d820169 Mon Sep 17 00:00:00 2001 From: Geoff Jacobs Date: Wed, 21 Aug 2024 11:11:44 +1000 Subject: [PATCH 2/7] ITPLT-3984 jinja didn't render, try ansible.cfg --- ansible.cfg | 3 +++ roles/product_install/defaults/main.yml | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible.cfg b/ansible.cfg index 811f47c..d8ec420 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -2,3 +2,6 @@ retry_files_enabled = False callbacks_enabled = profile_tasks collections_path = ./ + +[url_lookup] +agent=ansible-httpget_dc-deployments-automation diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml index 4137542..c21588b 100644 --- a/roles/product_install/defaults/main.yml +++ b/roles/product_install/defaults/main.yml @@ -1,7 +1,4 @@ --- -# set the user_agent for lookup(url) requests -ansible_lookup_url_agent: "ansible-httpget_{{ ansible_play_name }}" - # Empty values to simplify logic (no undefineds) atl_latest_version: '' atl_cached_version: '' From c379cbd8eaf359e5f7422a184e75e09751f586dc Mon Sep 17 00:00:00 2001 From: Geoff Jacobs Date: Wed, 21 Aug 2024 11:22:06 +1000 Subject: [PATCH 3/7] ITPLT-3984 ansible.cfg doesn't get read when running molecule tests, trying to default the value when there's no play name --- ansible.cfg | 3 --- roles/product_install/defaults/main.yml | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ansible.cfg b/ansible.cfg index d8ec420..811f47c 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -2,6 +2,3 @@ retry_files_enabled = False callbacks_enabled = profile_tasks collections_path = ./ - -[url_lookup] -agent=ansible-httpget_dc-deployments-automation diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml index c21588b..f6e4497 100644 --- a/roles/product_install/defaults/main.yml +++ b/roles/product_install/defaults/main.yml @@ -44,4 +44,6 @@ atl_source_obr_from_marketplace: true atl_servicedesk_download_file: "{{ atl_installer_temp }}/jira-servicedesk.{{ atl_product_version }}.obr" force_version_update: false -skip_shared_home_symlink: false \ No newline at end of file +skip_shared_home_symlink: false + +ansible_lookup_url_agent: "ansible-httpget_{{ ansible_play_name | default('dc-deployments-automation') }}" \ No newline at end of file From 7555719797205d40443233d2ed019f5cf630d439 Mon Sep 17 00:00:00 2001 From: Geoff Jacobs Date: Wed, 21 Aug 2024 11:28:37 +1000 Subject: [PATCH 4/7] ITPLT-3984 hardcoding the user agent, jinja doesn't get rendered (possibly due to being an ansible_* var) --- roles/product_install/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml index f6e4497..d85eb96 100644 --- a/roles/product_install/defaults/main.yml +++ b/roles/product_install/defaults/main.yml @@ -46,4 +46,4 @@ atl_servicedesk_download_file: "{{ atl_installer_temp }}/jira-servicedesk.{{ atl force_version_update: false skip_shared_home_symlink: false -ansible_lookup_url_agent: "ansible-httpget_{{ ansible_play_name | default('dc-deployments-automation') }}" \ No newline at end of file +ansible_lookup_url_agent: "ansible-httpget_dc-deployments-automation" \ No newline at end of file From 063f1c595dbd125e125d56c8d7d1dd06c1d62b8a Mon Sep 17 00:00:00 2001 From: Geoff Jacobs Date: Wed, 21 Aug 2024 11:31:34 +1000 Subject: [PATCH 5/7] ITPLT-3984 test out per-playbook module_defaults --- aws_bitbucket_dc_node.yml | 5 +++++ aws_bitbucket_mesh_node.yml | 5 +++++ aws_bitbucket_nfs_node.yml | 5 +++++ aws_clone_nfs.yml | 5 +++++ aws_confluence_dc_node.yml | 5 +++++ aws_confluence_synchrony_node.yml | 5 +++++ aws_crowd_dc_node.yml | 5 +++++ aws_jira_dc_node.yml | 5 +++++ 8 files changed, 40 insertions(+) diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml index 1f2931c..c0740a5 100644 --- a/aws_bitbucket_dc_node.yml +++ b/aws_bitbucket_dc_node.yml @@ -2,6 +2,11 @@ - name: aws_bitbucket_dc_node.yml hosts: aws_node_local become: true + module_defaults: + ansible.builtin.uri: + http_agent: "ansible-httpget_{{ ansible_play_name }}" + ansible.builtin.get_url: + http_agent: "ansible-httpget_{{ ansible_play_name }}" vars: # See group_vars/aws_node_local.yml, which pull vars from the environment. diff --git a/aws_bitbucket_mesh_node.yml b/aws_bitbucket_mesh_node.yml index 7dd6eb5..537a1ee 100644 --- a/aws_bitbucket_mesh_node.yml +++ b/aws_bitbucket_mesh_node.yml @@ -2,6 +2,11 @@ - name: aws_bitbucket_mesh_node.yml hosts: aws_node_local become: true + module_defaults: + ansible.builtin.uri: + http_agent: "ansible-httpget_{{ ansible_play_name }}" + ansible.builtin.get_url: + http_agent: "ansible-httpget_{{ ansible_play_name }}" vars: # See group_vars/aws_node_local.yml, which pull vars from the environment. diff --git a/aws_bitbucket_nfs_node.yml b/aws_bitbucket_nfs_node.yml index 00815aa..64838c9 100644 --- a/aws_bitbucket_nfs_node.yml +++ b/aws_bitbucket_nfs_node.yml @@ -2,6 +2,11 @@ - name: aws_bitbucket_nfs_node.yml hosts: aws_node_local become: true + module_defaults: + ansible.builtin.uri: + http_agent: "ansible-httpget_{{ ansible_play_name }}" + ansible.builtin.get_url: + http_agent: "ansible-httpget_{{ ansible_play_name }}" vars: # See group_vars/aws_node_local.yml, which pull vars from the environment. diff --git a/aws_clone_nfs.yml b/aws_clone_nfs.yml index 988eec0..44ab3d0 100644 --- a/aws_clone_nfs.yml +++ b/aws_clone_nfs.yml @@ -2,6 +2,11 @@ - name: aws_clone_nfs.yml hosts: aws_node_local become: true + module_defaults: + ansible.builtin.uri: + http_agent: "ansible-httpget_{{ ansible_play_name }}" + ansible.builtin.get_url: + http_agent: "ansible-httpget_{{ ansible_play_name }}" vars: # See group_vars/aws_node_local.yml, which pull vars from the environment. diff --git a/aws_confluence_dc_node.yml b/aws_confluence_dc_node.yml index d780c2f..393f248 100644 --- a/aws_confluence_dc_node.yml +++ b/aws_confluence_dc_node.yml @@ -2,6 +2,11 @@ - name: aws_confluence_dc_node.yml hosts: aws_node_local become: true + module_defaults: + ansible.builtin.uri: + http_agent: "ansible-httpget_{{ ansible_play_name }}" + ansible.builtin.get_url: + http_agent: "ansible-httpget_{{ ansible_play_name }}" vars: # See group_vars/aws_node_local.yml, which pull vars from the environment. diff --git a/aws_confluence_synchrony_node.yml b/aws_confluence_synchrony_node.yml index fc7b45f..1fcd8fa 100644 --- a/aws_confluence_synchrony_node.yml +++ b/aws_confluence_synchrony_node.yml @@ -3,6 +3,11 @@ - name: aws_confluence_synchrony_node.yml hosts: aws_node_local become: true + module_defaults: + ansible.builtin.uri: + http_agent: "ansible-httpget_{{ ansible_play_name }}" + ansible.builtin.get_url: + http_agent: "ansible-httpget_{{ ansible_play_name }}" vars: # See group_vars/aws_node_local.yml, which pull vars from the environment. diff --git a/aws_crowd_dc_node.yml b/aws_crowd_dc_node.yml index 9da2dcc..50ad8ef 100644 --- a/aws_crowd_dc_node.yml +++ b/aws_crowd_dc_node.yml @@ -2,6 +2,11 @@ - name: aws_crowd_dc_node.yml hosts: aws_node_local become: true + module_defaults: + ansible.builtin.uri: + http_agent: "ansible-httpget_{{ ansible_play_name }}" + ansible.builtin.get_url: + http_agent: "ansible-httpget_{{ ansible_play_name }}" vars: # See group_vars/aws_node_local.yml, which pull vars from the environment. diff --git a/aws_jira_dc_node.yml b/aws_jira_dc_node.yml index 1f7275e..4739dfe 100644 --- a/aws_jira_dc_node.yml +++ b/aws_jira_dc_node.yml @@ -2,6 +2,11 @@ - name: aws_jira_dc_node.yml hosts: aws_node_local become: true + module_defaults: + ansible.builtin.uri: + http_agent: "ansible-httpget_{{ ansible_play_name }}" + ansible.builtin.get_url: + http_agent: "ansible-httpget_{{ ansible_play_name }}" vars: # See group_vars/aws_node_local.yml, which pull vars from the environment. From e27bd37dc6c567b29bb448a56784e06cf5d3a38c Mon Sep 17 00:00:00 2001 From: Geoff Jacobs Date: Wed, 21 Aug 2024 11:35:34 +1000 Subject: [PATCH 6/7] ITPLT-3984 move module defaults to various playbooks --- roles/product_install/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/product_install/tasks/main.yml b/roles/product_install/tasks/main.yml index da5b0ec..3bfefba 100644 --- a/roles/product_install/tasks/main.yml +++ b/roles/product_install/tasks/main.yml @@ -202,7 +202,6 @@ url_username: "{{ download_atlassian_username | default(omit) }}" mode: 0755 force: false - http_agent: "ansible-httpget_{{ ansible_play_name }}" register: atl_product_completed # If product installer was fetched make the lock directory From bbde258379f4973c45b1fdb7da5849a64bc44bbb Mon Sep 17 00:00:00 2001 From: Geoff Jacobs Date: Wed, 21 Aug 2024 11:58:55 +1000 Subject: [PATCH 7/7] ITPLT-3984 put the agent back on fetch binary in case it's called from other playbooks --- roles/product_install/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/product_install/tasks/main.yml b/roles/product_install/tasks/main.yml index 3bfefba..da5b0ec 100644 --- a/roles/product_install/tasks/main.yml +++ b/roles/product_install/tasks/main.yml @@ -202,6 +202,7 @@ url_username: "{{ download_atlassian_username | default(omit) }}" mode: 0755 force: false + http_agent: "ansible-httpget_{{ ansible_play_name }}" register: atl_product_completed # If product installer was fetched make the lock directory