Bring back Azure UPI registry storage

openshift · Feb 18, 2020 · 1b2dbe8 · 1b2dbe8
1 parent 8726dc9
commit 1b2dbe8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/_topic_map.yml b/_topic_map.yml
@@ -509,8 +509,8 @@ Topics:
     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 Azure user-provisioned infrastructure
-#    File: configuring-registry-storage-azure-user-infrastructure
+  - Name: Configuring the registry for Azure user-provisioned infrastructure
+    File: configuring-registry-storage-azure-user-infrastructure
   - Name: Configuring the registry for bare metal
     File: configuring-registry-storage-baremetal
   - Name: Configuring the registry for vSphere

diff --git a/modules/registry-configuring-storage-azure-user-infra.adoc b/modules/registry-configuring-storage-azure-user-infra.adoc
@@ -18,6 +18,15 @@ cloud credentials.
 
 .Procedure
 
- link:https://docs.microsoft.com/en-us/azure/storage/blobs/storage-quickstart-blobs-portal[Create an Azure storage container] and provide the `accountName` and
- `container` parameters for `ImageRegistryConfigStorageAzure` on the
- configuration image registry resource, `configs.imageregistry.operator.openshift.io`, `spec.storage.azure` file.
+. Create an link:https://docs.microsoft.com/en-us/azure/storage/blobs/storage-quickstart-blobs-portal[Azure storage container].
+
+. Fill in the storage configuration in `configs.imageregistry.operator.openshift.io/cluster`:
++
+----
+$ oc edit configs.imageregistry.operator.openshift.io/cluster
+
+storage:
+  azure:
+    accountName: <account-name>
+    container: <container-name>
+----
diff --git a/registry/configuring-registry-operator.adoc b/registry/configuring-registry-operator.adoc
@@ -47,5 +47,6 @@ include::modules/registry-operator-config-resources-storage-credentials.adoc[lev
 
 * xref:../registry/configuring_registry_storage/configuring-registry-storage-aws-user-infrastructure.adoc#configuring-registry-storage-aws-user-infrastructure[Configuring the registry for AWS user-provisioned infrastructure]
 * xref:../registry/configuring_registry_storage/configuring-registry-storage-gcp-user-infrastructure.adoc#configuring-registry-storage-gcp-user-infrastructure[Configuring the registry for GCP user-provisioned infrastructure]
+* xref:../registry/configuring_registry_storage/configuring-registry-storage-azure-user-infrastructure.adoc#configuring-registry-storage-azure-user-infrastructure[Configuring the registry for Azure user-provisioned infrastructure]
 * xref:../registry/configuring_registry_storage/configuring-registry-storage-baremetal.adoc#configuring-registry-storage-baremetal[Configuring the registry for bare metal]
 * xref:../registry/configuring_registry_storage/configuring-registry-storage-vsphere.adoc#configuring-registry-storage-vsphere[Configuring the registry for vSphere]
diff --git a/...ng_registry_storage/configuring-registry-storage-azure-user-infrastructure.adoc b/...ng_registry_storage/configuring-registry-storage-azure-user-infrastructure.adoc
@@ -8,7 +8,3 @@ toc::[]
 include::modules/registry-operator-config-resources-secret-azure.adoc[leveloffset=+1]
 
 include::modules/registry-configuring-storage-azure-user-infra.adoc[leveloffset=+1]
-
-////
-This assembly is commented out for 4.2. When Azure UPI GAs, we can updated the associated modules and allow this assembly to build.
-////