vagrant-compose 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03a7541ea3a7eab57a665a0d510467c444c1683b
-  data.tar.gz: c78fe102cb943bf9f724379a762a6e268c471bda
+  metadata.gz: 9dc0b6deae71c2ef6434438ec073f8ccf334b128
+  data.tar.gz: 0a79dee2c550ca94fac13c9aabd496d934fc3670
 SHA512:
-  metadata.gz: 67e92a734dc62de90c13123df626f02830f5a328f6f7619708ef891ade36b4f890ec2f827ade85dbdf1ed91cce89bd51713d4403e038424ee8a3e78534f12e8c
-  data.tar.gz: 0640c723ad84731e00651c5f50ebad963e7fec8931057e12b0ae2542c334099300f97c33d079ae802d38068d94f8e469b5844d09c0ac3dedb64099c17efe09fa
+  metadata.gz: d9fc532a3c232cc18db1bc6a51927a445efa4842d2aa74d991592ac8cee667ed73b9c08b95ed29fa947e16b615b1940e3405883b6d7f08bc84e0b2e1a02986f2
+  data.tar.gz: fff140445bdccf9a7f27bb3e5c4517d2e7419a35d18c3189b51a95c38ddb0653bdff47d0c90e0839749fe2804ef8fc19709a883f32fe2e4228cdaf64f5403ade

data/CHANGELOG.md

@@ -1,3 +1,14 @@
 # 0.1.0 (December 27, 2015)
 
-* Initial release.
+* Initial release.
+
+# 0.2.0 (December 31, 2015)
+
+breaking changes! 
+* nodes instances number defined into node method (instances attributes removed)
+* cluster.nodes return only nodes (before nodes with index were returned)
+
+other changes:
+* Improved documentation.
+* cluster domain now is optional
+* nodes code block now is optional

data/README.md

@@ -1,3 +1,438 @@
 # vagrant-compose
-A Vagrant plugin that helps building complex multi-machine scenarios
+
+A Vagrant plugin that helps building complex multi-machine scenarios.
+
+Complex multi-machine scenarios includes several set of nodes, each one with different characteristic, software stacks and configuration. 
+
+For instance, if you are setting up an environment for testing [Consul](https://consul.io/), your cluster will be composed by:
+
+- consul server nodes
+- consul agent nodes
+- nodes simulating other datacenter
+- ...
+
+On top of that, a Consul cluster can be composed in several different ways, implementing high availability or not, merging roles/functions on the same server or keeping role/function separated etc. etc.
+
+Vagrant-compose streamline the definition of complex multi-machine scenarios, providing also support for a straight forward provisioning of nodes with Ansible.
+
+> So far, the plugin is designed for working with Ansible provisioning, but it can be easily used/extended for supporting other provisioning systems supported by Vagrant.
+
+## Installation
+
+Install the plugin following the typical Vagrant procedure:
+
+``` 
+$ vagrant plugin install vagrant-compose
+```
+
+## Quick start
+
+Create the following `Vagrantfile` for implementing a multi-machine scenario that defines a cluster named `test` with 3 `consul-server` nodes.
+
+``` ruby
+Vagrant.configure(2) do |config|
+  #cluster definition
+  config.cluster.compose('test') do |c|
+    c.nodes(3, 'consul-server')
+  end
+
+  #cluster creation
+  config.cluster.nodes.each do |node, index|
+    config.vm.define "#{node.boxname}" do |node_vm|
+      node_vm.vm.box = "#{node.box}"
+    end
+  end
+end
+```
+
+The first part of the `Vagrantfile` contains the definition of the `test` cluster:  
+
+``` ruby
+config.cluster.compose('test') do |c|
+  ...    
+end
+```
+
+Please note that the cluster definition, is followed by a block of code that allows to configure the cluster itself; in this example the configuration consists in defining a set of 3 `consul-server` nodes.
+
+``` ruby
+c.nodes(3, 'consul-server')
+```
+
+When the definition of the cluster is completed, behind the scene vagrant-compose take care of  composing the cluster, and the resulting list of nodes will be available in the `config.cluster.nodes` variable.
+
+The second part of the `Vagrantfile` creates the cluster by defining a vm in VirtualBox for each node in the cluster:
+
+``` ruby
+config.cluster.nodes.each do |node, index|
+  config.vm.define "#{node.boxname}" do |node_vm|
+    node_vm.vm.box = "#{node.box}"
+  end
+end
+```
+
+If you run `vagrant up` you will get a 3 node cluster with following machines, based on `ubuntu/trusty64` base box (default).
+
+- `test-consul-server1`
+- `test-consul-server2`
+- `test-consul-server3`
+
+Done !
+
+Of course, real-word scenarios are more complex; it is necessary to get more control in configuring the cluster topology and machine attributes, and finally you need also to implement automatic provisioning of software stack installed in the machines. 
+
+See following chapters for more details.
+
+## Configuring the cluster
+
+There are several options to customise the cluster definition.
+
+### Defining cluster attributes
+
+Cluster attributes apply to all the node in the cluster.
+
+You can set set cluster attributes in the block of code that is passed as a second parameter to the `cluster.compose` method, as show in the following example:
+
+``` ruby
+config.cluster.compose('test') do |c|
+  c.box = "centos/7"    
+  ...	
+end
+```
+
+Following cluster attributes are available:
+
+- **box**, [String], default = 'ubuntu/trusty64'
+  
+  Sets the base box for nodes, a.k.a the image that will be used to spin up the machine; please note that the base box can be customised also for each set of nodes (see Defining set of nodes).
+
+
+- **domain**, [String], default = 'vagrant'
+  
+  Sets the domain used for computing the nodes in the cluster; if the `domain` value is set to `nil` or `““` (empty string), the fully qualified name and the hostname of each nodes will be the same. 
+
+### Defining set of nodes
+
+A cluster can be composed by one or more set of nodes.
+
+Each set of nodes represent a group of one or more nodes with similar characteristics. For instance, in a cluster defined for testing [Consul](https://consul.io/), you will get at least two set of nodes:
+
+- Consul server nodes
+- Consul agent nodes
+
+Set of nodes can be defined in the block of code that is passed as a second parameter to the `cluster.compose` method, by using the `nodes` method as show in the following example:
+
+``` ruby
+config.cluster.compose('test') do |c|
+  ...
+  c.nodes(3, 'zookeeper')
+  ...	
+end
+```
+
+The first parameter of the `nodes` method is the number of nodes in the set, while the second parameter is the name of the set; `nodes` accepts an optional third parameter, allowing to define a block of code where it is possible to customise several attributes of the set of nodes itself: 
+
+``` ruby
+config.cluster.compose('test') do |c|
+  ...
+  c.nodes(3, 'zookeeper') do |n|
+    n.box = "centos/7"
+  end      
+  ...	
+end
+```
+
+Please note that all the available attributes can be set to:
+
+- A literal value, like for instance `"centos/7". This value will be inherited - without changes - by all nodes in the set.
+  
+- A block of code, afterwards value_generator, that will be executed when building the nodes in the set. When calling the block of code, three parameters will be given:
+  
+  - **group_index**, [integer (zero based)], uniquely assigned to each set of nodes
+  - **group_name**, [String], with the name of the set of nodes
+  - **node_index**, [integer (zero based)], uniquely assigned to each node in the set
+  
+  An example of value_generator is the following lambda expression, that computes the host-name for each node in the cluster (`test-consul-server1`, `test-consul-server2`, etc. etc.):
+  
+  ``` ruby
+  lambda { |group_index, group_name, node_index| 
+    return "#{group_name}#{node_index + 1}" 
+  }
+  ```
+  
+  ​
+
+Following set of nodes attributes are available:
+
+- **box**, [String|String_Generator], default = `cluster.box`
+  
+  Sets the base box used for creating nodes in this set. 
+  
+- **boxname**, [String|String_Generator], default = `"#{group_name}#{node_index + 1}"`
+  
+  Sets the box name (a.k.a. the name of the machine in VirtualBox/VMware)  for each node in this set.
+  
+  Note: when generating nodes, the resulting boxname will be automatically prefixed by `"#{cluster_name}-"`.
+  
+- **hostname**, [String|String_Generator], default = `"#{group_name}#{node_index + 1}"`
+  
+  Sets the hostname for each node in this set. 
+  
+  Note: when generating nodes, the resulting hostname will be automatically prefixed by `"#{cluster_name}-"`; additionally the **fqdn** attribute will be computed by concatenating `".#{cluster.domain}"`, if defined (if `domain` is not defined, fqdn will be the same of hostname).
+
+
+- **aliases**, [Array(String)|Array(String)_Generator], default = `[]`
+  
+  Allows to provide aliases for each node in this set. 
+  
+  Note: when generating nodes, aliases will be automatically concatenated into a string, comma separated.
+
+
+- **ip**, [String|String_Generator], default = `"172.31.#{group_index}.#{100 + node_index + 1}"`
+  
+  Sets the ip for for each node in this set. 
+
+
+- **cpus**, [Integer|Integer_Generator], default = `1`
+  
+  Sets the number of cpus for each node in this set. 
+
+
+- **memory**, [Integer|Integer_Generator], default = `256` (MB)
+  
+  Sets the memory allocated for each node in this set. 
+
+
+- **attributes**, [Hash(String, obj)|Hash(String, obj)_Generator], default = `{}`
+  
+  Allows to provide customisable additional attributes for each node in this set. 
+
+> Please note that some attribute, like boxname, hostname, ip, *must* be different for each node in the set (and in the cluster).
+> 
+> Use value_generators for those attributes.
+
+### Composing nodes
+
+By executing the code blocks provided to  `cluster.compose` method, and also inner code blocks provided to `nodes` calls, the vagrant-compose plugin can compose the cluster topology, as a sum of all the nodes generated by each set. 
+
+The resulting list of nodes is stored in the `config.cluster.nodes` variable; each node has following attributes assigned using value/value generators:
+
+- **box**
+- **boxname**
+- **hostname**
+- **fqdn**
+
+
+- **aliases**
+
+
+- **ip**
+
+
+- **cpus**
+
+
+- **memory**
+
+
+- **attributes**
+
+
+
+Two additional attributes will be automatically set for each node:
+
+- **index**, [integer (zero based)], uniquely assigned to each node in the cluster
+- **group_index**, [integer (zero based)], uniquely assigned to each node in a set of nodes
+
+## Creating nodes 
+
+Given the list of nodes stored in the `config.cluster.nodes` variable, it is possible to create a multi-machine environment by iterating over the list: 
+
+``` ruby
+config.cluster.nodes.each do |node|
+  ...
+end
+```
+
+Within the cycle you can instruct vagrant to create machines based on attributes of the current node; for instance, you can define a VM in VirtualBox (default Vagrant provider);  the example uses the [vagrant-hostmanager](https://github.com/smdahlen/vagrant-hostmanager) plugin to set the hostname into the guest machine:
+
+``` ruby
+config.cluster.nodes.each do |node|
+  config.vm.define "#{node.boxname}" do |node_vm|
+    node_vm.vm.box = "#{node.box}"
+    node_vm.vm.network :private_network, ip: "#{node.ip}"
+    node_vm.vm.hostname = "#{node.fqdn}"
+    node_vm.hostmanager.aliases = node.aliases unless node.aliases.empty?
+    node_vm.vm.provision :hostmanager
+    
+    node_vm.vm.provider "virtualbox" do |vb|
+      vb.name = "#{node.boxname}"  
+      vb.memory = node.memory
+      vb.cpus = node.cpus
+    end            
+  end
+end
+```
+
+> In order to increase performance of node creation, you can leverage on support for linked clones introduced by Vagrant 1.8.1. Add the following line to the above script:
+> 
+> vb.linked_clone = true if Vagrant::VERSION =~ /^1.8/
+
+Hostmanager requires following additional settings before the `config.cluster.nodes.each` command:
+
+``` ruby
+config.hostmanager.enabled = false          
+config.hostmanager.manage_host = true       
+config.hostmanager.include_offline = true  
+```
+
+## Configuring ansible provisioning
+
+The vagrant-compose plugin provides support for a straight forward provisioning of nodes in the cluster implemented with Ansible.
+
+### Defining ansible_groups
+
+Each set of nodes, and therefore all the nodes within the set, can be assigned to one or more ansible_groups.
+
+In the following example, `consul-agent` nodes will be part of `consul` and `docker` ansible_groups.
+
+``` ruby
+c.nodes(3, 'consul-agent') do |n|
+  ...
+    n.ansible_groups = ['consul', 'docker']
+end  
+```
+
+This configuration is used by the  `cluster.compose` method in order to define an **inventory file** where nodes (hosts in ansible "") clustered in group; the resulting list of ansible_groups, each with its own list of host  is stored in the `config.cluster.ansible_groups` variable.
+
+Ansible playbook will use groups for providing different software stack to different machines.
+
+Please note that the possibility to assign a node to one or more groups introduces an high degree of flexibility; for instance, it is easy to change the topology of the cluster above for instance when it is required to implement an http load balancer based on consul service discovery:
+
+``` ruby
+c.nodes(3, 'consul-agent') do |n|
+  ...
+  n.ansible_groups = ['consul', 'docker', 'registrator']
+end  
+c.nodes(1, 'load-balancer') do |n|
+  ...
+    n.ansible_groups = ['consul', 'docker', 'consul-template', 'nginx']
+end
+```
+
+As you can see, `consul` and `docker` ansible_groups now include both nodes from `consul-agent` and `load-balancer` node set; vice versa, other groups like `registrator`, `consul-template`, `nginx` contain node only from one of the two nodes set.
+
+Ansible playbook can leverage on groups for providing machines with the required software stacks.
+
+### Defining group vars
+
+In Ansible, the inventory file is usually integrated with a set of variables containing settings that will influence playbooks behaviour for all the host in a group.
+
+The vagrant-compose plugin allows you to define one or more group_vars generator for each ansible_groups; group_vars generators are code block that will be instantiated during `cluster.compose` with two input parameters:
+
+- **context_vars** see below
+- **nodes**, list of nodes in the ansible_group
+
+Expected output type is `Hash(String, Obj)`.
+
+For instance, when building a [Consul](https://consul.io/) cluster, all the `consul-server` nodes have to be configured with the same `bootstrap_expect` parameter, that must be set to the number of `consul-server` nodes in the cluster:
+
+``` ruby
+config.cluster.compose('test') do |c|
+  ...
+  c.ansible_group_vars['consul-server'] = lambda { |context, nodes| 
+    return { 'consul_bootstrap_expect' => nodes.length } 
+  }
+  ...
+end
+```
+
+Ansible group vars will be stored into yaml files saved into `{cluster.ansible_playbook_path}\group_vars` folder.
+
+The variable  `cluster.ansible_playbook_path` defaults to the current directory  (the directory of the Vagrantfile)  +  `/provisioning`; this value can be changed like any other cluster attributes (see Defining cluster attributes).
+
+### Defining host vars
+
+While group vars will influence playbooks behaviour for all hosts in a group, in Ansible host vars will influence playbooks behaviour for a specific host.
+
+The vagrant-compose plugin allows to define one or more host_vars generator for each ansible_groups;  host_vars generators are code block that will be instantiated during `cluster.compose` with two input parameters:
+
+- **context_vars** see below
+- **node**, one node in the ansible_group
+
+Expected output type is `Hash(String, Obj)`.
+
+For instance, when building a [Consul](https://consul.io/) cluster, all the `consul-server` nodes should be configured with the ip to which Consul will bind client interfaces:
+
+``` ruby
+config.cluster.compose('test') do |c|
+  ...
+  c.ansible_host_vars['consul-server'] = lambda { |context, node| 
+    return { 'consul_client_ip' => node.ip } 
+  }
+  ...
+end
+```
+
+Ansible host vars will be stored into yaml files saved into `{cluster.ansible_playbook_path}\host_vars` folder.
+
+### Context vars
+
+Group vars and host var generation by design can operate only with the set of information that comes with a groups of nodes or a single node.
+
+However, sometimes, it is necessary to share some information across group of nodes, like for instance providing information about zookeeper nodes to mesos master nodes.
+
+This can be achieved by setting one or more context_vars generator for each ansible_groups.
+
+> Context_vars generator are always executed before group_vars and host_vars generators; the resulting context, is given in input to group_vars and host_vars generators.
+
+For instance, when building a [Consul](https://consul.io/) cluster, all the `consul-agent` nodes should be configured with the ip - the list of ip - to be used when joining the cluster; such list can be generated from the list of nodes in the `consul-server` set of nodes, and stored in a context_vars:
+
+``` ruby
+config.cluster.compose('test') do |c|
+  ...
+  c.context_vars['consul-server'] = lambda { |context, nodes| 
+    return { 'consul-serverIPs' => nodes.map { |n| n.ip }.to_a } 
+  }
+  ...
+end
+```
+
+Then, you can use the above context var when generating group_vars for nodes in the `consul-agent` group.
+
+``` ruby
+config.cluster.compose('test') do |c|
+  ...
+  c.context_vars['consul-server'] = lambda { |context, nodes| 
+    return { 'serverIPs' => nodes.map { |n| n.ip }.to_a } 
+  }
+  c.group_vars['consul-agent'] = lambda { |context, nodes| 
+    return { 'consul_joins' => context['consul-serverIPs']  } 
+  }
+  ...
+end
+```
+
+## Creating nodes (with provisioning) 
+
+Given `config.cluster.ansible_groups` variable, generated group_vars and host_vars files, and of course an ansible playbook, it is possible to integrate provisioning into the node creation sequence.
+
+NB. The example uses ansible parallel execution (all nodes are provisioned together in parallel after completing node creation).
+
+``` ruby
+config.cluster.nodes.each do |node|
+  config.vm.define "#{node.boxname}" do |node_vm|
+    ...
+    if node.index == config.cluster.nodes.size - 1
+      node_vm.vm.provision "ansible" do |ansible|
+        ansible.limit = 'all' # enable parallel provisioning
+        ansible.playbook = "provisioning/playbook.yml"
+        ansible.groups = config.cluster.ansible_groups
+      end
+    end
+  end
+end
+
+
+```
 

data/Rakefile

@@ -18,6 +18,4 @@ Bundler::GemHelper.install_tasks
 RSpec::Core::RakeTask.new
 
 # Default task is to run the unit tests
-task :default => "spec"
-
-print "zzz"
+task :default => "spec"

data/lib/vagrant/compose/config.rb

@@ -29,7 +29,6 @@ module VagrantPlugins
  	  	puts "==> cluster #{@cluster.name} with #{nodes.size} nodes" 
  	  	@nodes.each do |node|
 		   puts "        #{node.boxname} accessible as #{node.fqdn} #{node.aliases} #{node.ip} => [#{node.box}, #{node.cpus} cpus, #{node.memory} memory]"       
-
  	  	end
     	puts "    ansible_groups filtered by #{@cluster.multimachine_filter}" if not @cluster.multimachine_filter.empty?
  	  end

data/lib/vagrant/compose/util/cluster.rb

@@ -14,7 +14,7 @@ class Cluster
 
   # Costruttore di una istanza di cluster.
   def initialize(name)
-    @group_uid             = 0
+    @group_index             = 0
     @node_groups           = {}
     @ansible_context_vars  = {}
     @ansible_group_vars    = {}
@@ -32,23 +32,23 @@ class Cluster
   #
   # Oltre alla creazione dei nodi, il metodo prevede anche l'esecuzione di un blocco di codice per
   # la configurazione del gruppo di nodi stesso.
-  def nodes(name, &block)
+  def nodes(instances, name, &block)
     raise RuntimeError, "Nodes #{name} already exists in this cluster." unless not @node_groups.has_key?(name)
 
-    @node_groups[name] = NodeGroup.new(@group_uid, name)
+    @node_groups[name] = NodeGroup.new(@group_index, instances, name)
     @node_groups[name].box        = @box 
-    @node_groups[name].boxname    = lambda { |group_uid, group_name, node_index| return "#{group_name}#{node_index + 1}" }
-    @node_groups[name].hostname   = lambda { |group_uid, group_name, node_index| return "#{group_name}#{node_index + 1}" }
+    @node_groups[name].boxname    = lambda { |group_index, group_name, node_index| return "#{group_name}#{node_index + 1}" }
+    @node_groups[name].hostname   = lambda { |group_index, group_name, node_index| return "#{group_name}#{node_index + 1}" }
     @node_groups[name].aliases    = []
-    @node_groups[name].ip         = lambda { |group_uid, group_name, node_index| return "172.31.#{group_uid}.#{100 + node_index + 1}" }
+    @node_groups[name].ip         = lambda { |group_index, group_name, node_index| return "172.31.#{group_index}.#{100 + node_index + 1}" }
     @node_groups[name].cpus       = 1
     @node_groups[name].memory     = 256
     @node_groups[name].ansible_groups = []
     @node_groups[name].attributes = {}
 
-    @group_uid += 1 
+    @group_index += 1 
 
-    block.call(@node_groups[name])
+    block.call(@node_groups[name]) if block_given?
   end 
 
   # Prepara il provisioning del cluster
@@ -201,7 +201,7 @@ class Cluster
       end
     end
 
-    return nodes.map.with_index, ansible_groups_provision
+    return nodes, ansible_groups_provision
   end
 
 end 

data/lib/vagrant/compose/util/node.rb

@@ -1,30 +1,36 @@
-# Definisce un nodo, ovvero uno delle istanze di nodi che compongono il cluster
-class Node
-  attr_reader :box
-  attr_reader :boxname
-  attr_reader :hostname
-  attr_reader :fqdn
-  attr_reader :aliases
-  attr_reader :ip
-  attr_reader :cpus
-  attr_reader :memory
-  attr_reader :ansible_groups
-  attr_reader :attributes
-  attr_reader :index
-  attr_reader :group_index
+module VagrantPlugins
+  module Compose
 
-  def initialize(box, boxname, hostname, fqdn, aliases, ip, cpus, memory, ansible_groups, attributes, index, group_index) 
-    @box            = box
-    @boxname        = boxname
-    @hostname       = hostname
-    @fqdn           = fqdn
-    @aliases        = aliases
-    @ip             = ip
-    @cpus           = cpus
-    @memory         = memory
-    @ansible_groups = ansible_groups
-    @attributes     = attributes
-    @index          = index
-    @group_index    = group_index
+    # Definisce un nodo, ovvero uno delle istanze di nodi che compongono il cluster
+    class Node
+      attr_reader :box
+      attr_reader :boxname
+      attr_reader :hostname
+      attr_reader :fqdn
+      attr_reader :aliases
+      attr_reader :ip
+      attr_reader :cpus
+      attr_reader :memory
+      attr_reader :ansible_groups
+      attr_reader :attributes
+      attr_reader :index
+      attr_reader :group_index
+
+      def initialize(box, boxname, hostname, fqdn, aliases, ip, cpus, memory, ansible_groups, attributes, index, group_index) 
+        @box            = box
+        @boxname        = boxname
+        @hostname       = hostname
+        @fqdn           = fqdn
+        @aliases        = aliases
+        @ip             = ip
+        @cpus           = cpus
+        @memory         = memory
+        @ansible_groups = ansible_groups
+        @attributes     = attributes
+        @index          = index
+        @group_index    = group_index
+      end 
+    end
+  
   end 
 end

data/lib/vagrant/compose/util/node_group.rb

@@ -1,58 +1,65 @@
 require_relative "node"
 
-# Definisce un node group, ovvero un insieme di nodi con caratteristiche omogenee.
-# i singoli nodi del gruppo, sono generati in fase di compose tramite delle espressioni 
-# che generano i valori degli attributi che caratterizzano ogni nodo 
-class NodeGroup 
-  attr_reader :uid, :name
-  attr_accessor :instances
-  attr_accessor :box
-  attr_accessor :boxname
-  attr_accessor :hostname
-  attr_accessor :aliases
-  attr_accessor :ip
-  attr_accessor :cpus
-  attr_accessor :memory
-  attr_accessor :ansible_groups
-  attr_accessor :attributes
+module VagrantPlugins
+  module Compose
 
-  def initialize(uid, name)  
-    @uid  = uid
-    @name = name
-    @instances = 1
-  end  
+    # Definisce un node group, ovvero un insieme di nodi con caratteristiche omogenee.
+    # i singoli nodi del gruppo, sono generati in fase di compose tramite delle espressioni 
+    # che generano i valori degli attributi che caratterizzano ogni nodo 
+    class NodeGroup 
+      attr_reader :uid
+      attr_reader :name
+      attr_reader :instances
+      attr_accessor :box
+      attr_accessor :boxname
+      attr_accessor :hostname
+      attr_accessor :aliases
+      attr_accessor :ip
+      attr_accessor :cpus
+      attr_accessor :memory
+      attr_accessor :ansible_groups
+      attr_accessor :attributes
 
-  # compone il gruppo, generando le istanze dei vari nodi
-  def compose(cluster_name, cluster_domain, cluster_offset)
-    node_index = 0
-    while node_index < @instances
-      box            = generate(:box, @box, node_index) 
-      boxname        = "#{cluster_name}-#{generate(:boxname, @boxname, node_index)}" 
-      hostname       = "#{cluster_name}-#{generate(:hostname, @hostname, node_index)}" 
-      aliases        = generate(:aliases, @aliases, node_index).join(',')
-      fqdn           = "#{hostname}.#{cluster_domain}"
-      ip             = generate(:ip, @ip, node_index)
-      cpus           = generate(:cpus, @cpus, node_index)
-      memory         = generate(:memory, @memory, node_index) 
-      ansible_groups = generate(:ansible_groups, @ansible_groups, node_index)
-      attributes     = generate(:attributes, @attributes, node_index)
-      yield Node.new(box, boxname, hostname, fqdn, aliases, ip, cpus, memory, ansible_groups, attributes, cluster_offset + node_index, node_index)
+      def initialize(index, instances, name)  
+        @index  = index
+        @name = name
+        @instances = instances
+      end  
 
-      node_index += 1
-    end
-  end
+      # compone il gruppo, generando le istanze dei vari nodi
+      def compose(cluster_name, cluster_domain, cluster_offset)
+        node_index = 0
+        while node_index < @instances
+          box            = generate(:box, @box, node_index) 
+          boxname        = "#{cluster_name}-#{generate(:boxname, @boxname, node_index)}" 
+          hostname       = "#{cluster_name}-#{generate(:hostname, @hostname, node_index)}" 
+          aliases        = generate(:aliases, @aliases, node_index).join(',')
+          fqdn           = cluster_domain.empty? "#{hostname}" : "#{hostname}.#{cluster_domain}"
+          ip             = generate(:ip, @ip, node_index)
+          cpus           = generate(:cpus, @cpus, node_index)
+          memory         = generate(:memory, @memory, node_index) 
+          ansible_groups = generate(:ansible_groups, @ansible_groups, node_index)
+          attributes     = generate(:attributes, @attributes, node_index)
+          yield Node.new(box, boxname, hostname, fqdn, aliases, ip, cpus, memory, ansible_groups, attributes, cluster_offset + node_index, node_index)
+
+          node_index += 1
+        end
+      end
 
-  # funzione di utilità per l'esecuzione delle espressioni che generano 
-  # i valori degli attributi
-  def generate(var, generator, node_index)
-    unless generator.respond_to? :call
-      return generator
-    else
-      begin
-        return generator.call(@uid, @name, node_index) 
-      rescue Exception => e
-        raise VagrantPlugins::Compose::Errors::AttributeExpressionError, :message => e.message, :attribute => var, :node_index => node_index, :node_group_name => name
+      # funzione di utilità per l'esecuzione delle espressioni che generano 
+      # i valori degli attributi
+      def generate(var, generator, node_index)
+        unless generator.respond_to? :call
+          return generator
+        else
+          begin
+            return generator.call(@index, @name, node_index) 
+          rescue Exception => e
+            raise VagrantPlugins::Compose::Errors::AttributeExpressionError, :message => e.message, :attribute => var, :node_index => node_index, :node_group_name => name
+          end
+        end
       end
-    end
+    end 
+  
   end
 end 

data/lib/vagrant/compose/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Compose
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-compose
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Fabrizio Pandini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,7 +75,6 @@ files:
 - lib/vagrant/compose/version.rb
 - lib/vagrant/compose.rb
 - LICENCE
-- provisioning/group_vars/zookeeper.yml
 - Rakefile
 - README.md
 - vagrant-compose.gemspec

data/provisioning/group_vars/zookeeper.yml

@@ -1,2 +0,0 @@
----
-x: 1