Skip to content

Commit 8d76074

Browse files
authored
Merge pull request #39641 from maxwelldb/ocponosp-swift-self-cert-bz1810461
[BZ1810461] ShiftStack - Add procedure to allow Image Registry Operator to trust Swift
2 parents 282bd41 + fbc46fe commit 8d76074

File tree

3 files changed

+26
-7
lines changed

3 files changed

+26
-7
lines changed

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,8 +1302,8 @@ Topics:
13021302
File: configuring-registry-storage-aws-user-infrastructure
13031303
- Name: Configuring the registry for GCP user-provisioned infrastructure
13041304
File: configuring-registry-storage-gcp-user-infrastructure
1305-
# - Name: Configuring the registry for OpenStack user-provisioned infrastructure
1306-
# File: configuring-registry-storage-openstack-user-infrastructure
1305+
- Name: Configuring the registry for OpenStack user-provisioned infrastructure
1306+
File: configuring-registry-storage-openstack-user-infrastructure
13071307
- Name: Configuring the registry for Azure user-provisioned infrastructure
13081308
File: configuring-registry-storage-azure-user-infrastructure
13091309
- Name: Configuring the registry for OpenStack
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * registry/installing-openstack- .adoc
4+
// * registry/configuring-registry-operator.adoc
5+
// * registry/configuring-registry-storage-openstack-user-infrastructure.adoc
6+
:_content-type: PROCEDURE
7+
[id="registry-configuring-registry-storage-swift-trust_{context}"]
8+
= Configuring the Image Registry Operator to trust Swift storage
9+
10+
You must configure the Image Registry Operator to trust {rh-openstack-first} Swift storage.
11+
12+
// to allow the client to pull the image layers from the image registry rather than from links directly from Swift.
13+
14+
.Procedure
15+
16+
* From a command line, enter the following command to change the value of the `spec.disableRedirect` field in the `config.imageregistry` object to `true`:
17+
+
18+
[source,terminal]
19+
----
20+
$ oc patch configs.imageregistry.operator.openshift.io cluster --type merge --patch '{"spec":{"disableRedirect":true}}'
21+
----

registry/configuring_registry_storage/configuring-registry-storage-openstack-user-infrastructure.adoc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9+
You can configure the registry of a cluster that runs on your own {rh-openstack-first} infrastructure.
10+
11+
include::modules/registry-configuring-registry-storage-swift-trust.adoc[leveloffset=+1]
912

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

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

1417
include::modules/registry-operator-configuration-resource-overview-openstack-swift.adoc[leveloffset=+1]
15-
16-
17-
////
18-
This assembly is commented out for 4.2. When OpenStack UPI GAs, we can updated the associated modules and allow this assembly to build.
19-
////

0 commit comments

Comments
 (0)