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
b21e823c
Commit
b21e823c
authored
Mar 09, 2020
by
Alishan Ladhani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add setting for terraform state storage
parent
750b5b03
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
0 deletions
+39
-0
config/gitlab.yml.example
config/gitlab.yml.example
+31
-0
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+8
-0
No files found.
config/gitlab.yml.example
View file @
b21e823c
...
...
@@ -320,6 +320,24 @@ production: &base
# aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
# path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
## Terraform state
terraform_state:
enabled: true
# The location where Terraform state files are stored (default: shared/terraform_state).
# storage_path: shared/terraform_state
object_store:
enabled: false
remote_directory: terraform_state # The bucket name
connection:
provider: AWS
aws_access_key_id: AWS_ACCESS_KEY_ID
aws_secret_access_key: AWS_SECRET_ACCESS_KEY
region: us-east-1
# host: 'localhost' # default: s3.amazonaws.com
# endpoint: 'http://127.0.0.1:9000' # default: nil
# aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4.
# path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object'
## GitLab Pages
pages:
enabled: false
...
...
@@ -1193,6 +1211,19 @@ test:
aws_access_key_id: AWS_ACCESS_KEY_ID
aws_secret_access_key: AWS_SECRET_ACCESS_KEY
region: us-east-1
terraform_state:
enabled: true
storage_path: tmp/tests/terraform_state
object_store:
enabled: false
remote_directory: terraform_state
connection:
provider: AWS # Only AWS supported at the moment
aws_access_key_id: AWS_ACCESS_KEY_ID
aws_secret_access_key: AWS_SECRET_ACCESS_KEY
region: us-east-1
gitlab:
host: localhost
port: 80
...
...
config/initializers/1_settings.rb
View file @
b21e823c
...
...
@@ -369,6 +369,14 @@ Gitlab.ee do
Settings
.
dependency_proxy
[
'enabled'
]
=
false
unless
Gitlab
::
Runtime
.
puma?
end
#
# Terraform state
#
Settings
[
'terraform_state'
]
||=
Settingslogic
.
new
({})
Settings
.
terraform_state
[
'enabled'
]
=
true
if
Settings
.
terraform_state
[
'enabled'
].
nil?
Settings
.
terraform_state
[
'storage_path'
]
=
Settings
.
absolute
(
Settings
.
terraform_state
[
'storage_path'
]
||
File
.
join
(
Settings
.
shared
[
'path'
],
"terraform_state"
))
Settings
.
terraform_state
[
'object_store'
]
=
ObjectStoreSettings
.
parse
(
Settings
.
terraform_state
[
'object_store'
])
#
# Mattermost
#
...
...
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