Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 57 deletions

diff --git a/doc/administration/uploads.md b/doc/administration/uploads.md
index aba7b5fc318..376c1668444 100644
--- a/doc/administration/uploads.md
+++ b/doc/administration/uploads.md
@@ -130,60 +130,3 @@ _The uploads are stored by default in
 
 1. Save the file and [restart GitLab](restart_gitlab.md#installations-from-source) for the changes to take effect.
 1. Migrate any existing local uploads to the object storage using [`gitlab:uploads:migrate:all` Rake task](raketasks/uploads/migrate.md).
-
-#### OpenStack example
-
-**In Omnibus installations:**
-
-_The uploads are stored by default in
-`/var/opt/gitlab/gitlab-rails/uploads`._
-
-1. Edit `/etc/gitlab/gitlab.rb` and add the following lines by replacing with
-   the values you want:
-
-   ```ruby
-   gitlab_rails['uploads_object_store_remote_directory'] = "OPENSTACK_OBJECT_CONTAINER_NAME"
-   gitlab_rails['uploads_object_store_connection'] = {
-    'provider' => 'OpenStack',
-    'openstack_username' => 'OPENSTACK_USERNAME',
-    'openstack_api_key' => 'OPENSTACK_PASSWORD',
-    'openstack_temp_url_key' => 'OPENSTACK_TEMP_URL_KEY',
-    'openstack_auth_url' => 'https://auth.cloud.ovh.net/v2.0/',
-    'openstack_region' => 'DE1',
-    'openstack_tenant' => 'TENANT_ID',
-   }
-   ```
-
-1. Save the file and [reconfigure GitLab](restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
-1. Migrate any existing local uploads to the object storage using [`gitlab:uploads:migrate:all` Rake task](raketasks/uploads/migrate.md).
-
----
-
-**In installations from source:**
-
-_The uploads are stored by default in
-`/home/git/gitlab/public/uploads`._
-
-1. Edit `/home/git/gitlab/config/gitlab.yml` and add or amend the following
-   lines:
-
-   ```yaml
-   uploads:
-     object_store:
-       enabled: true
-       direct_upload: false
-       background_upload: true
-       proxy_download: false
-       remote_directory: OPENSTACK_OBJECT_CONTAINER_NAME
-       connection:
-         provider: OpenStack
-         openstack_username: OPENSTACK_USERNAME
-         openstack_api_key: OPENSTACK_PASSWORD
-         openstack_temp_url_key: OPENSTACK_TEMP_URL_KEY
-         openstack_auth_url: 'https://auth.cloud.ovh.net/v2.0/'
-         openstack_region: DE1
-         openstack_tenant: 'TENANT_ID'
-   ```
-
-1. Save the file and [reconfigure GitLab](restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
-1. Migrate any existing local uploads to the object storage using [`gitlab:uploads:migrate:all` Rake task](raketasks/uploads/migrate.md).