Don't use pack=pack. Just pass in pack=__salt__ always.

Refs #30300
This commit is contained in:
rallytime 2016-02-03 13:49:47 -07:00 committed by Colton Myers
parent 1ae022dbfe
commit bc780a7c25
4 changed files with 7 additions and 7 deletions

View file

@ -62,9 +62,9 @@ def __virtual__():
return True
def __init__(opts, pack=None):
def __init__(opts):
if HAS_BOTO:
__utils__['boto.assign_funcs'](__name__, 'cfn', module='cloudformation', pack=pack)
__utils__['boto.assign_funcs'](__name__, 'cfn', module='cloudformation', pack=__salt__)
def exists(name, region=None, key=None, keyid=None, profile=None):

View file

@ -77,7 +77,7 @@ def __virtual__():
return True
def __init__(opts, pack=None):
def __init__(opts):
salt.utils.compat.pack_dunder(__name__)
if HAS_BOTO:
__utils__['boto.assign_funcs'](__name__, 'kms', pack=__salt__)

View file

@ -85,10 +85,10 @@ def __virtual__():
return True
def __init__(opts, pack=None):
def __init__(opts):
salt.utils.compat.pack_dunder(__name__)
if HAS_BOTO:
__utils__['boto.assign_funcs'](__name__, 'route53', pack=pack)
__utils__['boto.assign_funcs'](__name__, 'route53', pack=__salt__)
def _get_split_zone(zone, _conn, private_zone):

View file

@ -125,10 +125,10 @@ def __virtual__():
return True
def __init__(opts, pack=None):
def __init__(opts):
salt.utils.compat.pack_dunder(__name__)
if HAS_BOTO:
__utils__['boto.assign_funcs'](__name__, 'vpc', pack=pack)
__utils__['boto.assign_funcs'](__name__, 'vpc', pack=__salt__)
def _check_vpc(vpc_id, vpc_name, region, key, keyid, profile):