Merge pull request #16 from stackhpc/containers

Add support for pulp_container plugin content

Author: markgoddard

README.md

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

roles/pulp_distribution/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 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_rpm`: List of distributions for RPM repositories. Default is an empty list
 * `pulp_distribution_rpm_skip_existing`: Whether to skip existing RPM
   distributions. If true, new distributions will not be created for a
@@ -30,6 +31,18 @@ Example playbook
       pulp_url: "https://pulp.example.com"
       pulp_username: admin
       pulp_password: "{{ secrets_pulp_admin_password }}"
+      pulp_distribution_container:
+        # Distribute the latest version of the pulp/pulp repository.
+        - name: pulp/pulp
+          base_path: pulp/pulp
+          repository: pulp/pulp
+          state: present
+        # Distribute version 2 of the pulp/pulp repository.
+        - name: pulp/pulp
+          base_path: pulp/pulp
+          repository: pulp/pulp
+          version: 2
+          state: present
       pulp_distribution_rpm:
         # Distribute the latest version of the centos-baseos repository.
         - name: centos-baseos

roles/pulp_distribution/defaults/main.yml

@@ -4,6 +4,7 @@ pulp_username: admin
 pulp_password:
 pulp_validate_certs: true
 
+pulp_distribution_container: []
 pulp_distribution_rpm: []
 
 # Whether to skip existing RPM distributions. If true, new distributions will

roles/pulp_distribution/tasks/container.yml

@@ -0,0 +1,13 @@
+---
+- name: Ensure container distributions are defined
+  pulp.squeezer.container_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 }}"
+    repository: "{{ item.repository }}"
+    version: "{{ item.version | default(omit) }}"
+    state: "{{ item.state }}"
+  with_items: "{{ pulp_distribution_container }}"

roles/pulp_distribution/tasks/main.yml

@@ -1,6 +1,10 @@
 ---
 - import_tasks: precheck.yml
 
+- include_tasks: container.yml
+  when: pulp_distribution_container | length > 0
+  tags: container
+
 - include_tasks: rpm.yml
   tags: rpm
   when: pulp_distribution_rpm | length > 0

roles/pulp_repository/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_repository_container_repos`: List of container repositories. Default is an empty list.
 * `pulp_repository_rpm_repos`: List of RPM repositories. Default is an empty list.
 * `pulp_repository_python_repos`: List of PyPI repositories. Default is an empty list.
 * `pulp_repository_deb_repos`: List of Deb respositories. Default is an empty list.
@@ -27,6 +28,12 @@ Example playbook
     - role: stackhpc.pulp.pulp_repository
       pulp_username: admin
       pulp_password: "{{ secrets_pulp_admin_password }}"
+      pulp_repository_container_repos:
+        # Create a pulp/pulp repository and sync with Dockerhub.
+        - name: pulp/pulp
+          url: https://registry-1.docker.io
+          policy: on_demand
+          state: present
       pulp_repository_rpm_repos:
         - name: centos-baseos
           url: http://mirrorlist.centos.org/?release=8&arch=x86_64&repo=BaseOS&infra=stock

roles/pulp_repository/defaults/main.yml

@@ -4,6 +4,7 @@ pulp_username: admin
 pulp_password:
 pulp_validate_certs: true
 
+pulp_repository_container_repos: []
 pulp_repository_deb_repos: []
 pulp_repository_python_repos: []
 pulp_repository_rpm_repos: []

roles/pulp_repository/tasks/container.yml

@@ -0,0 +1,34 @@
+---
+- name: Setup container repositories
+  pulp.squeezer.container_repository:
+    pulp_url: "{{ pulp_url }}"
+    username: "{{ pulp_username }}"
+    password: "{{ pulp_password }}"
+    validate_certs: "{{ pulp_validate_certs | bool }}"
+    name: "{{ item.name }}"
+    state: "{{ item.state }}"
+  with_items: "{{ pulp_repository_container_repos }}"
+
+- name: Setup container remotes
+  pulp.squeezer.container_remote:
+    pulp_url: "{{ pulp_url }}"
+    username: "{{ pulp_username }}"
+    password: "{{ pulp_password }}"
+    validate_certs: "{{ pulp_validate_certs | bool }}"
+    name: "{{ item.name }}-remote"
+    url: "{{ item.url }}"
+    policy: "{{ item.policy }}"
+    upstream_name: "{{ item.upstream_name | default(item.name) }}"
+    state: "{{ item.state }}"
+  with_items: "{{ pulp_repository_container_repos }}"
+
+- name: Sync container remotes into repositories
+  pulp.squeezer.container_sync:
+    pulp_url: "{{ pulp_url }}"
+    username: "{{ pulp_username }}"
+    password: "{{ pulp_password }}"
+    validate_certs: "{{ pulp_validate_certs | bool }}"
+    repository: "{{ item.name }}"
+    remote: "{{ item.name }}-remote"
+  with_items: "{{ pulp_repository_container_repos }}"
+  when: item.state == "present"

roles/pulp_repository/tasks/main.yml

@@ -1,4 +1,8 @@
 ---
+- include_tasks: container.yml
+  tags: container
+  when: pulp_repository_container_repos | length > 0
+
 - include_tasks: deb.yml
   when: pulp_repository_deb_repos | length > 0
   tags: deb