diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 12:06:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 12:06:19 +0000 |
| commit | 69849c280c5525d132ebaddb1200c390a42ecc06 (patch) | |
| tree | 2c6ffc6fd6dc4fa719305f25b475391730389747 /lib/google_api | |
| parent | c157f963db87a40a3ba7b94b339530ee83194bc8 (diff) | |
| download | gitlab-ce-69849c280c5525d132ebaddb1200c390a42ecc06.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/google_api')
| -rw-r--r-- | lib/google_api/cloud_platform/client.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/google_api/cloud_platform/client.rb b/lib/google_api/cloud_platform/client.rb index eaf94708282..9085835dee6 100644 --- a/lib/google_api/cloud_platform/client.rb +++ b/lib/google_api/cloud_platform/client.rb @@ -96,6 +96,9 @@ module GoogleApi legacy_abac: { enabled: legacy_abac }, + ip_allocation_policy: { + use_ip_aliases: true + }, addons_config: enable_addons.each_with_object({}) do |addon, hash| hash[addon] = { disabled: false } end |