Merge pull request #31053 from cachedout/boto_test_fix

Fix boto test failures
This commit is contained in:
Mike Place 2016-02-09 13:02:16 -07:00
commit f13ffd4608
2 changed files with 4 additions and 0 deletions

View file

@ -68,6 +68,8 @@ instance_parameters = {'instance_type': 't1.micro'}
opts = salt.config.DEFAULT_MASTER_OPTS
utils = salt.loader.utils(opts, whitelist=['boto'])
funcs = salt.loader.minion_mods(opts, utils=utils)
boto_elb.__salt__ = funcs
boto_elb.__utils__ = utils
boto_elb.__virtual__()

View file

@ -60,6 +60,8 @@ boto_conn_parameters = {'aws_access_key_id': access_key, 'aws_secret_access_key'
opts = salt.config.DEFAULT_MASTER_OPTS
utils = salt.loader.utils(opts, whitelist=['boto'])
funcs = salt.loader.minion_mods(opts, utils=utils)
boto_secgroup.__salt__ = funcs
boto_secgroup.__utils__ = utils
boto_secgroup.__virtual__()