From 0ab58774bdeb13f1e596831174ea6e247507f88e Mon Sep 17 00:00:00 2001 From: Mark Mandel Date: Thu, 23 May 2013 09:11:38 +1000 Subject: [PATCH 1/2] Ignore Intellij IML files. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 729ccf4299..fe9a6c0a99 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ rpm-build .pydevproject # PyCharm stuff... .idea +#IntelliJ IDEA stuff.. +*.iml # Mac OS X stuff... .DS_Store # manpage build stuff... From f2f3fb1a8e884fc0814d333b1bb7a570c38de37c Mon Sep 17 00:00:00 2001 From: Mark Mandel Date: Thu, 23 May 2013 09:13:26 +1000 Subject: [PATCH 2/2] Vagrant external inventory file, to dynamically determine your vagrant vm ip. --- plugins/inventory/vagrant.py | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 plugins/inventory/vagrant.py diff --git a/plugins/inventory/vagrant.py b/plugins/inventory/vagrant.py new file mode 100755 index 0000000000..a98b3cdbe8 --- /dev/null +++ b/plugins/inventory/vagrant.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python +""" +Vagrant external inventory script. Automatically finds the IP of the booted vagrant system, and +returns it under the host group 'vagrant' + +Example Vagrant configuration using this script: + + config.vm.provision :ansible do |ansible| + ansible.playbook = "./provision/your_playbook.yml" + ansible.inventory_file = "./provision/inventory/vagrant.py" + ansible.verbose = true + end +""" + +# Copyright (C) 2013 Mark Mandel +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import subprocess +import re + +output = subprocess.check_output(["vagrant", "ssh-config"]) +ip = re.search("HostName ([0-9\.]+)", output).group(1) + +print '{ "vagrant" : ["'+ ip +'"] }' \ No newline at end of file