Skip to content

Commit b297bc7

Browse files
author
Aaron Schlesinger
committed
doc(src/installing-deis/configuring-object-storage.md): modify registry and database to reflect their use of objectstorage-keyfile
1 parent e066734 commit b297bc7

1 file changed

Lines changed: 8 additions & 23 deletions

File tree

src/installing-deis/configuring-object-storage.md

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -85,42 +85,27 @@ The slugrunner reads credentials from the below locations on the filesystem.
8585

8686
## [deis/registry](https://github.com/deis/registry)
8787

88+
The registry is configured slightly differently from most of the other components. Read on for details.
89+
8890
### Environment Variables
8991

90-
TODO
92+
The registry looks for a `REGISTRY_STORAGE` environment variable, which it then uses as a key to look up the object storage location and authentication information in a configuration file. See below for details on that file.
9193

9294
### Credentials
9395

94-
The registry reads credentials from the below locations on the filesystem.
95-
96-
- Key: `/var/run/secrets/deis/registry/creds/accesskey`
97-
- Secret: `/var/run/secrets/deis/registry/creds/secretkey`
96+
The registry reads the credential information from a `/var/run/secrets/deis/registry/creds/objectstorage-keyfile` file. See https://github.com/deis/charts/blob/master/deis-dev/tpl/deis-objectstorage-secret.yaml for an example of what that file should look like.
9897

9998
## [deis/database](https://github.com/deis/postgres)
10099

101-
The database is configured slightly differently from the other components. It looks for an environment variable which it then uses as a key to look up the object storage configuration in a config file.
100+
The database is configured slightly differently from the other components. Read the two sections below for details.
102101

103102
### Environment Variables
104103

105-
The database looks for the `DATABASE_STORAGE` environment variable to determine what object storage system to use. Valid values are listed below and the [Helm chart for Deis](https://github.com/deis/charts/tree/master/deis-dev) defaults to `minio`:
106-
107-
- filesystem: Store persistent data on ephemeral disk
108-
- s3: Store persistent data in AWS S3 (configure in S3 section)
109-
- azure: Store persistent data in Azure's object storage
110-
- gcs: Store persistent data in Google Cloud Storage
111-
- minio: Store persistent data on in-cluster Minio server
112-
113-
(TODO: is this correct?)
114-
115-
### Credentials
116-
117-
The database reads credentials from the below locations on the filesystem.
118-
119-
- Key: `/etc/wal-e.d/env/access-key-id`
120-
- Secret: `/etc/wal-e.d/env/access-key-secret`
104+
The database looks for a `DATABASE_STORAGE` environment variable, which it then uses as a key to look up the object storage location and authentication information in a configuration file. See below for the details on that file.
121105

122-
(TODO: is this still correct?)
106+
## Credentials
123107

108+
The database reads the credentials information from a `/var/run/secrets/deis/objectstore/creds/objectstorage-keyfile` file. See https://github.com/deis/charts/blob/master/deis-dev/tpl/deis-objectstorage-secret.yaml for an example of what that file should look like.
124109

125110
# Limitations
126111

0 commit comments

Comments
 (0)