vagrant-compose 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2ca4a2adb7273d09c0650fa06fc3d3f059d8e3a
-  data.tar.gz: 95c5b8b69f87f119e51b76507cba24716902625c
+  metadata.gz: 4c6ecc542370d381b4e4636b64a51eb34cb90d98
+  data.tar.gz: f7846bf3c0d2956c29cea6faf68a767a2bb6ffe0
 SHA512:
-  metadata.gz: f24a63d849bd0b574bed06bdcc1e454b6549f93a1ef0bd4367888541cf889f5bdf79f5e13ccfc320c9a546ce4712181428e5a5a905ba2c56a335b42753df30d8
-  data.tar.gz: 1a682bf36be2fb2d1b6501bbae5ed7b04e29d206d7c8aa45192b584d0ecdd37f58787c2f2357d0e37826a44bd27eccc0b9503f633a5719c8a9cb217973db9496
+  metadata.gz: 25546d557103418fe05a94b315c98b56e09c05bfebbe1c8d3117110d82604bca6f2a9b7722fd2244156372c1fbbe975125036ba1bfe592eb5f698ff602ec8000
+  data.tar.gz: 62d8daf320048e2d101222d6ddb49faa0498d258d589b4ff2309fb5da4db6686dc5474487cdf89894439d993134b12b695a2a2eaa997d28580d52faf9ddb1425

data/CHANGELOG.md

@@ -40,3 +40,9 @@ ansible_group_vars_path and ansible_host_vars_path are not supported anymore
 
 * Minor fix
 
+# 0.7.2 (November 16, 2016)
+
+* issues #11 Allow management of Ansible vars for all hosts
+* issues #9 Create group_vars and host_vars directory only if necessary
+
+* breacking change: custom group of groups all_groups:children removed. Insteal use all (automatically created by ansible)

data/doc/declarative.md

@@ -295,9 +295,9 @@ kubernetes:
     ...
   ...
   ansible_group_vars:
-    etcd :
+    etcd:
       var1: ...
-    docker :
+    docker:
       var2: ...
       var3: ...
   ...
@@ -308,6 +308,17 @@ Group vars can be set to literal value or to Jinja2 value generators, that will
 - **context_vars** see below
 - **nodes**, list of nodes in the ansible_group to which the group_vars belong
 
+Additionally it is possible to set variables for all groups/all hosts, by setting vars for the pre-defined `all` group of groups:
+
+```yaml
+kubernetes:
+  ...
+  ansible_group_vars:
+    all:
+      var1: ...
+  ...
+```
+
 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 & cluster attributes).
@@ -384,18 +395,42 @@ Context vars can be set to literal value or to Jinja2 value generators, that wil
 
 - nodes, list of nodes in the ansible_group to which the group_vars belong
 
-
 > 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.
 
+> In addition to context vars for groups, it is possible to create context_vars for all groups/all hosts, by setting vars for the pre-defined `all` group of groups; in this case, intuitively, the list of nodes whitin the context contains all the nodes.
+
 Then, you can use the above context var when generating group_vars for host vars.
 
+```yaml
+kubernetes:
+  box: centos/7
+  master:
+    ...
+    ansible_groups:
+      - kb8-master
+  minions:
+    ...
+    ansible_groups:
+      - kb8-minions
+
+  ansible_context_vars:
+    all:
+      var0: "{{ nodes | count }}"
+    kb8-master:
+      var1: "{{ nodes | count }}"
+
+  ansible_group_vars:
+    all:
+      var0_from_context: "{{ context['var0'] }}"
+    kb8-master:
+      var1_from_context: "{{ context['var1'] }}"
+```
+
 ### Group of groups
 
 A useful ansible inventory feature is [group of groups](http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups).
 
-By default vagrant-compose will generate a group named `[all_groups:children]` with all the ansible_groups defined in cluster configuration; however:
-- you cannot rename all_groups
-- you cannot exclude any ansible group from all_groups.
+By default ansible has a group named `[all]` with all nodes in the cluster.
 
 If you need higher control on groups of groups you can simply add a new item to the variable `config.cluster.ansible_groups` before creating nodes.
 

data/doc/programmatic.md

@@ -302,9 +302,9 @@ 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.
+Ansible playbook can additionally leverage on groups for providing machines with the required software stacks.
 
-NB. you can see resulting ansible_groups by using `debug` command with `verbose` equal to `true`.
+> NB. you can see resulting ansible_groups by using `debug` command with `verbose` equal to `true`.
 
 ### Defining group vars
 
@@ -329,6 +329,18 @@ config.cluster.compose('test') do |c|
 end
 ```
 
+Additionally, it is possible to set variables for all groups/all hosts, by setting vars for the pre-defined `all` group of groups:
+
+``` ruby
+config.cluster.compose('test') do |c|
+  ...
+  c.ansible_group_vars['all'] = lambda { |context, nodes|
+    return { 'var0' => 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).
@@ -379,6 +391,8 @@ end
 
 > 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.
 
+> In addition to context vars for groups, it is possible to create context_vars for all groups/all hosts, by setting vars for the pre-defined `all` group of groups; in this case, intuitively, the list of nodes whitin the context contains all the nodes.
+
 Then, you can use the above context var when generating group_vars for nodes in the `consul-agent` group.
 
 ``` ruby
@@ -397,9 +411,7 @@ end
 ### Group of groups
 A useful ansible inventory feature is [group of groups](http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups).
 
-By default vagrant-compose will generate a group named `[all_groups:children]` with all the ansible_groups defined in cluster configuration; however:
-- you cannot rename all_groups
-- you cannot exclude any ansible group from all_groups.
+By default ansible has a group named `[all]` with all the nodes defined in cluster configuration.
 
 If you need higher control on groups of groups you can simply add a new item to the variable `config.cluster.ansible_groups` before creating nodes.
 

data/lib/vagrant/compose/config.rb

@@ -62,8 +62,6 @@ module VagrantPlugins
           end
         end
 
-        ansible_groups['all_groups:children'] = ansible_groups.keys
-
         return ansible_groups
       end
 

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

@@ -74,16 +74,19 @@ module VagrantPlugins
             # TODO: make safe
             ansible_group_vars_path = File.join(@ansible_playbook_path, 'group_vars')
 
-            FileUtils.mkdir_p(ansible_group_vars_path) unless File.exists?(ansible_group_vars_path)
-            Dir.foreach(ansible_group_vars_path) {|f| fn = File.join(ansible_group_vars_path, f); File.delete(fn) if f.end_with?(".yml")}
+            if File.exists?(ansible_group_vars_path)
+              Dir.foreach(ansible_group_vars_path) {|f| fn = File.join(ansible_group_vars_path, f); File.delete(fn) if f.end_with?(".yml")}
+            end
 
             #generazione ansible_group_vars file (NB. 1 group = 1 gruppo host ansible)
             if ansible.key?("group_vars")
               ansible['group_vars'].each do |group, vars|
                 # crea il file (se sono state generate delle variabili)
                 unless vars.empty?
+                  FileUtils.mkdir_p(ansible_group_vars_path) unless File.exists?(ansible_group_vars_path)
                   # TODO: make safe
-                  File.open(File.join(ansible_group_vars_path,"#{group}.yml") , 'w+') do |file|
+                  fileName = group.gsub(':', '_')
+                  File.open(File.join(ansible_group_vars_path,"#{fileName}.yml") , 'w+') do |file|
                     file.puts YAML::dump(vars)
                   end
                 end
@@ -94,14 +97,17 @@ module VagrantPlugins
             # TODO: make safe
             ansible_host_vars_path = File.join(@ansible_playbook_path, 'host_vars')
 
-            FileUtils.mkdir_p(ansible_host_vars_path) unless File.exists?(ansible_host_vars_path)
-            Dir.foreach(ansible_host_vars_path) {|f| fn = File.join(ansible_host_vars_path, f); File.delete(fn) if f.end_with?(".yml")}
+            if File.exists?(ansible_host_vars_path)
+              Dir.foreach(ansible_host_vars_path) {|f| fn = File.join(ansible_host_vars_path, f); File.delete(fn) if f.end_with?(".yml")}
+            end
 
             #generazione ansible_host_vars file 
             if ansible.key?("host_vars")
               ansible['host_vars'].each do |host, vars|
                 # crea il file (se sono state generate delle variabili)
                 unless vars.empty?
+                  FileUtils.mkdir_p(ansible_host_vars_path) unless File.exists?(ansible_host_vars_path)
+                  
                   # TODO: make safe
                   File.open(File.join(ansible_host_vars_path,"#{host}.yml") , 'w+') do |file|
                     file.puts YAML::dump(vars)

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

@@ -94,6 +94,7 @@ module VagrantPlugins
               ansible_groups[ansible_group] << node
             end
           end
+          extended_ansible_groups = ansible_groups.merge({'all' => nodes})
 
           ## Fase2: Configurazione provisioning del cluster via Ansible
           # Ogni nodo diventerà una vm su cui sarà fatto il provisioning, ovvero un host nell'inventory di ansible
@@ -120,7 +121,7 @@ module VagrantPlugins
           context = {}
 
           #genearazione context (NB. 1 group = 1 gruppo host ansible)
-          ansible_groups.each do |ansible_group, ansible_group_nodes|
+          extended_ansible_groups.each do |ansible_group, ansible_group_nodes|
             # genero le variabili per il group
             provisioners = @ansible_context_vars[ansible_group]
             unless provisioners.nil?
@@ -145,11 +146,12 @@ module VagrantPlugins
           # TODO: make safe
           ansible_group_vars_path = File.join(@ansible_playbook_path, 'group_vars')
 
-          FileUtils.mkdir_p(ansible_group_vars_path) unless File.exists?(ansible_group_vars_path)
-          Dir.foreach(ansible_group_vars_path) {|f| fn = File.join(ansible_group_vars_path, f); File.delete(fn) if f.end_with?(".yml")}
+          if File.exists?(ansible_group_vars_path)
+            Dir.foreach(ansible_group_vars_path) {|f| fn = File.join(ansible_group_vars_path, f); File.delete(fn) if f.end_with?(".yml")}
+          end
 
           #generazione ansible_group_vars file (NB. 1 group = 1 gruppo host ansible)
-          ansible_groups.each do |ansible_group, ansible_group_nodes|
+          extended_ansible_groups.each do |ansible_group, ansible_group_nodes|
             ansible_group_vars = {}
             # genero le variabili per il group
             provisioners = @ansible_group_vars[ansible_group]
@@ -171,8 +173,11 @@ module VagrantPlugins
 
             # crea il file (se sono state generate delle variabili)
             unless ansible_group_vars.empty?
+              FileUtils.mkdir_p(ansible_group_vars_path) unless File.exists?(ansible_group_vars_path)
+
               # TODO: make safe
-              File.open(File.join(ansible_group_vars_path,"#{ansible_group}.yml") , 'w+') do |file|
+              fileName = ansible_group.gsub(':', '_')
+              File.open(File.join(ansible_group_vars_path,"#{fileName}.yml") , 'w+') do |file|
                 file.puts YAML::dump(ansible_group_vars)
               end
             end
@@ -182,8 +187,9 @@ module VagrantPlugins
           # TODO: make safe
           ansible_host_vars_path = File.join(@ansible_playbook_path, 'host_vars')
 
-          FileUtils.mkdir_p(ansible_host_vars_path) unless File.exists?(ansible_host_vars_path)
-          Dir.foreach(ansible_host_vars_path) {|f| fn = File.join(ansible_host_vars_path, f); File.delete(fn) if f.end_with?(".yml")}
+          if File.exists?(ansible_host_vars_path)
+            Dir.foreach(ansible_host_vars_path) {|f| fn = File.join(ansible_host_vars_path, f); File.delete(fn) if f.end_with?(".yml")}
+          end 
 
           #generazione ansible_host_vars file
           nodes.each do |node|
@@ -211,6 +217,8 @@ module VagrantPlugins
 
             # crea il file (se sono state generate delle variabili)
             unless ansible_host_vars.empty?
+              FileUtils.mkdir_p(ansible_host_vars_path) unless File.exists?(ansible_host_vars_path)
+
               # TODO: make safe
               File.open(File.join(ansible_host_vars_path,"#{node.hostname}.yml") , 'w+') do |file|
                 file.puts YAML::dump(ansible_host_vars)

data/lib/vagrant/compose/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Compose
-    VERSION = "0.7.1"
+    VERSION = "0.7.2"
   end
 end

data/provisioning/group_vars/all.yml

@@ -0,0 +1,2 @@
+---
+var0_bis: '2'

data/provisioning/group_vars/kb8-master.yml

@@ -0,0 +1,2 @@
+---
+var1_bis: '1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-compose
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Fabrizio Pandini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,6 +92,8 @@ files:
 - lib/vagrant/compose/version.rb
 - lib/vagrant/compose.rb
 - LICENCE
+- provisioning/group_vars/all.yml
+- provisioning/group_vars/kb8-master.yml
 - Rakefile
 - README.md
 - vagrant-compose.gemspec