Skip to content
This repository has been archived by the owner on Jan 30, 2024. It is now read-only.

Commit

Permalink
Problem: role metadata is incorrect or has omissions
Browse files Browse the repository at this point in the history
Solution: Update it, including the license strings:
GPL-2.0 for some roles, GPL-3.0 for others -> GPL-2.0-or-later

Also remove a duplicate of copy of LICENSE (GPLv2) from the "pulp"
role, which is without a COPYRIGHT file (which says GPLv2+ actually)
or a COMMITMENT file.

Not addressed:
1. The dependencies so that each service could run on different hosts.
(Addressing them increases dynamic include runtime, and acheiving that
entire end includes more work/testing.)

fixes: #6113
https://pulp.plan.io/issues/6113
Fix up pulp-ansible role metadata, including license string
  • Loading branch information
mikedep333 committed Feb 26, 2020
1 parent 972f163 commit a45411b
Show file tree
Hide file tree
Showing 10 changed files with 83 additions and 376 deletions.
16 changes: 12 additions & 4 deletions roles/pulp-content/meta/main.yml
@@ -1,9 +1,11 @@
---
galaxy_info:
author: Pulp
description: Pulp content app
author: Pulp Team
description: A role to setup Pulp 3's content serving service
issue_tracker_url: https://pulp.plan.io/projects/pulp/issues/new
license: GPL-2.0-or-later
company: Red Hat
min_ansible_version: 2.4
min_ansible_version: 2.8
platforms:
- name: Debian
versions:
Expand All @@ -12,4 +14,10 @@ galaxy_info:
versions:
- 30
- 31
license: GPL-3.0
- name: EL
versions:
- 7
galaxy_tags:
- pulp
- pulpcore
dependencies: []
12 changes: 8 additions & 4 deletions roles/pulp-database/meta/main.yml
@@ -1,11 +1,11 @@
---
galaxy_info:
author: Pulp Team
description: A role that installs pulp3's database
issue_tracker_url: https://pulp.plan.io/projects/external/issues/new
license: GPLv2
description: A role to setup Pulp 3's database
issue_tracker_url: https://pulp.plan.io/projects/pulp/issues/new
license: GPL-2.0-or-later
company: Red Hat
min_ansible_version: 2.2
min_ansible_version: 2.8
platforms:
- name: Debian
versions:
Expand All @@ -14,7 +14,11 @@ galaxy_info:
versions:
- 30
- 31
- name: EL
versions:
- 7
galaxy_tags:
- pulp
- pulpcore
dependencies:
- pulp
10 changes: 7 additions & 3 deletions roles/pulp-devel/meta/main.yml
Expand Up @@ -2,8 +2,8 @@
galaxy_info:
author: Pulp Team
description: A role that sets up a development environment for Pulp 3, and its plugins
issue_tracker_url: https://pulp.plan.io/projects/external/issues/new
license: GPLv2
issue_tracker_url: https://pulp.plan.io/projects/pulp/issues/new
license: GPL-2.0-or-later
company: Red Hat
min_ansible_version: 2.8
platforms:
Expand All @@ -12,7 +12,11 @@ galaxy_info:
- buster
- name: Fedora
versions:
- all
- 30
- 31
- name: EL
versions:
- 7
galaxy_tags:
- pulp
- pulpcore
Expand Down
15 changes: 11 additions & 4 deletions roles/pulp-redis/meta/main.yml
@@ -1,9 +1,11 @@
---
galaxy_info:
author: Pulp
description: Pulp Redis
author: Pulp Team
description: A role to setup a redis service for use by Pulp 3
issue_tracker_url: https://pulp.plan.io/projects/pulp/issues/new
license: GPL-2.0-or-later
company: Red Hat
min_ansible_version: 2.4
min_ansible_version: 2.8
platforms:
- name: Debian
versions:
Expand All @@ -12,5 +14,10 @@ galaxy_info:
versions:
- 30
- 31
license: GPL-3.0
- name: EL
versions:
- 7
galaxy_tags:
- pulp
- pulpcore
dependencies: []
19 changes: 12 additions & 7 deletions roles/pulp-resource-manager/meta/main.yml
@@ -1,9 +1,11 @@
---
galaxy_info:
author: Pulp
description: Pulp Resource Manager
author: Pulp Team
description: A role to setup Pulp 3's Resource Manager service
issue_tracker_url: https://pulp.plan.io/projects/pulp/issues/new
license: GPL-2.0-or-later
company: Red Hat
min_ansible_version: 2.4
min_ansible_version: 2.8
platforms:
- name: Debian
versions:
Expand All @@ -12,8 +14,11 @@ galaxy_info:
versions:
- 30
- 31
license: GPL-3.0

# Depend on pulp-redis for RQ.
- name: EL
versions:
- 7
galaxy_tags:
- pulp
- pulpcore
dependencies:
- role: pulp-redis
- pulp-redis
19 changes: 13 additions & 6 deletions roles/pulp-webserver/meta/main.yml
@@ -1,17 +1,24 @@
---
galaxy_info:
author: Pulp
description: Pulp Web Server
author: Pulp Team
description: A role to setup a web server as a proxy for both Pulp 3's pulpcore-content & pulpcore-api services
issue_tracker_url: https://pulp.plan.io/projects/pulp/issues/new
license: GPL-2.0-or-later
company: Red Hat
min_ansible_version: 2.4
min_ansible_version: 2.8
platforms:
- name: Debian
versions:
- Buster
- buster
- name: Fedora
versions:
- 30
- 31
license: GPL-3.0
- name: EL
versions:
- 7
galaxy_tags:
- pulp
- pulpcore
dependencies:
- role: pulp
- pulp
15 changes: 11 additions & 4 deletions roles/pulp-workers/meta/main.yml
@@ -1,9 +1,11 @@
---
galaxy_info:
author: Pulp
description: Pulp worker
author: Pulp Team
description: A role to setup Pulp 3's worker service
issue_tracker_url: https://pulp.plan.io/projects/pulp/issues/new
license: GPL-2.0-or-later
company: Red Hat
min_ansible_version: 2.4
min_ansible_version: 2.8
platforms:
- name: Debian
versions:
Expand All @@ -12,6 +14,11 @@ galaxy_info:
versions:
- 30
- 31
license: GPL-3.0
- name: EL
versions:
- 7
galaxy_tags:
- pulp
- pulpcore
dependencies:
- pulp-redis

0 comments on commit a45411b

Please sign in to comment.