Skip to content

Commit 93d5720

Browse files
authored
Merge pull request #214 from sap-contributions/azure_storage-cli
Update Azure Storage blobstore documentation
2 parents c269e36 + 8f33cc4 commit 93d5720

File tree

1 file changed

+35
-15
lines changed

1 file changed

+35
-15
lines changed

common/cc-blobstore-config.html.md.erb

Lines changed: 35 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ The [`cf-deployment`](https://github.com/cloudfoundry/cf-deployment/blob/master/
1313
By default, `cf-deployment` uses the WebDAV blobstore, and no additional ops files are needed.
1414
If you want to configure your blobstore manually, see the topics below for guidance.
1515

16-
The Cloud Controller has four types of objects that need to be stored in a blobstore: <code>buildpacks</code>, <code>droplets</code>, <code>packages</code>, and <code>resource_pool</code>. By default, the blobstore configuration uses the Fog Ruby gem, but can also use the WebDAV protocol.
16+
The Cloud Controller has four types of objects that need to be stored in a blobstore: <code>buildpacks</code>, <code>droplets</code>, <code>packages</code>, and <code>resource_pool</code>.
17+
18+
For accessing an external hyperscaler blobstore, there are two supported blobstore providers: the Ruby Fog gem and the [`Storage CLI`](https://github.com/cloudfoundry/storage-cli) solution. The new Storage CLI solution is currently being rolled out across major hyperscalers (for example, AliCloud and Azure). The goal is to replace the deprecated Ruby Fog implementation. Until the rollout is complete, Ruby Fog remains the default for some providers.
19+
20+
WebDAV is also supported for an internal blobstore, and blobstores on NFS-mounted directories are supported through the Fog gem.
1721

1822
This document describes the following common blobstore configurations:
1923

@@ -22,7 +26,7 @@ This document describes the following common blobstore configurations:
2226
* [Fog with AWS IAM Instance Profiles](#fog-aws-iam)
2327
* [Fog with Google Cloud Storage](#fog-gcs)
2428
* [Fog with Google Cloud Storage Service Accounts](#fog-gcs-service-account)
25-
* [Fog with Azure Storage](#fog-azure)
29+
* [Storage CLI with Azure Storage](#storage-cli-azure)
2630
* [Fog with Other S3 Compatible Stores](#fog-s3-other)
2731
* [Fog with NFS](#fog-local-nfs)
2832
* [WebDAV](#webdav) internal blobstore
@@ -355,7 +359,7 @@ You need this key to configure your blobstore.
355359
resource_pool: *resource_pool
356360
```
357361

358-
##<a id="fog-azure"></a>Fog with Azure Storage
362+
##<a id="storage-cli-azure"></a>Storage CLI with Azure Storage
359363

360364
To configure your blobstores to use Azure Storage credentials, do the following:
361365

@@ -364,25 +368,41 @@ To configure your blobstores to use Azure Storage credentials, do the following:
364368
```
365369
cc:
366370
buildpacks:
367-
blobstore_type: fog
371+
blobstore_provider: AzureRM
372+
blobstore_type: storage-cli
368373
buildpack_directory_key: YOUR-AZURE-BUILDPACK-CONTAINER
369-
fog_connection: &fog_connection
370-
provider: AzureRM
371-
environment: AzureCloud
372-
azure_storage_account_name: YOUR-AZURE-STORAGE-ACCOUNT-NAME
374+
connection_config:
373375
azure_storage_access_key: YOUR-AZURE-STORAGE-ACCESS-KEY
376+
azure_storage_account_name: YOUR-AZURE-STORAGE-ACCOUNT-NAME
377+
container_name: YOUR-AZURE-BUILDPACK-CONTAINER
378+
environment: AzureCloud
374379
droplets:
375-
blobstore_type: fog
380+
blobstore_provider: AzureRM
381+
blobstore_type: storage-cli
376382
droplet_directory_key: YOUR-AZURE-DROPLET-CONTAINER
377-
fog_connection: *fog_connection
383+
connection_config:
384+
azure_storage_access_key: YOUR-AZURE-STORAGE-ACCESS-KEY
385+
azure_storage_account_name: YOUR-AZURE-STORAGE-ACCOUNT-NAME
386+
container_name: YOUR-AZURE-DROPLET-CONTAINER
387+
environment: AzureCloud
378388
packages:
379-
blobstore_type: fog
389+
blobstore_provider: AzureRM
390+
blobstore_type: storage-cli
380391
app_package_directory_key: YOUR-AZURE-PACKAGE-CONTAINER
381-
fog_connection: *fog_connection
392+
connection_config:
393+
azure_storage_access_key: YOUR-AZURE-STORAGE-ACCESS-KEY
394+
azure_storage_account_name: YOUR-AZURE-STORAGE-ACCOUNT-NAME
395+
container_name: YOUR-AZURE-PACKAGE-CONTAINER
396+
environment: AzureCloud
382397
resource_pool:
383-
blobstore_type: fog
398+
blobstore_provider: AzureRM
399+
blobstore_type: storage-cli
384400
resource_directory_key: YOUR-AZURE-RESOURCE-CONTAINER
385-
fog_connection: *fog_connection
401+
connection_config:
402+
azure_storage_access_key: YOUR-AZURE-STORAGE-ACCESS-KEY
403+
azure_storage_account_name: YOUR-AZURE-STORAGE-ACCOUNT-NAME
404+
container_name: YOUR-AZURE-RESOURCE-CONTAINER
405+
environment: AzureCloud
386406
```
387407

388408
1. Replace `YOUR-AZURE-STORAGE-ACCOUNT-NAME` and `YOUR-AZURE-STORAGE-ACCESS-KEY` with your Azure Storage credentials.
@@ -394,7 +414,7 @@ To configure your blobstores to use Azure Storage credentials, do the following:
394414
only lowercase alphanumeric characters and hyphens.
395415
See [Azure's storage name restrictions][azure-name-restrictions].
396416

397-
1. You can provide further configuration through the `fog_connection` hash, which is passed through to the Fog gem.
417+
1. You can provide further configuration through the `connection_config` hash, which is passed through to the [`Storage CLI`](https://github.com/cloudfoundry/storage-cli) implementation.
398418

399419
##<a id="fog-s3-other"></a> Fog with Other S3 Compatible Stores
400420

0 commit comments

Comments
 (0)