From 25879102c0bb4de7228e265ea1b44101a3099089 Mon Sep 17 00:00:00 2001 From: jovial Date: Fri, 4 Feb 2022 10:13:39 +0000 Subject: [PATCH 1/3] Adds pulp_proxy_url Pulp requires you to the proxy for each remote. --- etc/kayobe/pulp.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index b9995077f..685887def 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -10,6 +10,9 @@ pulp_url: "http://{{ admin_oc_net_name | net_ip(groups['seed'][0]) }}:80" pulp_username: admin pulp_password: "{{ secrets_pulp_password }}" +# Proxy to use when adding remotes +pulp_proxy_url: "{{ omit }}" + ############################################################################### # StackHPC Pulp server @@ -25,7 +28,6 @@ stackhpc_release_pulp_password: stackhpc_release_pulp_client_cert: "{{ lookup('file', 'certs/ark.stackhpc.com/client-cert.pem') | trim }}" stackhpc_release_pulp_client_key: "{{ lookup('file', 'certs/ark.stackhpc.com/client-key.pem') | trim }}" - ############################################################################### # RPMs @@ -41,6 +43,7 @@ stackhpc_pulp_repository_rpm_repos: client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand + proxy_url: "{{ pulp_proxy_url }}" sync_policy: mirror_complete state: present - name: CentOS Stream 8 - BaseOS @@ -48,6 +51,7 @@ stackhpc_pulp_repository_rpm_repos: client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand + proxy_url: "{{ pulp_proxy_url }}" sync_policy: mirror_complete state: present - name: CentOS Stream 8 - Extras @@ -55,6 +59,7 @@ stackhpc_pulp_repository_rpm_repos: client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand + proxy_url: "{{ pulp_proxy_url }}" sync_policy: mirror_complete state: present @@ -64,6 +69,7 @@ stackhpc_pulp_repository_rpm_repos: client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand + proxy_url: "{{ pulp_proxy_url }}" sync_policy: mirror_content_only state: present - name: Extra Packages for Enterprise Linux Modular 8 - x86_64 @@ -71,6 +77,7 @@ stackhpc_pulp_repository_rpm_repos: client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand + proxy_url: "{{ pulp_proxy_url }}" sync_policy: mirror_complete state: present @@ -80,6 +87,7 @@ stackhpc_pulp_repository_rpm_repos: client_cert: "{{ stackhpc_release_pulp_client_cert }}" client_key: "{{ stackhpc_release_pulp_client_key }}" policy: on_demand + proxy_url: "{{ pulp_proxy_url }}" sync_policy: mirror_complete state: present @@ -287,6 +295,7 @@ stackhpc_pulp_images: stackhpc_pulp_repository_container_repos_common: url: "{{ stackhpc_release_pulp_registry_url }}" policy: on_demand + proxy_url: "{{ pulp_proxy_url }}" remote_username: "{{ stackhpc_release_pulp_username }}" remote_password: "{{ stackhpc_release_pulp_password }}" state: present From 5b24e5b4f27fd4991c1704c2aa0aff73b2965184 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Tue, 28 Jun 2022 10:37:20 +0100 Subject: [PATCH 2/3] Default to https_proxy Depends on https://review.opendev.org/c/openstack/kayobe/+/814046 --- etc/kayobe/pulp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 685887def..9f08f5747 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -10,8 +10,8 @@ pulp_url: "http://{{ admin_oc_net_name | net_ip(groups['seed'][0]) }}:80" pulp_username: admin pulp_password: "{{ secrets_pulp_password }}" -# Proxy to use when adding remotes -pulp_proxy_url: "{{ omit }}" +# Proxy to use when adding remotes. +pulp_proxy_url: "{{ https_proxy | default(omit) }}" ############################################################################### # StackHPC Pulp server From c2be9be3c915dd0af6e655fb64cd37a104bcd9a5 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Tue, 15 Nov 2022 12:15:09 +0000 Subject: [PATCH 3/3] Update pulp_repo_default The default did not work well when using a proxy deployed on the seed. Leave it up the user to explictly enable. --- etc/kayobe/pulp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 9f08f5747..0e7fbbaac 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -11,7 +11,7 @@ pulp_username: admin pulp_password: "{{ secrets_pulp_password }}" # Proxy to use when adding remotes. -pulp_proxy_url: "{{ https_proxy | default(omit) }}" +pulp_proxy_url: "{{ omit }}" ############################################################################### # StackHPC Pulp server