Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

clean up function refs in cli module

  • Loading branch information...
commit fff4510760abfb8a6b390481c8fab3825b5b7ec1 1 parent 9c173dd
@thatch45 thatch45 authored
Showing with 8 additions and 4 deletions.
  1. +8 −4 saltcloud/cli.py
View
12 saltcloud/cli.py
@@ -27,14 +27,18 @@ def parse(self):
'''
Parse the command line and merge the config
'''
+ # Grab data from the 4 sources
cli = self._parse_cli()
- cloud = saltcloud.config.cloud(cli['cloud_config'])
- opts = saltcloud.config.master(cli['master_config'])
- vms = saltcloud.config.vms(cli['vm_config'])
+ cloud = saltcloud.config.cloud_config(cli['cloud_config'])
+ opts = salt.config.master_config(cli['master_config'])
+ vms = saltcloud.config.vm_config(cli['vm_config'])
+
+ # Load the data in order
opts.update(cloud)
opts.update(cli)
opts['vm'] = vms
-
+
+ return opts
def _parse_cli(self):
'''
Please sign in to comment.
Something went wrong with that request. Please try again.