Merge "Add custom user-agent for git clones from opendev.org"

scripts/bootstrap-ansible.sh

@@ -135,7 +135,7 @@ if [ "${SETUP_ARA}" == "true" ]; then
 fi
 
 # Get current code version (this runs at the root of OSA clone)
-CURRENT_OSA_VERSION=$(cd ${OSA_CLONE_DIR}; /opt/ansible-runtime/bin/python setup.py --version)
+export CURRENT_OSA_VERSION=$(cd ${OSA_CLONE_DIR}; /opt/ansible-runtime/bin/python setup.py --version)
 
 # Ensure that Ansible binaries run from the venv
 pushd /opt/ansible-runtime/bin

scripts/get-ansible-role-requirements.yml

@@ -23,6 +23,20 @@
       setup:
         gather_subset: '!all'
 
+    - name: Find the git version
+      command:
+        cmd: "git --version"
+      register: _git_version
+      changed_when: false
+      tags:
+        - skip_ansible_lint
+
+    - name: Set the git user agent for the deploy host
+      git_config:
+        scope: system
+        name: http.https://opendev.org/.userAgent
+        value: "{{ 'git/' ~ _git_version.stdout.split(' ')[2] ~ ' (osa/' ~ lookup('env', 'CURRENT_OSA_VERSION') ~ '/deploy)' }}"
+
     - name: Remove target directory if required
       file:
         path: "{{ item.path | default(role_path_default) }}/{{ item.name | default(item.src | basename) }}"

scripts/log-collect.sh

@@ -45,6 +45,7 @@ COMMON_ETC_LOG_NAMES="apt \
     dnf \
     etcd \
     ganesha \
+    gitconfig \
     haproxy \
     httpd \
     memcached \

tests/roles/bootstrap-host/tasks/main.yml

@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Identify AIO builds in the git user-agent
+- include_tasks: prepare_git_useragent.yml
+
 # Attempt data device detection if enabled
 - include_tasks: detect_data_disk_device.yml
   when:

tests/roles/bootstrap-host/tasks/prepare_git_useragent.yml

@@ -0,0 +1,28 @@
+---
+# Copyright 2021, BBC R&D
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Find the git version
+  command:
+    cmd: "git --version"
+  register: _git_version
+  changed_when: false
+  tags:
+    - skip_ansible_lint
+
+- name: Set the git user agent for the AIO
+  git_config:
+    scope: system
+    name: http.https://opendev.org/.userAgent
+    value: "{{ 'git/' ~ _git_version.stdout.split(' ')[2] ~ ' (osa/' ~ lookup('env', 'OSA_VERSION') ~ '/aio)' }}"