Skip to content

Commit

Permalink
Add msg to consult gsutil team before changing cfg (#826)
Browse files Browse the repository at this point in the history
* Add msg to consult gsutil team before changing cfg

This should help prevent issues like #820.

Fixes #820.

(Note that #823 added the fix; this simply closes out an additional
action-item resulting from that issue.)

* Add another msg where we decide to write the cfg
  • Loading branch information
houglum authored and zmarano committed Aug 1, 2019
1 parent 72bf685 commit 17e2c6e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
class BotoConfig(object):
"""Creates a boto config file for standalone GSUtil."""

# WARNING: The path should remain as /etc/boto.cfg in order to not break
# tools, such as gsutil, that rely on loading well-known Boto config paths.
# If you want to change this, please consult the gsutil team
# (GoogleCloudPlatform/gsutil) first.
boto_config = constants.BOTOCONFDIR + '/etc/boto.cfg'
boto_config_template = constants.BOTOCONFDIR + '/etc/boto.cfg.template'
boto_config_script = os.path.abspath(__file__)
Expand Down Expand Up @@ -81,6 +85,8 @@ def _CreateConfig(self, project_id):
config_file=self.boto_config_template,
config_header=self.boto_config_header)

# WARNING: If you want to change the contents of this config file, please
# consult the gsutil team (GoogleCloudPlatform/gsutil) first.
config.SetOption('GSUtil', 'default_project_id', project_id)
config.SetOption('GSUtil', 'default_api_version', '2')
config.SetOption('GoogleCompute', 'service_account', 'default')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ class InstanceConfig(config_manager.ConfigManager):
'host_key_types': 'ecdsa,ed25519,rsa',
'optimize_local_ssd': 'true',
'network_enabled': 'true',
# WARNING: Do not change the value of 'set_boto_config' without first
# consulting the gsutil team (GoogleCloudPlatform/gsutil).
'set_boto_config': 'true',
'set_host_keys': 'true',
'set_multiqueue': 'true',
Expand Down

0 comments on commit 17e2c6e

Please sign in to comment.