From 318ecd058443395170dcdeb2e6d6c4c4017421c1 Mon Sep 17 00:00:00 2001 From: jefferyfry Date: Wed, 27 May 2020 12:23:34 -0700 Subject: [PATCH] Changed the installer info format. --- .../artifactory/templates/installer-info.json.j2 | 14 +++++++++----- .../roles/xray/templates/installer-info.json.j2 | 11 +++++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Ansible/collection/jfrog/ansible/roles/artifactory/templates/installer-info.json.j2 b/Ansible/collection/jfrog/ansible/roles/artifactory/templates/installer-info.json.j2 index 2d818d1..f475256 100644 --- a/Ansible/collection/jfrog/ansible/roles/artifactory/templates/installer-info.json.j2 +++ b/Ansible/collection/jfrog/ansible/roles/artifactory/templates/installer-info.json.j2 @@ -1,8 +1,12 @@ { - "productId": "Ansible_{{ ansible_marketplace }}_artifactory-pro-{{artifactory_version}}/1.0.0", + "productId": "Ansible_artifactory/1.0.0", "features": [ - { - "featureId": "Partner/ACC-006973" - } + { + "featureId": "Partner/ACC-006973" + }, + { + "featureId": "Channel/{{ ansible_marketplace }}" + } ] -} \ No newline at end of file +} + diff --git a/Ansible/collection/jfrog/ansible/roles/xray/templates/installer-info.json.j2 b/Ansible/collection/jfrog/ansible/roles/xray/templates/installer-info.json.j2 index 35bf1d0..a76c88c 100644 --- a/Ansible/collection/jfrog/ansible/roles/xray/templates/installer-info.json.j2 +++ b/Ansible/collection/jfrog/ansible/roles/xray/templates/installer-info.json.j2 @@ -1,8 +1,11 @@ { - "productId": "Ansible_{{ ansible_marketplace }}_xray-{{xray_version}}/1.0.0", + "productId": "Ansible_artifactory/1.0.0", "features": [ - { - "featureId": "Partner/ACC-006973" - } + { + "featureId": "Partner/ACC-006973" + }, + { + "featureId": "Channel/{{ ansible_marketplace }}" + } ] } \ No newline at end of file