mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
reworked apt-repository auto-install to be like yum
This commit is contained in:
parent
1280269866
commit
e4ad97b918
1 changed files with 32 additions and 13 deletions
|
@ -95,6 +95,26 @@ except ImportError:
|
||||||
|
|
||||||
VALID_SOURCE_TYPES = ('deb', 'deb-src')
|
VALID_SOURCE_TYPES = ('deb', 'deb-src')
|
||||||
|
|
||||||
|
def install_python_apt(module):
|
||||||
|
|
||||||
|
if not module.check_mode:
|
||||||
|
apt_get_path = module.get_bin_path('apt-get')
|
||||||
|
if apt_get_path:
|
||||||
|
rc, so, se = module.run_command('%s update && %s install python-apt -y -q' % (apt_get_path, apt_get_path))
|
||||||
|
if rc == 0:
|
||||||
|
global apt, apt_pkg
|
||||||
|
import apt
|
||||||
|
import apt_pkg
|
||||||
|
|
||||||
|
def install_python_pycurl(module):
|
||||||
|
|
||||||
|
if not module.check_mode:
|
||||||
|
apt_get_path = module.get_bin_path('apt-get')
|
||||||
|
if apt_get_path:
|
||||||
|
rc, so, se = module.run_command('%s update && %s install python-pycurl -y -q' % (apt_get_path, apt_get_path))
|
||||||
|
if rc == 0:
|
||||||
|
global pycurl
|
||||||
|
import pycurl
|
||||||
|
|
||||||
class CurlCallback:
|
class CurlCallback:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -361,25 +381,24 @@ def main():
|
||||||
repo=dict(required=True),
|
repo=dict(required=True),
|
||||||
state=dict(choices=['present', 'absent'], default='present'),
|
state=dict(choices=['present', 'absent'], default='present'),
|
||||||
update_cache = dict(aliases=['update-cache'], type='bool', default='yes'),
|
update_cache = dict(aliases=['update-cache'], type='bool', default='yes'),
|
||||||
|
# this should not be needed, but exists as a failsafe
|
||||||
|
install_python_apt=dict(required=False, default="yes", type='bool'),
|
||||||
|
# this should not be needed, but exists as a failsafe
|
||||||
|
install_python_pycurl=dict(required=False, default="yes", type='bool'),
|
||||||
),
|
),
|
||||||
supports_check_mode=True,
|
supports_check_mode=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
if not HAVE_PYTHON_APT:
|
params = module.params
|
||||||
try:
|
if params['install_python_apt'] and not HAVE_PYTHON_APT and not module.check_mode:
|
||||||
module.run_command('apt-get update && apt-get install python-apt -y -q')
|
install_python_apt(module)
|
||||||
global apt, apt_pkg
|
|
||||||
import apt
|
|
||||||
import apt_pkg
|
|
||||||
except:
|
|
||||||
module.fail_json(msg='Could not import python modules: apt, apt_pkg. Please install python-apt package.')
|
|
||||||
|
|
||||||
if not HAVE_PYCURL:
|
if params['install_python_pycurl'] and not HAVE_PYCURL and not module.check_mode:
|
||||||
module.fail_json(msg='Could not import python modules: pycurl. Please install python-pycurl package.')
|
install_python_pycurl(module)
|
||||||
|
|
||||||
repo = module.params['repo']
|
repo = params['repo']
|
||||||
state = module.params['state']
|
state = params['state']
|
||||||
update_cache = module.params['update_cache']
|
update_cache = params['update_cache']
|
||||||
sourceslist = None
|
sourceslist = None
|
||||||
|
|
||||||
if isinstance(distro, aptsources.distro.UbuntuDistribution):
|
if isinstance(distro, aptsources.distro.UbuntuDistribution):
|
||||||
|
|
Loading…
Reference in a new issue