Skip to content

Conversation

m-bull
Copy link
Contributor

@m-bull m-bull commented Jan 19, 2023

  • Use https version of Pulp container image if pulp_enable_tls.
  • TLS cert/key location vars.
  • Mount TLS cert/key files into container.

m-bull and others added 2 commits January 19, 2023 16:07
* Sets kolla_docker_registry_insecure to true

We currently don't configure TLS for the the local pulp registry.  This adds the pulp server to the list of insecure-registries, so that we can pull images.

* Remove kolla_docker_registry_insecure override in CI environment

Based on comments in code review.

* Use a better default for kolla_docker_registry_insecure

Hoping this will prevent breakage for people already running pulp with TLS.

(cherry picked from commit 78055cf)
# Base URL of the local Pulp service.
# Default uses the seed node's IP on the admin network.
pulp_url: "http://{{ admin_oc_net_name | net_ip(groups['seed'][0]) }}:80"
pulp_url: "{{ 'https' if pulp_enable_tls else 'http' }}://{{ admin_oc_net_name | net_ip(groups['seed'][0]) }}:80"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pulp_url: "{{ 'https' if pulp_enable_tls else 'http' }}://{{ admin_oc_net_name | net_ip(groups['seed'][0]) }}:80"
pulp_url: "{{ 'https' if pulp_enable_tls | bool else 'http' }}://{{ admin_oc_net_name | net_ip(groups['seed'][0]) }}"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm assuming it switches to 443 when using TLS? If not, should it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good one, thanks. Added pulp_port and a default setting.

@markgoddard
Copy link
Contributor

Is it still a draft?

@m-bull m-bull changed the base branch from stackhpc/wallaby to stackhpc/xena February 3, 2023 16:13
@m-bull m-bull marked this pull request as ready for review February 3, 2023 16:31
@m-bull m-bull requested a review from a team as a code owner February 3, 2023 16:31
@markgoddard markgoddard merged commit ebc3643 into stackhpc/xena Feb 6, 2023
@markgoddard markgoddard deleted the local-pulp-tls branch February 6, 2023 19:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants