From d5d4163347fa130e0353af7b363f873abf4c9042 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Tue, 22 Nov 2022 10:53:22 +0000 Subject: [PATCH 1/6] feat: change loop approach in `pulp_repository` The original loop approach would leak sensitive data in the event the task fails. This new approach does not have this issue as it loops over `name` and use an `index_var` to access the contents of the items. This same approach will also be included in other roles contained within this repository. --- roles/pulp_repository/tasks/container.yml | 62 +++++++++++----------- roles/pulp_repository/tasks/deb.yml | 64 ++++++++++++----------- roles/pulp_repository/tasks/python.yml | 62 +++++++++++----------- roles/pulp_repository/tasks/rpm.yml | 58 ++++++++++---------- 4 files changed, 127 insertions(+), 119 deletions(-) diff --git a/roles/pulp_repository/tasks/container.yml b/roles/pulp_repository/tasks/container.yml index 3724a4e..b18622f 100644 --- a/roles/pulp_repository/tasks/container.yml +++ b/roles/pulp_repository/tasks/container.yml @@ -5,11 +5,11 @@ 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: "{{ pulp_repository_container_repos[repository_index].name }}" + state: "{{ pulp_repository_container_repos[repository_index].state }}" + loop: "{{ pulp_repository_container_repos | map(attribute='name') }}" loop_control: - label: "{{ item.name }}" + index_var: repository_index - name: Setup container remotes pulp.squeezer.container_remote: @@ -17,27 +17,29 @@ username: "{{ pulp_username }}" password: "{{ pulp_password }}" validate_certs: "{{ pulp_validate_certs | bool }}" - name: "{{ item.name }}-remote" - 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) }}" - exclude_tags: "{{ item.exclude_tags | default(omit) }}" - include_tags: "{{ item.include_tags | 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 }}" - when: item.state == "absent" or item.url is defined + name: "{{ pulp_repository_container_repos[repository_index].name }}-remote" + ca_cert: "{{ pulp_repository_container_repos[repository_index].ca_cert | default(omit) }}" + client_cert: "{{ pulp_repository_container_repos[repository_index].client_cert | default(omit) }}" + client_key: "{{ pulp_repository_container_repos[repository_index].client_key | default(omit) }}" + download_concurrency: "{{ pulp_repository_container_repos[repository_index].download_concurrency | default(omit) }}" + exclude_tags: "{{ pulp_repository_container_repos[repository_index].exclude_tags | default(omit) }}" + include_tags: "{{ pulp_repository_container_repos[repository_index].include_tags | default(omit) }}" + policy: "{{ pulp_repository_container_repos[repository_index].policy | default(omit) }}" + proxy_url: "{{ pulp_repository_container_repos[repository_index].proxy_url | default(omit) }}" + proxy_username: "{{ pulp_repository_container_repos[repository_index].proxy_username | default(omit) }}" + proxy_password: "{{ pulp_repository_container_repos[repository_index].proxy_password | default(omit) }}" + remote_username: "{{ pulp_repository_container_repos[repository_index].remote_username | default(omit) }}" + remote_password: "{{ pulp_repository_container_repos[repository_index].remote_password | default(omit) }}" + tls_validation: "{{ pulp_repository_container_repos[repository_index].tls_validation | default(omit) }}" + upstream_name: "{{ pulp_repository_container_repos[repository_index].upstream_name | default(pulp_repository_container_repos[repository_index].name) }}" + url: "{{ pulp_repository_container_repos[repository_index].url | default(omit) }}" + state: "{{ pulp_repository_container_repos[repository_index].state }}" + when: > + pulp_repository_container_repos[repository_index].state == "absent" or + pulp_repository_container_repos[repository_index].url is defined + loop: "{{ pulp_repository_container_repos | map(attribute='name') }}" loop_control: - label: "{{ item.name }}" + index_var: repository_index - name: Sync container remotes into repositories pulp.squeezer.container_sync: @@ -45,11 +47,11 @@ 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 }}" + repository: "{{ pulp_repository_container_repos[repository_index].name }}" + remote: "{{ pulp_repository_container_repos[repository_index].name }}-remote" when: - - item.url is defined - - item.state == "present" + - pulp_repository_container_repos[repository_index].url is defined + - pulp_repository_container_repos[repository_index].state == "present" + loop: "{{ pulp_repository_container_repos | map(attribute='name') }}" loop_control: - label: "{{ item.name }}" + index_var: repository_index diff --git a/roles/pulp_repository/tasks/deb.yml b/roles/pulp_repository/tasks/deb.yml index a3f5efe..39921f1 100644 --- a/roles/pulp_repository/tasks/deb.yml +++ b/roles/pulp_repository/tasks/deb.yml @@ -5,11 +5,11 @@ username: "{{ pulp_username }}" password: "{{ pulp_password }}" validate_certs: "{{ pulp_validate_certs | bool }}" - name: "{{ item.name }}" - state: "{{ item.state }}" - with_items: "{{ pulp_repository_deb_repos }}" + name: "{{ pulp_repository_deb_repos[repository_index].name }}" + state: "{{ pulp_repository_deb_repos[repository_index].state }}" + loop: "{{ pulp_repository_deb_repos | map(attribute='name') }}" loop_control: - label: "{{ item.name }}" + index_var: repository_index - name: Setup DEB remotes pulp.squeezer.deb_remote: @@ -17,27 +17,29 @@ username: "{{ pulp_username }}" password: "{{ pulp_password }}" validate_certs: "{{ pulp_validate_certs | bool }}" - name: "{{ item.name }}-remote" - 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 }}" - when: item.state == "absent" or item.url is defined + name: "{{ pulp_repository_deb_repos[repository_index].name }}-remote" + architectures: "{{ pulp_repository_deb_repos[repository_index].architectures | default(omit) }}" + ca_cert: "{{ pulp_repository_deb_repos[repository_index].ca_cert | default(omit) }}" + client_cert: "{{ pulp_repository_deb_repos[repository_index].client_cert | default(omit) }}" + client_key: "{{ pulp_repository_deb_repos[repository_index].client_key | default(omit) }}" + components: "{{ pulp_repository_deb_repos[repository_index].components | default(omit) }}" + distributions: "{{ pulp_repository_deb_repos[repository_index].distributions | default(omit) }}" + download_concurrency: "{{ pulp_repository_deb_repos[repository_index].download_concurrency | default(omit) }}" + policy: "{{ pulp_repository_deb_repos[repository_index].policy | default(omit) }}" + proxy_url: "{{ pulp_repository_deb_repos[repository_index].proxy_url | default(omit) }}" + proxy_username: "{{ pulp_repository_deb_repos[repository_index].proxy_username | default(omit) }}" + proxy_password: "{{ pulp_repository_deb_repos[repository_index].proxy_password | default(omit) }}" + remote_username: "{{ pulp_repository_deb_repos[repository_index].remote_username | default(omit) }}" + remote_password: "{{ pulp_repository_deb_repos[repository_index].remote_password | default(omit) }}" + tls_validation: "{{ pulp_repository_deb_repos[repository_index].tls_validation | default(omit) }}" + url: "{{ pulp_repository_deb_repos[repository_index].url | default(omit) }}" + state: "{{ pulp_repository_deb_repos[repository_index].state }}" + when: > + pulp_repository_deb_repos[repository_index].state == "absent" or + pulp_repository_deb_repos[repository_index].url is defined + loop: "{{ pulp_repository_deb_repos | map(attribute='name') }}" loop_control: - label: "{{ item.name }}" + index_var: repository_index - name: Sync DEB remotes into repositories pulp.squeezer.deb_sync: @@ -45,12 +47,12 @@ username: "{{ pulp_username }}" password: "{{ pulp_password }}" validate_certs: "{{ pulp_validate_certs | bool }}" - repository: "{{ item.name }}" - remote: "{{ item.name }}-remote" - mirror: "{{ item.mirror | default(omit) }}" - with_items: "{{ pulp_repository_deb_repos }}" + repository: "{{ pulp_repository_deb_repos[repository_index].name }}" + remote: "{{ pulp_repository_deb_repos[repository_index].name }}-remote" + mirror: "{{ pulp_repository_deb_repos[repository_index].mirror | default(omit) }}" when: - - item.url is defined - - item.state == "present" + - pulp_repository_deb_repos[repository_index].url is defined + - pulp_repository_deb_repos[repository_index].state == "present" + loop: "{{ pulp_repository_deb_repos | map(attribute='name') }}" loop_control: - label: "{{ item.name }}" + index_var: repository_index diff --git a/roles/pulp_repository/tasks/python.yml b/roles/pulp_repository/tasks/python.yml index cc2a1f1..b7e95e7 100644 --- a/roles/pulp_repository/tasks/python.yml +++ b/roles/pulp_repository/tasks/python.yml @@ -5,11 +5,11 @@ username: "{{ pulp_username }}" password: "{{ pulp_password }}" validate_certs: "{{ pulp_validate_certs | bool }}" - name: "{{ item.name }}" - state: "{{ item.state }}" - with_items: "{{ pulp_repository_python_repos }}" + name: "{{ pulp_repository_python_repos[repository_index].name }}" + state: "{{ pulp_repository_python_repos[repository_index].state }}" + loop: "{{ pulp_repository_python_repos | map(attribute='name') }}" loop_control: - label: "{{ item.name }}" + index_var: repository_index - name: Setup PyPI remotes pulp.squeezer.python_remote: @@ -17,27 +17,29 @@ username: "{{ pulp_username }}" password: "{{ pulp_password }}" validate_certs: "{{ pulp_validate_certs | bool }}" - name: "{{ item.name }}-remote" - 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 }}" - when: item.state == "absent" or item.url is defined + name: "{{ pulp_repository_python_repos[repository_index].name }}-remote" + ca_cert: "{{ pulp_repository_python_repos[repository_index].ca_cert | default(omit) }}" + client_cert: "{{ pulp_repository_python_repos[repository_index].client_cert | default(omit) }}" + client_key: "{{ pulp_repository_python_repos[repository_index].client_key | default(omit) }}" + download_concurrency: "{{ pulp_repository_python_repos[repository_index].download_concurrency | default(omit) }}" + excludes: "{{ pulp_repository_python_repos[repository_index].excludes | default(omit) }}" + includes: "{{ pulp_repository_python_repos[repository_index].includes | default(omit) }}" + policy: "{{ pulp_repository_python_repos[repository_index].policy | default(omit) }}" + prereleases: "{{ pulp_repository_python_repos[repository_index].prereleases | default(omit) }}" + proxy_url: "{{ pulp_repository_python_repos[repository_index].proxy_url | default(omit) }}" + proxy_username: "{{ pulp_repository_python_repos[repository_index].proxy_username | default(omit) }}" + proxy_password: "{{ pulp_repository_python_repos[repository_index].proxy_password | default(omit) }}" + remote_username: "{{ pulp_repository_python_repos[repository_index].remote_username | default(omit) }}" + remote_password: "{{ pulp_repository_python_repos[repository_index].remote_password | default(omit) }}" + tls_validation: "{{ pulp_repository_python_repos[repository_index].tls_validation | default(omit) }}" + url: "{{ pulp_repository_python_repos[repository_index].url | default(omit) }}" + state: "{{ pulp_repository_python_repos[repository_index].state }}" + when: > + pulp_repository_python_repos[repository_index].state == "absent" or + pulp_repository_python_repos[repository_index].url is defined + loop: "{{ pulp_repository_python_repos | map(attribute='name') }}" loop_control: - label: "{{ item.name }}" + index_var: repository_index - name: Sync PyPI remotes into repositories pulp.squeezer.python_sync: @@ -45,11 +47,11 @@ username: "{{ pulp_username }}" password: "{{ pulp_password }}" validate_certs: "{{ pulp_validate_certs | bool }}" - repository: "{{ item.name }}" - remote: "{{ item.name }}-remote" - with_items: "{{ pulp_repository_python_repos }}" + repository: "{{ pulp_repository_python_repos[repository_index].name }}" + remote: "{{ pulp_repository_python_repos[repository_index].name }}-remote" when: - - item.url is defined - - item.state == "present" + - pulp_repository_python_repos[repository_index].url is defined + - pulp_repository_python_repos[repository_index].state == "present" + loop: "{{ pulp_repository_python_repos | map(attribute='name') }}" loop_control: - label: "{{ item.name }}" + index_var: repository_index diff --git a/roles/pulp_repository/tasks/rpm.yml b/roles/pulp_repository/tasks/rpm.yml index 904e3d9..14fdf47 100644 --- a/roles/pulp_repository/tasks/rpm.yml +++ b/roles/pulp_repository/tasks/rpm.yml @@ -5,11 +5,11 @@ username: "{{ pulp_username }}" password: "{{ pulp_password }}" validate_certs: "{{ pulp_validate_certs | bool }}" - name: "{{ item.name }}" - state: "{{ item.state }}" - with_items: "{{ pulp_repository_rpm_repos }}" + name: "{{ pulp_repository_rpm_repos[repository_index].name }}" + state: "{{ pulp_repository_rpm_repos[repository_index].state }}" + loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}" loop_control: - label: "{{ item.name }}" + index_var: repository_index" - name: Setup RPM remotes pulp.squeezer.rpm_remote: @@ -17,24 +17,26 @@ username: "{{ pulp_username }}" password: "{{ pulp_password }}" validate_certs: "{{ pulp_validate_certs | bool }}" - name: "{{ item.name }}-remote" - 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 }}" - when: item.state == "absent" or item.url is defined + name: "{{ pulp_repository_rpm_repos[repository_index].name }}-remote" + ca_cert: "{{ pulp_repository_rpm_repos[repository_index].ca_cert | default(omit) }}" + client_cert: "{{ pulp_repository_rpm_repos[repository_index].client_cert | default(omit) }}" + client_key: "{{ pulp_repository_rpm_repos[repository_index].client_key | default(omit) }}" + download_concurrency: "{{ pulp_repository_rpm_repos[repository_index].download_concurrency | default(omit) }}" + policy: "{{ pulp_repository_rpm_repos[repository_index].policy | default(omit) }}" + proxy_url: "{{ pulp_repository_rpm_repos[repository_index].proxy_url | default(omit) }}" + proxy_username: "{{ pulp_repository_rpm_repos[repository_index].proxy_username | default(omit) }}" + proxy_password: "{{ pulp_repository_rpm_repos[repository_index].proxy_password | default(omit) }}" + remote_username: "{{ pulp_repository_rpm_repos[repository_index].remote_username | default(omit) }}" + remote_password: "{{ pulp_repository_rpm_repos[repository_index].remote_password | default(omit) }}" + tls_validation: "{{ pulp_repository_rpm_repos[repository_index].tls_validation | default(omit) }}" + url: "{{ pulp_repository_rpm_repos[repository_index].url | default(omit) }}" + state: "{{ pulp_repository_rpm_repos[repository_index].state }}" + when: > + pulp_repository_rpm_repos[repository_index].state == "absent" or + pulp_repository_rpm_repos[repository_index].url is defined + loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}" loop_control: - label: "{{ item.name }}" + index_var: repository_index" - name: Sync RPM remotes into repositories pulp.squeezer.rpm_sync: @@ -42,12 +44,12 @@ username: "{{ pulp_username }}" password: "{{ pulp_password }}" validate_certs: "{{ pulp_validate_certs | bool }}" - repository: "{{ item.name }}" - remote: "{{ item.name }}-remote" - sync_policy: "{{ item.sync_policy | default(omit) }}" - with_items: "{{ pulp_repository_rpm_repos }}" + repository: "{{ pulp_repository_rpm_repos[repository_index].name }}" + remote: "{{ pulp_repository_rpm_repos[repository_index].name }}-remote" + sync_policy: "{{ pulp_repository_rpm_repos[repository_index].sync_policy | default(omit) }}" when: - - item.url is defined - - item.state == "present" + - pulp_repository_rpm_repos[repository_index].url is defined + - pulp_repository_rpm_repos[repository_index].state == "present" + loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}" loop_control: - label: "{{ item.name }}" + index_var: repository_index" From 0e833285d7811f4d4904fbce13403464c856787f Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Tue, 22 Nov 2022 11:32:05 +0000 Subject: [PATCH 2/6] feat: change loop approach in `pulp_django_user` --- roles/pulp_django_user/tasks/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/pulp_django_user/tasks/main.yml b/roles/pulp_django_user/tasks/main.yml index 03a1803..532a84d 100644 --- a/roles/pulp_django_user/tasks/main.yml +++ b/roles/pulp_django_user/tasks/main.yml @@ -37,15 +37,15 @@ Cookie: "{{ result_login.cookies_string }}" body: csrfmiddlewaretoken: "{{ result_login.cookies.csrftoken }}" - username: "{{ item.username }}" - password1: "{{ item.password }}" - password2: "{{ item.password }}" + username: "{{ pulp_django_users[user_index].username }}" + password1: "{{ pulp_django_users[user_index].password }}" + password2: "{{ pulp_django_users[user_index].password }}" body_format: form-urlencoded follow_redirects: all validate_certs: "{{ pulp_validate_certs | bool }}" - loop: "{{ pulp_django_users }}" + loop: "{{ pulp_django_users | map(attribute='username') }}" loop_control: - label: "{{ item.username }}" + index_var: user_index - name: Add or remove user from group(s) include_tasks: user_groups/add_or_remove_users.yml From d908c84a2261418ae6b59e4a645ea5061e04e926 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Tue, 22 Nov 2022 11:34:30 +0000 Subject: [PATCH 3/6] feat: change loop approach in `pulp_content_guard` --- roles/pulp_content_guard/tasks/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/pulp_content_guard/tasks/main.yml b/roles/pulp_content_guard/tasks/main.yml index 022ab23..36412e6 100644 --- a/roles/pulp_content_guard/tasks/main.yml +++ b/roles/pulp_content_guard/tasks/main.yml @@ -5,13 +5,13 @@ username: "{{ pulp_username }}" password: "{{ pulp_password }}" validate_certs: "{{ pulp_validate_certs | bool }}" - name: "{{ item.name }}" - description: "{{ item.description | default(omit) }}" - ca_certificate: "{{ item.ca_certificate | default(omit) }}" - state: "{{ item.state }}" - with_items: "{{ pulp_content_guard_x509_cert_guards }}" + name: "{{ pulp_content_guard_x509_cert_guards[cert_guard_index].name }}" + description: "{{ pulp_content_guard_x509_cert_guards[cert_guard_index].description | default(omit) }}" + ca_certificate: "{{ pulp_content_guard_x509_cert_guards[cert_guard_index].ca_certificate | default(omit) }}" + state: "{{ pulp_content_guard_x509_cert_guards[cert_guard_index].state }}" + loop: "{{ pulp_content_guard_x509_cert_guards | map(attribute='name') }}" loop_control: - label: "{{ item.name }}" + index_var: cert_guard_index - name: Ensure RBAC cert guards exist import_tasks: rbac/rbac.yml From 05cc205a68a3f98f1249d99ba0a732c2dcebe69a Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Tue, 22 Nov 2022 11:54:16 +0000 Subject: [PATCH 4/6] fix: incorrect indentation on `loop` --- roles/pulp_repository/tasks/container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/pulp_repository/tasks/container.yml b/roles/pulp_repository/tasks/container.yml index b18622f..3a32cd4 100644 --- a/roles/pulp_repository/tasks/container.yml +++ b/roles/pulp_repository/tasks/container.yml @@ -7,7 +7,7 @@ validate_certs: "{{ pulp_validate_certs | bool }}" name: "{{ pulp_repository_container_repos[repository_index].name }}" state: "{{ pulp_repository_container_repos[repository_index].state }}" - loop: "{{ pulp_repository_container_repos | map(attribute='name') }}" + loop: "{{ pulp_repository_container_repos | map(attribute='name') }}" loop_control: index_var: repository_index From 7b44301ec9d306eab9fec833cfa5eba5b7d2c208 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Tue, 22 Nov 2022 12:57:54 +0000 Subject: [PATCH 5/6] fix: remove unwanted `double quote` --- roles/pulp_repository/tasks/rpm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/pulp_repository/tasks/rpm.yml b/roles/pulp_repository/tasks/rpm.yml index 14fdf47..c6fa896 100644 --- a/roles/pulp_repository/tasks/rpm.yml +++ b/roles/pulp_repository/tasks/rpm.yml @@ -9,7 +9,7 @@ state: "{{ pulp_repository_rpm_repos[repository_index].state }}" loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}" loop_control: - index_var: repository_index" + index_var: repository_index - name: Setup RPM remotes pulp.squeezer.rpm_remote: From 6e5b2cdc7097d45072f05b4a58aae6911942db0b Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Tue, 22 Nov 2022 13:17:00 +0000 Subject: [PATCH 6/6] fix: remove remaining unwanted `double quotes` --- roles/pulp_repository/tasks/rpm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/pulp_repository/tasks/rpm.yml b/roles/pulp_repository/tasks/rpm.yml index c6fa896..6388b20 100644 --- a/roles/pulp_repository/tasks/rpm.yml +++ b/roles/pulp_repository/tasks/rpm.yml @@ -36,7 +36,7 @@ pulp_repository_rpm_repos[repository_index].url is defined loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}" loop_control: - index_var: repository_index" + index_var: repository_index - name: Sync RPM remotes into repositories pulp.squeezer.rpm_sync: @@ -52,4 +52,4 @@ - pulp_repository_rpm_repos[repository_index].state == "present" loop: "{{ pulp_repository_rpm_repos | map(attribute='name') }}" loop_control: - index_var: repository_index" + index_var: repository_index