Merge pull request #29 from stackhpc/more-remote-params

pulp_repository: add all current parameters for remotes

Author: markgoddard

roles/pulp_repository/tasks/container.yml

@@ -8,6 +8,8 @@
     name: "{{ item.name }}"
     state: "{{ item.state }}"
   with_items: "{{ pulp_repository_container_repos }}"
+  loop_control:
+    label: "{{ item.name }}"
 
 - name: Setup container remotes
   pulp.squeezer.container_remote:
@@ -16,11 +18,23 @@
     password: "{{ pulp_password }}"
     validate_certs: "{{ pulp_validate_certs | bool }}"
     name: "{{ item.name }}-remote"
-    url: "{{ item.url }}"
-    policy: "{{ item.policy }}"
+    ca_cert: "{{ item.ca_cert | default(omit) }}"
+    client_cert: "{{ item.client_cert | default(omit) }}"
+    client_key: "{{ item.client_key | default(omit) }}"
+    download_concurrency: "{{ item.download_concurrency | default(omit) }}"
+    policy: "{{ item.policy | default(omit) }}"
+    proxy_url: "{{ item.proxy_url | default(omit) }}"
+    proxy_username: "{{ item.proxy_username | default(omit) }}"
+    proxy_password: "{{ item.proxy_password | default(omit) }}"
+    remote_username: "{{ item.remote_username | default(omit) }}"
+    remote_password: "{{ item.remote_password | default(omit) }}"
+    tls_validation: "{{ item.tls_validation | default(omit) }}"
     upstream_name: "{{ item.upstream_name | default(item.name) }}"
+    url: "{{ item.url | default(omit) }}"
     state: "{{ item.state }}"
   with_items: "{{ pulp_repository_container_repos }}"
+  loop_control:
+    label: "{{ item.name }}"
 
 - name: Sync container remotes into repositories
   pulp.squeezer.container_sync:
@@ -32,3 +46,5 @@
     remote: "{{ item.name }}-remote"
   with_items: "{{ pulp_repository_container_repos }}"
   when: item.state == "present"
+  loop_control:
+    label: "{{ item.name }}"

roles/pulp_repository/tasks/deb.yml

@@ -8,6 +8,8 @@
     name: "{{ item.name }}"
     state: "{{ item.state }}"
   with_items: "{{ pulp_repository_deb_repos }}"
+  loop_control:
+    label: "{{ item.name }}"
 
 - name: Setup DEB remotes
   pulp.squeezer.deb_remote:
@@ -16,13 +18,25 @@
     password: "{{ pulp_password }}"
     validate_certs: "{{ pulp_validate_certs | bool }}"
     name: "{{ item.name }}-remote"
-    url: "{{ item.url }}"
-    architectures: "{{ item.architectures }}"
-    components: "{{ item.components }}"
-    distributions: "{{ item.distributions }}"
-    policy: "{{ item.policy }}"
+    architectures: "{{ item.architectures | default(omit) }}"
+    ca_cert: "{{ item.ca_cert | default(omit) }}"
+    client_cert: "{{ item.client_cert | default(omit) }}"
+    client_key: "{{ item.client_key | default(omit) }}"
+    components: "{{ item.components | default(omit) }}"
+    distributions: "{{ item.distributions | default(omit) }}"
+    download_concurrency: "{{ item.download_concurrency | default(omit) }}"
+    policy: "{{ item.policy | default(omit) }}"
+    proxy_url: "{{ item.proxy_url | default(omit) }}"
+    proxy_username: "{{ item.proxy_username | default(omit) }}"
+    proxy_password: "{{ item.proxy_password | default(omit) }}"
+    remote_username: "{{ item.remote_username | default(omit) }}"
+    remote_password: "{{ item.remote_password | default(omit) }}"
+    tls_validation: "{{ item.tls_validation | default(omit) }}"
+    url: "{{ item.url | default(omit) }}"
     state: "{{ item.state }}"
   with_items: "{{ pulp_repository_deb_repos }}"
+  loop_control:
+    label: "{{ item.name }}"
 
 - name: Sync DEB remotes into repositories
   pulp.squeezer.deb_sync:
@@ -35,3 +49,5 @@
     mirror: "{{ item.mirror | default(omit) }}"
   with_items: "{{ pulp_repository_deb_repos }}"
   when: item.state == "present"
+  loop_control:
+    label: "{{ item.name }}"

roles/pulp_repository/tasks/python.yml

@@ -8,6 +8,8 @@
     name: "{{ item.name }}"
     state: "{{ item.state }}"
   with_items: "{{ pulp_repository_python_repos }}"
+  loop_control:
+    label: "{{ item.name }}"
 
 - name: Setup PyPI remotes
   pulp.squeezer.python_remote:
@@ -16,10 +18,25 @@
     password: "{{ pulp_password }}"
     validate_certs: "{{ pulp_validate_certs | bool }}"
     name: "{{ item.name }}-remote"
-    url: "{{ item.url }}"
-    policy: "{{ item.policy }}"
+    ca_cert: "{{ item.ca_cert | default(omit) }}"
+    client_cert: "{{ item.client_cert | default(omit) }}"
+    client_key: "{{ item.client_key | default(omit) }}"
+    download_concurrency: "{{ item.download_concurrency | default(omit) }}"
+    excludes: "{{ item.excludes | default(omit) }}"
+    includes: "{{ item.includes | default(omit) }}"
+    policy: "{{ item.policy | default(omit) }}"
+    prereleases: "{{ item.prereleases | default(omit) }}"
+    proxy_url: "{{ item.proxy_url | default(omit) }}"
+    proxy_username: "{{ item.proxy_username | default(omit) }}"
+    proxy_password: "{{ item.proxy_password | default(omit) }}"
+    remote_username: "{{ item.remote_username | default(omit) }}"
+    remote_password: "{{ item.remote_password | default(omit) }}"
+    tls_validation: "{{ item.tls_validation | default(omit) }}"
+    url: "{{ item.url | default(omit) }}"
     state: "{{ item.state }}"
   with_items: "{{ pulp_repository_python_repos }}"
+  loop_control:
+    label: "{{ item.name }}"
 
 - name: Sync PyPI remotes into repositories
   pulp.squeezer.python_sync:
@@ -31,3 +48,5 @@
     remote: "{{ item.name }}-remote"
   with_items: "{{ pulp_repository_python_repos }}"
   when: item.state == "present"
+  loop_control:
+    label: "{{ item.name }}"

roles/pulp_repository/tasks/rpm.yml

@@ -8,6 +8,8 @@
     name: "{{ item.name }}"
     state: "{{ item.state }}"
   with_items: "{{ pulp_repository_rpm_repos }}"
+  loop_control:
+    label: "{{ item.name }}"
 
 - name: Setup RPM remotes
   pulp.squeezer.rpm_remote:
@@ -16,10 +18,22 @@
     password: "{{ pulp_password }}"
     validate_certs: "{{ pulp_validate_certs | bool }}"
     name: "{{ item.name }}-remote"
-    url: "{{ item.url }}"
-    policy: "{{ item.policy }}"
+    ca_cert: "{{ item.ca_cert | default(omit) }}"
+    client_cert: "{{ item.client_cert | default(omit) }}"
+    client_key: "{{ item.client_key | default(omit) }}"
+    download_concurrency: "{{ item.download_concurrency | default(omit) }}"
+    policy: "{{ item.policy | default(omit) }}"
+    proxy_url: "{{ item.proxy_url | default(omit) }}"
+    proxy_username: "{{ item.proxy_username | default(omit) }}"
+    proxy_password: "{{ item.proxy_password | default(omit) }}"
+    remote_username: "{{ item.remote_username | default(omit) }}"
+    remote_password: "{{ item.remote_password | default(omit) }}"
+    tls_validation: "{{ item.tls_validation | default(omit) }}"
+    url: "{{ item.url | default(omit) }}"
     state: "{{ item.state }}"
   with_items: "{{ pulp_repository_rpm_repos }}"
+  loop_control:
+    label: "{{ item.name }}"
 
 - name: Sync RPM remotes into repositories
   pulp.squeezer.rpm_sync:
@@ -32,3 +46,5 @@
     sync_policy: "{{ item.sync_policy | default(omit) }}"
   with_items: "{{  pulp_repository_rpm_repos }}"
   when: item.state == "present"
+  loop_control:
+    label: "{{ item.name }}"