saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Allow IP-forwarding in GCE driver

Browse source 
Fixes #21390
This commit is contained in:
rallytime 2015-09-23 14:27:55 -06:00
parent 484015a7a3
commit 2bf566d934
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/topics/cloud/gce.rst
View file

@ -271,6 +271,14 @@ disk, set ``pd-ssd`` as the value.
.. versionadded:: 2014.7.0
ip_forwarding
-------------
GCE instances can be enabled to use IP Forwarding. When set to ``True``,
this options allows the instance to send/receive non-matching src/dst
packets. Default is ``False``.
.. versionadded:: 2015.8.1
SSH Remote Access
=================

7
salt/cloud/clouds/gce.py
View file

@ -2057,8 +2057,6 @@ def create(vm_=None, call=None):
if LIBCLOUD_VERSION_INFO > (0, 15, 1):
# This only exists in current trunk of libcloud and should be in next
# release
kwargs.update({
'ex_disk_type': config.get_cloud_config_value(
'ex_disk_type', vm_, __opts__, default='pd-standard'),
@ -2067,7 +2065,10 @@ def create(vm_=None, call=None):
'ex_disks_gce_struct': config.get_cloud_config_value(
'ex_disks_gce_struct', vm_, __opts__, default=None),
'ex_service_accounts': config.get_cloud_config_value(
'ex_service_accounts', vm_, __opts__, default=None)
'ex_service_accounts', vm_, __opts__, default=None),
'ex_can_ip_forward': config.get_cloud_config_value(
'ip_forwarding', vm_, __opts__, default=False
)
})
if kwargs.get('ex_disk_type') not in ('pd-standard', 'pd-ssd'):
raise SaltCloudSystemExit(