valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update default config options

Browse Source
This commit is contained in:
Thomas S Hatch 2012-06-22 21:52:25 -06:00
parent 294b42adba
commit f11a21ae5d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
saltcloud/config.py
View File

@ -17,11 +17,13 @@ def cloud_config(path):
'provider': '',
'location': '',
# User/Passwords/keys
'RACKSPACE_key': '',
'RACKSPACE_user': '',
'LINODE_apikey': '',
'EC2_key': '',
'EC2_user': '',
'RACKSPACE.key': '',
'RACKSPACE.user': '',
'LINODE.apikey': '',
'EC2.id': '',
'EC2.key': '',
'EC2.keyname': '',
'EC2.securitygroup': '',
# Global defaults
'ssh_auth': '',
'keysize': 4096,
@ -31,7 +33,7 @@ def cloud_config(path):
salt.config.load_config(opts, path, 'SALT_CLOUD_CONFIG')
if 'include' in opts:
opts = include_config(opts, path)
opts = salt.config.include_config(opts, path)
return opts
@ -45,7 +47,7 @@ def vm_config(path):
salt.config.load_config(opts, path, 'SALT_CLOUDVM_CONFIG')
if 'include' in opts:
opts = include_config(opts, path)
opts = salt.config.include_config(opts, path)
vms = []