diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index e2f2cfa4fe..4cdeb0208e 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -1291,8 +1291,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 diff --git a/modules/registry-configuring-registry-storage-swift-trust.adoc b/modules/registry-configuring-registry-storage-swift-trust.adoc new file mode 100644 index 0000000000..e90605a106 --- /dev/null +++ b/modules/registry-configuring-registry-storage-swift-trust.adoc @@ -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. + +.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] +---- +$ oc patch configs.imageregistry.operator.openshift.io cluster --type merge --patch '{"spec":{"disableRedirect":true}}' +---- diff --git a/registry/configuring_registry_storage/configuring-registry-storage-openstack-user-infrastructure.adoc b/registry/configuring_registry_storage/configuring-registry-storage-openstack-user-infrastructure.adoc index aa9293e4de..f7fb9df07b 100644 --- a/registry/configuring_registry_storage/configuring-registry-storage-openstack-user-infrastructure.adoc +++ b/registry/configuring_registry_storage/configuring-registry-storage-openstack-user-infrastructure.adoc @@ -6,14 +6,12 @@ include::_attributes/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. -////