Apply suggestions from code review

Author: jovial

roles/pulp_repository/defaults/main.yml

@@ -12,14 +12,14 @@ pulp_repository_rpm_repos: []
 pulp_repository_sync_retries: 3
 
 pulp_repository_container_repos_sync_retries: "{{ pulp_repository_sync_retries }}"
-pulp_repository_container_repos_remotes_retries: "{{ pulp_repository_sync_retries }}"
-pulp_repository_container_repos_repositories_retries: "{{ pulp_repository_sync_retries }}"
+pulp_repository_container_remotes_retries: "{{ pulp_repository_sync_retries }}"
+pulp_repository_container_repositories_retries: "{{ pulp_repository_sync_retries }}"
 pulp_repository_deb_repos_sync_retries: "{{ pulp_repository_sync_retries }}"
-pulp_repository_deb_repos_remotes_retries: "{{ pulp_repository_sync_retries }}"
-pulp_repository_deb_repos_repositories_retries: "{{ pulp_repository_sync_retries }}"
+pulp_repository_deb_remotes_retries: "{{ pulp_repository_sync_retries }}"
+pulp_repository_deb_repositories_retries: "{{ pulp_repository_sync_retries }}"
 pulp_repository_python_repos_sync_retries: "{{ pulp_repository_sync_retries }}"
-pulp_repository_python_repos_remotes_retries: "{{ pulp_repository_sync_retries }}"
-pulp_repository_python_repos_repositories_retries: "{{ pulp_repository_sync_retries }}"
+pulp_repository_python_remotes_retries: "{{ pulp_repository_sync_retries }}"
+pulp_repository_python_repositories_retries: "{{ pulp_repository_sync_retries }}"
 pulp_repository_rpm_repos_sync_retries: "{{ pulp_repository_sync_retries }}"
-pulp_repository_rpm_repos_remotes_retries: "{{ pulp_repository_sync_retries }}"
-pulp_repository_rpm_repos_repositories_retries: "{{ pulp_repository_sync_retries }}"
+pulp_repository_rpm_remotes_retries: "{{ pulp_repository_sync_retries }}"
+pulp_repository_rpm_repositories_retries: "{{ pulp_repository_sync_retries }}"

roles/pulp_repository/tasks/deb.yml

@@ -10,9 +10,9 @@
   loop: "{{ pulp_repository_deb_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
-  register: pulp_repository_deb_repos_repositories
-  until: "pulp_repository_deb_repos_repositories is not failed"
-  retries: "{{ pulp_repository_deb_repos_repositories_retries }}"
+  register: pulp_repository_deb_repositories
+  until: "pulp_repository_deb_repositories is not failed"
+  retries: "{{ pulp_repository_deb_repositories_retries }}"
   delay: 1
 
 - name: Setup DEB remotes
@@ -44,9 +44,9 @@
   loop: "{{ pulp_repository_deb_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
-  register: pulp_repository_deb_repos_remotes
-  until: "pulp_repository_deb_repos_remotes is not failed"
-  retries: "{{ pulp_repository_deb_repos_remotes_retries }}"
+  register: pulp_repository_deb_remotes
+  until: "pulp_repository_deb_remotes is not failed"
+  retries: "{{ pulp_repository_deb_remotes_retries }}"
   delay: 1
 
 - name: Sync DEB remotes into repositories

roles/pulp_repository/tasks/python.yml

@@ -10,9 +10,9 @@
   loop: "{{ pulp_repository_python_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
-  register: pulp_repository_python_repos_repositories
-  until: "pulp_repository_python_repos_repositories is not failed"
-  retries: "{{ pulp_repository_python_repos_repositories_retries }}"
+  register: pulp_repository_python_repositories
+  until: "pulp_repository_python_repositories is not failed"
+  retries: "{{ pulp_repository_python_repositories_retries }}"
   delay: 1
 
 - name: Setup PyPI remotes
@@ -44,9 +44,9 @@
   loop: "{{ pulp_repository_python_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
-  register: pulp_repository_python_repos_remotes
-  until: "pulp_repository_python_repos_remotes is not failed"
-  retries: "{{ pulp_repository_python_repos_remotes_retries }}"
+  register: pulp_repository_python_remotes
+  until: "pulp_repository_python_remotes is not failed"
+  retries: "{{ pulp_repository_python_remotes_retries }}"
   delay: 1
 
 - name: Sync PyPI remotes into repositories

roles/pulp_repository/tasks/rpm.yml

@@ -10,9 +10,9 @@
   loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
-  register: pulp_repository_rpm_repos_repositories
-  until: "pulp_repository_rpm_repos_repositories is not failed"
-  retries: "{{ pulp_repository_rpm_repos_repositories_retries }}"
+  register: pulp_repository_rpm_repositories
+  until: "pulp_repository_rpm_repositories is not failed"
+  retries: "{{ pulp_repository_rpm_repositories_retries }}"
   delay: 1
 
 - name: Setup RPM remotes
@@ -41,9 +41,9 @@
   loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}"
   loop_control:
     index_var: repository_index
-  register: pulp_repository_rpm_repos_remotes
-  until: "pulp_repository_rpm_repos_remotes is not failed"
-  retries: "{{ pulp_repository_rpm_repos_remotes_retries }}"
+  register: pulp_repository_rpm_remotes
+  until: "pulp_repository_rpm_remotes is not failed"
+  retries: "{{ pulp_repository_rpm_remotes_retries }}"
   delay: 1
 
 - name: Sync RPM remotes into repositories