Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _topic_maps/_topic_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1252,8 +1252,8 @@ Topics:
File: configuring-registry-storage-aws-user-infrastructure
- Name: Configuring the registry for GCP user-provisioned infrastructure
File: configuring-registry-storage-gcp-user-infrastructure
# - Name: Configuring the registry for OpenStack user-provisioned infrastructure
# File: configuring-registry-storage-openstack-user-infrastructure
- Name: Configuring the registry for OpenStack user-provisioned infrastructure
File: configuring-registry-storage-openstack-user-infrastructure
- Name: Configuring the registry for Azure user-provisioned infrastructure
File: configuring-registry-storage-azure-user-infrastructure
- Name: Configuring the registry for OpenStack
Expand Down
21 changes: 21 additions & 0 deletions modules/registry-configuring-registry-storage-swift-trust.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Module included in the following assemblies:
//
// * registry/installing-openstack- .adoc
// * registry/configuring-registry-operator.adoc
// * registry/configuring-registry-storage-openstack-user-infrastructure.adoc
:_content-type: PROCEDURE
[id="registry-configuring-registry-storage-swift-trust_{context}"]
= Configuring the Image Registry Operator to trust Swift storage

You must configure the Image Registry Operator to trust {rh-openstack-first} Swift storage.

// to allow the client to pull the image layers from the image registry rather than from links directly from Swift.

Copy link
Contributor

Choose a reason for hiding this comment

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

Does this procedure have prereqs? It looks like there's nothing to change in the command itself, so I suspect there might be. You might want to add them at some point.

.Procedure

* From a command line, enter the following command to change the value of the `spec.disableRedirect` field in the `config.imageregistry` object to `true`:
+
[source,terminal]
Copy link
Member

Choose a reason for hiding this comment

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

According to https://bugzilla.redhat.com/show_bug.cgi?id=1810461#c13, the following should be all that is needed:

$ oc patch configs.imageregistry.operator.openshift.io cluster --type merge --patch '{"spec":{"disableRedirect":"true"}}'

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mandre As in that command should be almost the entirety of this PR? Easy enough, if so.

Any thoughts on the second part of this comment? https://bugzilla.redhat.com/show_bug.cgi?id=1810461#c14

Copy link
Member

Choose a reason for hiding this comment

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

@mandre As in that command should be almost the entirety of this PR? Easy enough, if so.

Any thoughts on the second part of this comment? https://bugzilla.redhat.com/show_bug.cgi?id=1810461#c14

If I understand comment 14 correctly what we're doing here (disable redirect) is what the customer has confirmed fixes the issue. I do not think we want to document the other suggested solution as it's a lot more complex and forces the nodes to trust the CA ultimately (while we trust it only when initiating connections to OpenStack otherwise).

----
$ oc patch configs.imageregistry.operator.openshift.io cluster --type merge --patch '{"spec":{"disableRedirect":true}}'
----
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ include::modules/common-attributes.adoc[]

toc::[]

You can configure the registry of a cluster that runs on your own {rh-openstack-first} infrastructure.

include::modules/registry-configuring-registry-storage-swift-trust.adoc[leveloffset=+1]

include::modules/registry-operator-config-resources-secret-openstack.adoc[leveloffset=+1]

include::modules/registry-configuring-storage-openstack-user-infra.adoc[leveloffset=+1]

include::modules/registry-operator-configuration-resource-overview-openstack-swift.adoc[leveloffset=+1]


////
This assembly is commented out for 4.2. When OpenStack UPI GAs, we can updated the associated modules and allow this assembly to build.
////