vagrant-ansible_inventory 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05ede9a6d6ab64d6dc570af0ef6815a4cabc4ade
-  data.tar.gz: 50bc7e225a0db6a0c1d69c4ebeb4b4e790dfdda9
+  metadata.gz: bcca8d0ad9622d35a0eaa52d56d51c39a67a4558
+  data.tar.gz: 6e42679961730ac630312264f4d69daf881cdca2
 SHA512:
-  metadata.gz: 2ea698d66a46afce758015d05bb2c7e82b251e6ffc885cae12bc2d2f6037b0e2b84a031d19f2f54906e9265f8f194a477030896ebdbcfd4d8b545235610446bd
-  data.tar.gz: 3d07fe63b6b3ba452e30dabc7f1663b91393d2f860cca3ccd8dea491894ee6dfbdb3a99aa3d9917edbb778e49e80b1314467b7837a1b8ba13d8119eab033e393
+  metadata.gz: 9887708fbfe36c554c269926b47ae194462556a6bd21fda6eae230c3ffcba7c00bb4ba393e8b5952eb6c13d6fb5fbbb09bea24305dbc32b284076b2f730b8339
+  data.tar.gz: 38a08aedc1772303617686bcb1912c7bdff959601d9ce018a3245e4e8152d42dfbf23e31db6547529cd600f69c4bde3a23fa11521b02641e10a7107e5dd6b1a9

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 group :development do
+  gem 'pry'
   gem 'vagrant', github: 'mitchellh/vagrant'
 end
 

data/README.md

@@ -1,5 +1,7 @@
 # Vagrant::AnsibleInventory
 
+[![Join the chat at https://gitter.im/joiggama/vagrant-ansible_inventory](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/joiggama/vagrant-ansible_inventory?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 Vagrant plugin for building ansible inventory files.
 
 Helps defining and building ansible inventory files programatically via

data/Vagrantfile

@@ -11,9 +11,9 @@ Vagrant.configure(2) do |config|
     end
   }
 
-  define_vm.call 'master',  'trusty32', 256
-  define_vm.call 'slave-1', 'trusty32', 256
-  define_vm.call 'slave-2', 'trusty32', 256
+  define_vm.call 'master',  'ubuntu/trusty32', 256
+  define_vm.call 'slave-1', 'ubuntu/trusty32', 256
+  define_vm.call 'slave-2', 'ubuntu/trusty32', 256
 
   config.ansible.groups = {
     'cluster:children' => ['master', 'slaves'],

data/Vagrantfile2

@@ -1,4 +1,4 @@
 Vagrant.configure(2) do |config|
-  config.vm.box = 'trusty64'
+  config.vm.box = 'ubuntu/trusty64'
   config.vm.network :private_network, type: :dhcp
 end

data/lib/vagrant/ansible_inventory/commands/inventory.rb

@@ -5,71 +5,158 @@ module VagrantPlugins
     module Commands
       class Inventory < Vagrant.plugin(2, :command)
 
+        def self.synopsis
+          'dynamic ansible inventory'
+        end
+
+        def initialize(args, env)
+          super
+
+          @sub_args, @env = args, env
+        end
+
         def execute
-          print build
+          opts = OptionParser.new do |op|
+            op.banner = 'Usage: vagrant ansible inventory [<options>]'
+            op.separator ''
+            op.separator 'Available options:'
+
+            op.on('-l', '--list', 'List all hosts as json') do |target|
+              @env.ui.info json, prefix: false
+              exit
+            end
+
+            op.on('-h', '--help', 'Show this message') do
+              @env.ui.info opts.help, prefix: false
+              exit
+            end
+          end
+
+          opts.parse!(ARGV[2..-1])
+
+          @env.ui.info ini, prefix: false
         end
 
         private
 
         def build
-          inv = {}
-
           # Detect meta, explicit and implicit groups
-          meta = groups.select{|group| group.include?(':children') }
-          exp  = groups.reject{|group| meta.include?(group) }
-          imp  = (nodes.keys - exp.values.flatten)
+          @meta_groups     = get_meta_groups
+          @explicit_groups = get_explicit_groups
+          @implicit_groups = get_implicit_groups
+
+          @inventory = {}
 
           # Assign grouped nodes to inventory
-          imp.each{|gname| inv[gname] = nodes[gname].merge id: gname }
-          exp.each{|gname, gnodes| inv[gname] = gnodes.map{|n| nodes[n].merge id: n }}
-          meta.each{|gname, gnames| inv[gname] = gnames }
+          @implicit_groups.each do |group_name|
+            @inventory[group_name] = nodes[group_name].merge id: group_name
+          end
+
+          @explicit_groups.each do |group_name, group_nodes|
+            @inventory[group_name] = group_nodes.map{|node| nodes[node].merge id: node }
+          end
 
-          inv
+          @meta_groups.each do |group_name, group_names|
+            @inventory[group_name] = group_names
+          end
         end
 
         def config
           @config ||= with_target_vms{}.first.config
         end
 
-        def groups
-          @groups ||= config.ansible.groups
+        def get_explicit_groups
+          groups.reject{|group| @meta_groups.include?(group) } || []
         end
 
-        def nodes
-          @nodes ||= with_target_vms{}.each_with_object({}) do |machine, hash|
-            raise Vagrant::Errors::SSHNotReady unless machine.ssh_info
-            hash[machine.name.to_s] = {
-              ssh_user:             'vagrant',
-              ssh_host:             machine.provider.driver.read_guest_ip(1),
-              ssh_port:             22,
-              ssh_private_key_file: machine.ssh_info[:private_key_path].first
-            }
-          end
+        def get_implicit_groups
+          nodes.keys - @explicit_groups.values.flatten
+        end
+
+        def get_meta_groups
+          groups.select{|group| group.include?(':children') }
         end
 
-        def node_attrs(id, node)
-          "#{node.delete(id)} #{node.map{|k| "ansible_#{k[0]}=#{k[1]}"}.join(' ')}"
+
+        def groups
+          @groups ||= config.ansible.groups
         end
 
-        def print(inventory)
-          out = "# Generated by vagrant-ansible_inventory plugin\n\n"
+        def ini
+          build
 
-          inventory.each do |entries|
+          output = "# Generated by vagrant-ansible_inventory\n\n"
+
+          @inventory.each do |entries|
             group_name, children = *entries
-            out <<  "[#{group_name}]\n"
+            output <<  "[#{group_name}]\n"
 
             if children.kind_of? Hash
-              out << "#{node_attrs(:id, children)}\n"
+              output << "#{node_attributes(:id, children)}\n"
             else
               children.each do |child|
-                out << "#{(child.kind_of?(Hash) ? node_attrs(:id, child) : child)}\n"
+                output << "#{(child.kind_of?(Hash) ? node_attributes(:id, child) : child)}\n"
               end
             end
 
-            out << "\n"
+            output << "\n"
+          end
+
+          output
+        end
+
+        def json
+          build
+
+          groups   = {}
+          hostvars = {}
+
+          @implicit_groups.each do |group|
+            host = @inventory[group][:ansible_ssh_host]
+            groups[group] = [host]
+            vars = @inventory[group].except(:id, :ansible_ssh_host)
+            hostvars[host] = vars
+          end
+
+          @explicit_groups.each do |group|
+            name =  group.first
+            groups[name] = []
+            @inventory[name].each do |node|
+              groups[name] << node[:ansible_ssh_host]
+              host = node[:ansible_ssh_host]
+              vars = node.except(:id, :ansible_ssh_host)
+              hostvars[host] = vars
+            end
+          end
+
+          @meta_groups.each do |group|
+            name = group.first.split(':').first
+            groups[name] = group.last.map do |member|
+              if @inventory[member].is_a? Hash
+                @inventory[member][:ansible_ssh_host]
+              else
+                @inventory[member].map{|n| n[:ansible_ssh_host] }
+              end if @inventory[member]
+            end.compact.flatten
           end
 
-          puts out
+          groups.merge({_meta: {hostvars: hostvars}}).to_json
+        end
+
+        def nodes
+          @nodes ||= with_target_vms{}.each_with_object({}) do |machine, hash|
+            raise Vagrant::Errors::SSHNotReady unless machine.ssh_info
+            hash[machine.name.to_s] = {
+              ansible_ssh_user:             'vagrant',
+              ansible_ssh_host:             machine.provider.driver.read_guest_ip(1),
+              ansible_ssh_port:             22,
+              ansible_ssh_private_key_file: machine.ssh_info[:private_key_path].first
+            }
+          end
+        end
+
+        def node_attributes(id, node)
+          "#{node.delete(id)} #{node.map{|k| "#{k[0]}=#{k[1]}"}.join(' ')}"
         end
 
       end

data/lib/vagrant/ansible_inventory/commands/root.rb

@@ -6,7 +6,7 @@ module VagrantPlugins
       class Root < Vagrant.plugin(2, :command)
 
         def self.synopsis
-          'display ansible inventory'
+          'build ansible inventory'
         end
 
         def initialize(argv, env)
@@ -36,9 +36,9 @@ module VagrantPlugins
 
         def help
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant ansible <subcommand> [<args>]"
-            o.separator ""
-            o.separator "Available subcommands:"
+            o.banner = 'Usage: vagrant ansible <subcommand> [<options>]'
+            o.separator ''
+            o.separator 'Available subcommands:'
 
             keys = []
             @subcommands.each { |key, value| keys << key.to_s }

data/lib/vagrant/ansible_inventory/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module AnsibleInventory
-    VERSION = '0.0.6'
+    VERSION = '0.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ansible_inventory
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Ignacio Galindo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin for building ansible inventory files.