ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix dynamic inventory for vagrant does not work on python3 (#37631)

Browse source 
* Fix dynamic inventory for vagrant does not work on python3 #35129
This commit is contained in:
Hideki Saito 2018-03-23 07:13:43 +09:00 committed by Toshio Kuratomi
parent a4a2b4a381
commit 1b121fc9e4
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
contrib/inventory/vagrant.py
View file

@ -38,14 +38,17 @@ import os.path
import subprocess import subprocess
import re import re
from paramiko import SSHConfig from paramiko import SSHConfig
from cStringIO import StringIO
from optparse import OptionParser from optparse import OptionParser
from collections import defaultdict from collections import defaultdict
try: try:
import json import json
except: except Exception:
import simplejson as json import simplejson as json
from ansible.module_utils._text import to_text
from ansible.module_utils.six.moves import StringIO
_group = 'vagrant' # a default group _group = 'vagrant' # a default group
_ssh_to_ansible = [('user', 'ansible_ssh_user'), _ssh_to_ansible = [('user', 'ansible_ssh_user'),
('hostname', 'ansible_ssh_host'), ('hostname', 'ansible_ssh_host'),
@ -74,7 +77,8 @@ def get_ssh_config():
# list all the running boxes # list all the running boxes
def list_running_boxes(): def list_running_boxes():
output = subprocess.check_output(["vagrant", "status"]).split('\n')
output = to_text(subprocess.check_output(["vagrant", "status"]), errors='surrogate_or_strict').split('\n')
boxes = [] boxes = []
@ -90,7 +94,7 @@ def list_running_boxes():
def get_a_ssh_config(box_name): def get_a_ssh_config(box_name):
"""Gives back a map of all the machine's ssh configurations""" """Gives back a map of all the machine's ssh configurations"""
output = subprocess.check_output(["vagrant", "ssh-config", box_name]) output = to_text(subprocess.check_output(["vagrant", "ssh-config", box_name]), errors='surrogate_or_strict')
config = SSHConfig() config = SSHConfig()
config.parse(StringIO(output)) config.parse(StringIO(output))
host_config = config.lookup(box_name) host_config = config.lookup(box_name)
@ -104,6 +108,7 @@ def get_a_ssh_config(box_name):
return dict((v, host_config[k]) for k, v in _ssh_to_ansible) return dict((v, host_config[k]) for k, v in _ssh_to_ansible)
# List out servers that vagrant has running # List out servers that vagrant has running
# ------------------------------ # ------------------------------
if options.list: if options.list: