Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
40dc47c6
Commit
40dc47c6
authored
Jul 10, 2020
by
Tiger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use valid bucket name in Terraform state examples
parent
7315fd5e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
config/gitlab.yml.example
config/gitlab.yml.example
+2
-2
doc/administration/terraform_state.md
doc/administration/terraform_state.md
+2
-2
spec/support/helpers/stub_object_storage.rb
spec/support/helpers/stub_object_storage.rb
+1
-1
No files found.
config/gitlab.yml.example
View file @
40dc47c6
...
...
@@ -360,7 +360,7 @@ production: &base
# storage_path: shared/terraform_state
object_store:
enabled: false
remote_directory: terraform
_state
# The bucket name
remote_directory: terraform # The bucket name
connection:
provider: AWS
aws_access_key_id: AWS_ACCESS_KEY_ID
...
...
@@ -1253,7 +1253,7 @@ test:
storage_path: tmp/tests/terraform_state
object_store:
enabled: false
remote_directory: terraform
_state
remote_directory: terraform
connection:
provider: AWS # Only AWS supported at the moment
aws_access_key_id: AWS_ACCESS_KEY_ID
...
...
doc/administration/terraform_state.md
View file @
40dc47c6
...
...
@@ -78,7 +78,7 @@ See [the available connection settings for different providers](object_storage.m
```
ruby
gitlab_rails
[
'terraform_state_enabled'
]
=
true
gitlab_rails
[
'terraform_state_object_store_enabled'
]
=
true
gitlab_rails
[
'terraform_state_object_store_remote_directory'
]
=
"terraform
_state
"
gitlab_rails
[
'terraform_state_object_store_remote_directory'
]
=
"terraform"
gitlab_rails
[
'terraform_state_object_store_connection'
]
=
{
'provider'
=>
'AWS'
,
'region'
=>
'eu-central-1'
,
...
...
@@ -110,7 +110,7 @@ See [the available connection settings for different providers](object_storage.m
enabled
:
true
object_store
:
enabled
:
true
remote_directory
:
"
terraform
_state
"
# The bucket name
remote_directory
:
"
terraform"
# The bucket name
connection
:
provider
:
AWS
# Only AWS supported at the moment
aws_access_key_id
:
AWS_ACESS_KEY_ID
...
...
spec/support/helpers/stub_object_storage.rb
View file @
40dc47c6
...
...
@@ -73,7 +73,7 @@ module StubObjectStorage
def
stub_terraform_state_object_storage
(
uploader
=
described_class
,
**
params
)
stub_object_storage_uploader
(
config:
Gitlab
.
config
.
terraform_state
.
object_store
,
uploader:
uploader
,
remote_directory:
'terraform
_state
'
,
remote_directory:
'terraform'
,
**
params
)
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment