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

Ensure GCE configuration check is correct

Browse source
This commit is contained in:
rallytime 2015-08-21 16:40:03 -06:00
parent 421f1fde1e
commit ac67a1d238
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,26 +131,32 @@ def __virtual__():
return False
for provider, details in __opts__['providers'].iteritems():
if 'provider' not in details or details['provider'] != 'gce':
if 'gce' not in details:
continue
pathname = os.path.expanduser(details['service_account_private_key'])
parameters = details['gce']
pathname = os.path.expanduser(parameters['service_account_private_key'])
if not os.path.exists(pathname):
raise SaltCloudException(
'The GCE service account private key {0!r} used in '
'the {1!r} provider configuration does not exist\n'.format(
details['service_account_private_key'], provider
parameters['service_account_private_key'],
provider
)
)
keymode = str(
oct(stat.S_IMODE(os.stat(pathname).st_mode))
)
if keymode not in ('0400', '0600'):
raise SaltCloudException(
'The GCE service account private key {0!r} used in '
'the {1!r} provider configuration needs to be set to '
'mode 0400 or 0600\n'.format(
details['service_account_private_key'], provider
parameters['service_account_private_key'],
provider
)
)