Merge pull request #21 from stackhpc/deb-pub-dist

Add deb support in pulp_distribution and pulp_publication roles

Author: markgoddard

README.md

@@ -11,11 +11,7 @@ Tested with the current Ansible 2.9-2.10 releases.
 
 ## Included content
 
-Roles:
-
-* `pulp_repository`
-* `pulp_publication`
-* `pulp_distribution`
+pulp_repository role
 
 ## Using this collection
 

roles/pulp_distribution/README.md

@@ -11,7 +11,12 @@ Role variables
 * `pulp_password`: Password used to access Pulp server. Default is unse
 * `pulp_validate_certs`: Whether to validate Pulp server certificate. Default is `true`
 * `pulp_distribution_container`: List of distributions for container repositories. Default is an empty list
+* `pulp_distribution_deb`: List of distributions for Deb repositories. Default is an empty list
 * `pulp_distribution_rpm`: List of distributions for RPM repositories. Default is an empty list
+* `pulp_distribution_deb_skip_existing`: Whether to skip existing Deb
+  distributions. If true, new distributions will not be created for a
+  publication if any distributions exist for the same publication.
+  Default is `false`.
 * `pulp_distribution_rpm_skip_existing`: Whether to skip existing RPM
   distributions. If true, new distributions will not be created for a
   publication if any distributions exist for the same publication.
@@ -43,6 +48,23 @@ Example playbook
           repository: pulp/pulp
           version: 2
           state: present
+      pulp_distribution_deb:
+        # Distribute the latest version of the ubuntu-focal repository.
+        - name: ubuntu-focal
+          base_path: ubuntu-focal
+          repository: ubuntu-focal
+          state: present
+        # Distribute version 2 of the ubuntu-focal-security repository.
+        - name: ubuntu-focal-security
+          base_path: ubuntu-focal-security
+          repository: ubuntu-focal-security
+          version: 2
+          state: present
+        # Distribute the same publication as the ubuntu-focal distribution.
+        - name: ubuntu-focal-production
+          base_path: ubuntu-focal-production
+          distribution: ubuntu-focal
+          state: present
       pulp_distribution_rpm:
         # Distribute the latest version of the centos-baseos repository.
         - name: centos-baseos

roles/pulp_distribution/defaults/main.yml

@@ -5,9 +5,11 @@ pulp_password:
 pulp_validate_certs: true
 
 pulp_distribution_container: []
+pulp_distribution_deb: []
 pulp_distribution_rpm: []
 
-# Whether to skip existing RPM distributions. If true, new distributions will
+# Whether to skip existing distributions. If true, new distributions will
 # not be created for a publication if any distributions exist for the same
 # publication.
+pulp_distribution_deb_skip_existing: false
 pulp_distribution_rpm_skip_existing: false

roles/pulp_distribution/tasks/deb.yml

@@ -0,0 +1,53 @@
+---
+- name: Query repositories
+  pulp.squeezer.deb_repository:
+    pulp_url: "{{ pulp_url }}"
+    username: "{{ pulp_username }}"
+    password: "{{ pulp_password }}"
+    validate_certs: "{{ pulp_validate_certs | bool }}"
+  register: pulp_repos_list
+
+- name: Query publications
+  pulp.squeezer.deb_publication:
+    pulp_url: "{{ pulp_url }}"
+    username: "{{ pulp_username }}"
+    password: "{{ pulp_password }}"
+    validate_certs: "{{ pulp_validate_certs | bool }}"
+  register: pulp_pubs_list
+
+- name: Query distributions
+  pulp.squeezer.deb_distribution:
+    pulp_url: "{{ pulp_url }}"
+    username: "{{ pulp_username }}"
+    password: "{{ pulp_password }}"
+    validate_certs: "{{ pulp_validate_certs | bool }}"
+  register: pulp_dists_list
+
+- name: Ensure Deb distributions are defined
+  vars:
+    repo: "{{ pulp_repos_list.repositories | selectattr('name', 'equalto', item.repository) | first }}"
+    # If the distribution references a specific version:
+    specific_pub: "{{ pulp_pubs_list.publications | selectattr('repository_version', 'equalto', repo.pulp_href ~ 'versions/' ~ item.version | default ~ '/') }}"
+    # If the distribution uses the latest version:
+    latest_pub: "{{ pulp_pubs_list.publications | selectattr('repository', 'equalto', repo.pulp_href) | sort(attribute='repository_version', reverse=True) }}"
+    # If another distribution is being promoted to this one:
+    promoted_dist: "{{ pulp_dists_list.distributions | selectattr('name', 'equalto', item.distribution | default) }}"
+    promoted_pub: "{{ pulp_pubs_list.publications | selectattr('pulp_href', 'equalto', (promoted_dist | first).publication | default) }}"
+    # Pick the right publication based on the type of distribution.
+    pubs: "{{ specific_pub if item.version is defined else promoted_pub if item.distribution is defined else latest_pub }}"
+    # Whether any distributions exist for this publication.
+    pub_has_dists: >-
+      {{ pulp_dists_list.distributions | selectattr('publication', 'equalto', pubs[0].pulp_href if item.state == 'present' else None) | list | length > 0 }}
+  pulp.squeezer.deb_distribution:
+    pulp_url: "{{ pulp_url }}"
+    username: "{{ pulp_username }}"
+    password: "{{ pulp_password }}"
+    validate_certs: "{{ pulp_validate_certs | bool }}"
+    name: "{{ item.name }}"
+    base_path: "{{ item.base_path }}"
+    publication: "{{ pubs[0].pulp_href if item.state == 'present' else omit }}"
+    state: "{{ item.state }}"
+  with_items: "{{ pulp_distribution_deb }}"
+  when: >-
+    item.state == 'absent' or
+    not (item.skip_existing | default(pulp_distribution_deb_skip_existing) | bool and pub_has_dists)

roles/pulp_distribution/tasks/main.yml

@@ -5,6 +5,10 @@
   when: pulp_distribution_container | length > 0
   tags: container
 
+- include_tasks: deb.yml
+  tags: deb
+  when: pulp_distribution_deb | length > 0
+
 - include_tasks: rpm.yml
   tags: rpm
   when: pulp_distribution_rpm | length > 0

roles/pulp_publication/README.md

@@ -10,6 +10,7 @@ Role variables
 * `pulp_username`: Username used to access Pulp server. Default is `admin`
 * `pulp_password`: Password used to access Pulp server. Default is unset
 * `pulp_validate_certs`: Whether to validate Pulp server certificate. Default is `true`
+* `pulp_publication_deb`: List of publications of Deb repositories. Default is an empty list
 * `pulp_publication_rpm`: List of publications of RPM repositories. Default is an empty list
 
 Example playbook
@@ -25,6 +26,14 @@ Example playbook
     - role: stackhpc.pulp.pulp_publication
       pulp_username: admin
       pulp_password: "{{ secrets_pulp_admin_password }}"
+      pulp_publication_deb:
+        # Create a publication of the latest version.
+        - repository: ubuntu-focal
+          state: present
+        # Create a publication of version 2.
+        - repository: ubuntu-focal
+          version: 2
+          state: present
       pulp_publication_rpm:
         # Create a publication of the latest version.
         - repository: centos-baseos

roles/pulp_publication/defaults/main.yml

@@ -4,4 +4,5 @@ pulp_username: admin
 pulp_password:
 pulp_validate_certs: true
 
+pulp_publication_deb: []
 pulp_publication_rpm: []

roles/pulp_publication/tasks/deb.yml

@@ -0,0 +1,11 @@
+---
+- name: Ensure Deb publications are defined
+  pulp.squeezer.deb_publication:
+    pulp_url: "{{ pulp_url }}"
+    username: "{{ pulp_username }}"
+    password: "{{ pulp_password }}"
+    validate_certs: "{{ pulp_validate_certs | bool }}"
+    repository: "{{ item.repository }}"
+    state: "{{ item.state }}"
+    version: "{{ item.version | default(omit) }}"
+  with_items: "{{ pulp_publication_deb }}"

roles/pulp_publication/tasks/main.yml

@@ -1,6 +1,10 @@
 ---
 - import_tasks: precheck.yml
 
+- include_tasks: deb.yml
+  tags: deb
+  when: pulp_publication_deb | length > 0
+
 - include_tasks: rpm.yml
   tags: rpm
   when: pulp_publication_rpm | length > 0