Fix(eos_designs, eos_cli_config_gen): Fix the AVD version print in vi…

…rtual environments (#1876)
aristanetworks · Jun 15, 2022 · 16bc968 · 16bc968
1 parent b2c21ef
commit 16bc968
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/tasks/main.yml b/ansible_collections/arista/avd/roles/eos_cli_config_gen/tasks/main.yml
@@ -4,7 +4,7 @@
   set_fact:
     avd_collection_version: version
   vars:
-    versions: "{{ lookup('pipe', 'ansible-galaxy collection list --format yaml ' ~ ansible_collection_name) | from_yaml }}"
+    versions: "{{ lookup('pipe', 'ansible-galaxy collection list -p ' ~ collection_path ~ ' --format yaml ' ~ ansible_collection_name) | from_yaml }}"
     collection_path: "{{ (role_path | split('/'))[0:-4] | join('/') }}"
     version: "{{ versions[collection_path][ansible_collection_name].version | default('Unknown') }}"
     git_tag: "{{ lookup('pipe', 'git -C ' ~ collection_path ~ ' describe --tags --always 2>/dev/null', errors='ignore') }}"

diff --git a/ansible_collections/arista/avd/roles/eos_config_deploy_cvp/tasks/v1/main.yml b/ansible_collections/arista/avd/roles/eos_config_deploy_cvp/tasks/v1/main.yml
@@ -6,7 +6,7 @@
   set_fact:
     avd_collection_version: version
   vars:
-    versions: "{{ lookup('pipe', 'ansible-galaxy collection list --format yaml ' ~ ansible_collection_name) | from_yaml }}"
+    versions: "{{ lookup('pipe', 'ansible-galaxy collection list -p ' ~ collection_path ~ ' --format yaml ' ~ ansible_collection_name) | from_yaml }}"
     collection_path: "{{ (role_path | split('/'))[0:-4] | join('/') }}"
     version: "{{ versions[collection_path][ansible_collection_name].version | default('Unknown') }}"
     git_tag: "{{ lookup('pipe', 'git -C ' ~ collection_path ~ ' describe --tags --always 2>/dev/null', errors='ignore') }}"

diff --git a/ansible_collections/arista/avd/roles/eos_config_deploy_cvp/tasks/v3/main.yml b/ansible_collections/arista/avd/roles/eos_config_deploy_cvp/tasks/v3/main.yml
@@ -4,7 +4,7 @@
   set_fact:
     avd_collection_version: version
   vars:
-    versions: "{{ lookup('pipe', 'ansible-galaxy collection list --format yaml ' ~ ansible_collection_name) | from_yaml }}"
+    versions: "{{ lookup('pipe', 'ansible-galaxy collection list -p ' ~ collection_path ~ ' --format yaml ' ~ ansible_collection_name) | from_yaml }}"
     collection_path: "{{ (role_path | split('/'))[0:-4] | join('/') }}"
     version: "{{ versions[collection_path][ansible_collection_name].version | default('Unknown') }}"
     git_tag: "{{ lookup('pipe', 'git -C ' ~ collection_path ~ ' describe --tags --always 2>/dev/null', errors='ignore') }}"

diff --git a/ansible_collections/arista/avd/roles/eos_config_deploy_eapi/tasks/main.yml b/ansible_collections/arista/avd/roles/eos_config_deploy_eapi/tasks/main.yml
@@ -4,7 +4,7 @@
   set_fact:
     avd_collection_version: version
   vars:
-    versions: "{{ lookup('pipe', 'ansible-galaxy collection list --format yaml ' ~ ansible_collection_name) | from_yaml }}"
+    versions: "{{ lookup('pipe', 'ansible-galaxy collection list -p ' ~ collection_path ~ ' --format yaml ' ~ ansible_collection_name) | from_yaml }}"
     collection_path: "{{ (role_path | split('/'))[0:-4] | join('/') }}"
     version: "{{ versions[collection_path][ansible_collection_name].version | default('Unknown') }}"
     git_tag: "{{ lookup('pipe', 'git -C ' ~ collection_path ~ ' describe --tags --always 2>/dev/null', errors='ignore') }}"

diff --git a/ansible_collections/arista/avd/roles/eos_designs/tasks/main.yml b/ansible_collections/arista/avd/roles/eos_designs/tasks/main.yml
@@ -4,7 +4,7 @@
   ansible.builtin.set_fact:
     avd_collection_version: version
   vars:
-    versions: "{{ lookup('pipe', 'ansible-galaxy collection list --format yaml ' ~ ansible_collection_name) | from_yaml }}"
+    versions: "{{ lookup('pipe', 'ansible-galaxy collection list -p ' ~ collection_path ~ ' --format yaml ' ~ ansible_collection_name) | from_yaml }}"
     collection_path: "{{ (role_path | split('/'))[0:-4] | join('/') }}"
     version: "{{ versions[collection_path][ansible_collection_name].version | default('Unknown') }}"
     git_tag: "{{ lookup('pipe', 'git -C ' ~ collection_path ~ ' describe --tags --always 2>/dev/null', errors='ignore') }}"

diff --git a/ansible_collections/arista/avd/roles/eos_snapshot/tasks/main.yml b/ansible_collections/arista/avd/roles/eos_snapshot/tasks/main.yml
@@ -5,7 +5,7 @@
   set_fact:
     avd_collection_version: version
   vars:
-    versions: "{{ lookup('pipe', 'ansible-galaxy collection list --format yaml ' ~ ansible_collection_name) | from_yaml }}"
+    versions: "{{ lookup('pipe', 'ansible-galaxy collection list -p ' ~ collection_path ~ ' --format yaml ' ~ ansible_collection_name) | from_yaml }}"
     collection_path: "{{ (role_path | split('/'))[0:-4] | join('/') }}"
     version: "{{ versions[collection_path][ansible_collection_name].version | default('Unknown') }}"
     git_tag: "{{ lookup('pipe', 'git -C ' ~ collection_path ~ ' describe --tags --always 2>/dev/null', errors='ignore') }}"

diff --git a/ansible_collections/arista/avd/roles/eos_validate_state/tasks/main.yml b/ansible_collections/arista/avd/roles/eos_validate_state/tasks/main.yml
@@ -4,7 +4,7 @@
   set_fact:
     avd_collection_version: version
   vars:
-    versions: "{{ lookup('pipe', 'ansible-galaxy collection list --format yaml ' ~ ansible_collection_name) | from_yaml }}"
+    versions: "{{ lookup('pipe', 'ansible-galaxy collection list -p ' ~ collection_path ~ ' --format yaml ' ~ ansible_collection_name) | from_yaml }}"
     collection_path: "{{ (role_path | split('/'))[0:-4] | join('/') }}"
     version: "{{ versions[collection_path][ansible_collection_name].version | default('Unknown') }}"
     git_tag: "{{ lookup('pipe', 'git -C ' ~ collection_path ~ ' describe --tags --always 2>/dev/null', errors='ignore') }}"