vagrant-hivemind 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf6137dfb1a1ea4798ff8f91be820359ac113d2a
-  data.tar.gz: 59ded208cea99ba17c56026756b09fa4c2f463ca
+  metadata.gz: 37e005addc8503ba5ab6d4258211d6467da98cc2
+  data.tar.gz: cb535a157c3ec342bf9f6f5463bb4f97647e8e0b
 SHA512:
-  metadata.gz: 31eb3b3fde613955d41bc54671cdc4fd5502561ba0e081051b667b21e304c6b5021453ad9bedc275686b9ec47a6b72f61df37432806d090e722c0e9a7bfbe263
-  data.tar.gz: 2e6def42b2df88488b9dbdfe3ce1147fe7b585d3a9f109ba421f61c295d698534347000456449e6fe3315aee3ed76ff12bb9069cc2e18d590e8737021897accc
+  metadata.gz: 8aa3bf6452dfb1f4d2a369de2901813a0c39731960dcc6ca7964a8ac820c72efbc1295e42780ab30badc447aaae590251072736e470746060599712358fc87b7
+  data.tar.gz: fc57c480818d6eda514e92566b47ee8a2d3cccddaac2ba8090ae4e7bc956ad5e88341753117e730761af62af462885828eedf942cb3cc21a9214db9f65c5dbda

data/lib/vagrant/hivemind/commands/desc.rb

@@ -64,6 +64,7 @@ module Vagrant
           @env.ui.info "Box Size        : #{BOX_SIZES[host.box_size.to_sym][:name]} (#{BOX_SIZES[host.box_size.to_sym][:memory_in_mb]}MB)"
           @env.ui.info "Box Type        : #{BOX_TYPES[host.box_type.to_sym][:name]} (#{BOX_TYPES[host.box_type.to_sym][:box_id]})"
           @env.ui.info "GUI Machine     : #{BOX_TYPES[host.box_type.to_sym][:is_gui] ? 'Yes' : 'No'}"
+          @env.ui.info "Detached Data   : #{host.is_data_detached ? 'Yes' : 'No'}"
           @env.ui.info ""
 
           if host.forwarded_ports and !host.forwarded_ports.empty?

data/lib/vagrant/hivemind/commands/list.rb

@@ -62,7 +62,7 @@ module Vagrant
 
           Vagrant::Hivemind::Util::Vagrantfile.generate_hivemind_vagrantfile @env, sorted_hosts, root_path
 
-          @env.ui.info "Hostname             IP Address     C Size         Box Type   G Status"
+          @env.ui.info "Hostname             IP Address     C Size         Box Type   G D Status"
           sorted_hosts.values.each do |host|
             status = ""
             with_target_vms(host.hostname) do |machine|
@@ -74,7 +74,8 @@ module Vagrant
             box_size       = BOX_SIZES[host.box_size.to_sym][:name]
             box_type       = BOX_TYPES[host.box_type.to_sym][:name]
             is_gui_y_n     = BOX_TYPES[host.box_type.to_sym][:is_gui] ? 'Y' : 'N'
-            @env.ui.info "#{'%-20.20s' % hostname} #{'%-14.14s' % ip_address} #{is_control_y_n} #{'%-12.12s' % box_size} #{'%-10.10s' % box_type} #{is_gui_y_n} #{status}"
+            is_data_detached_y_n = host.is_data_detached ? 'Y' : 'N'
+            @env.ui.info "#{'%-20.20s' % hostname} #{'%-14.14s' % ip_address} #{is_control_y_n} #{'%-12.12s' % box_size} #{'%-10.10s' % box_type} #{is_gui_y_n} #{is_data_detached_y_n} #{status}"
           end
           @env.ui.info ""
 

data/lib/vagrant/hivemind/commands/morph.rb

@@ -44,6 +44,10 @@ module Vagrant
               options[:forwarded_port] = p
             end
 
+            o.on("-D", "--detach-data", "Detach the Drone's data directory as a synced folder to the host") do |d|
+              options[:detach] = d
+            end
+
             o.on("-d", "--directory DIRECTORY", "Specify the directory where '#{HIVE_FILE}' is located (default: current directory)") do |d|
               options[:directory] = []
               options[:directory] << d
@@ -118,6 +122,10 @@ module Vagrant
             end
           end
 
+          if options[:detach]
+            host.is_data_detached = true
+          end
+
           hosts.delete options[:hostname]
           drone = {
             options[:hostname] => host

data/lib/vagrant/hivemind/commands/spawn.rb

@@ -40,6 +40,10 @@ module Vagrant
               options[:type] = t
             end
 
+            o.on("-D", "--detach-data", "Detach the Drone's data directory as a synced folder to the host") do |d|
+              options[:detach] = d
+            end
+
             o.on("-d", "--directory DIRECTORY", "Specify the directory where '#{HIVE_FILE}' is located (default: current directory)") do |d|
               options[:directory] = []
               options[:directory] << d
@@ -80,7 +84,8 @@ module Vagrant
               {
                 is_control: options[:control],
                 box_size:   options[:size],
-                box_type:   options[:type]
+                box_type:   options[:type],
+                is_data_detached: options[:detach]
               })
           }
           HiveFile.write_to hosts.merge(drone), root_path

data/lib/vagrant/hivemind/host.rb

@@ -3,7 +3,7 @@ require_relative "constants"
 module Vagrant
   module Hivemind
     class Host
-      attr_accessor :hostname, :ip_address, :is_control, :box_size, :box_type, :forwarded_ports
+      attr_accessor :hostname, :ip_address, :is_control, :box_size, :box_type, :forwarded_ports, :is_data_detached
       @control = nil
 
       def initialize(hostname, ip_address, options = {})
@@ -13,6 +13,7 @@ module Vagrant
         @box_size   = options[:box_size]   || :small.to_s
         @box_type   = options[:box_type]   || :server.to_s
         @forwarded_ports = []
+        @is_data_detached = options[:is_data_detached] || false
       end
 
       def self.control

data/lib/vagrant/hivemind/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Hivemind
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/templates/Vagrantfile.erb

@@ -14,27 +14,32 @@ Vagrant.configure(2) do |config|
 
     host_config.vm.synced_folder "<%= cache_path %>/cache/hivemind", "/var/cache/hivemind", create: true
     host_config.vm.synced_folder "<%= cache_path %>/cache/apt", "/var/cache/apt/archives", create: true
+
+    <% if host.is_data_detached %>
+    host_config.vm.synced_folder "<%= path %>/data/<%= host.hostname %>", "/var/data", create: true
+    <% end %>
+
     host_config.vm.provision "shell", run: "once" do |s|
       s.path = "<%= hivemind_home_path %>/scripts/setup-hostname.sh"
       s.args = ["<%= host.hostname %>"]
     end
 
-    if "<%= host.is_control %>" == "true"
-      # Setup Control Machine SSH
-      # 1. Copy the private key
-      host_config.vm.provision "file", source: "<%= hivemind_home_path %>/keys/id_rsa", destination: "/home/vagrant/.ssh/id_rsa", run: "once"
+    <% if host.is_control %>
+    # Setup Control Machine SSH
+    # 1. Copy the private key
+    host_config.vm.provision "file", source: "<%= hivemind_home_path %>/keys/id_rsa", destination: "/home/vagrant/.ssh/id_rsa", run: "once"
 
-      # 2. Set the right permissions of the SSH directory and private key
-      host_config.vm.provision "shell", path: "<%= hivemind_home_path %>/scripts/setup-control-ssh.sh", run: "once"
+    # 2. Set the right permissions of the SSH directory and private key
+    host_config.vm.provision "shell", path: "<%= hivemind_home_path %>/scripts/setup-control-ssh.sh", run: "once"
 
-      # Setup Ansible in the Control Machine
-      # 1. Install Ansible from the PPA
-      host_config.vm.provision "shell", path: "<%= hivemind_home_path %>/scripts/install-ansible.sh", run: "once"
+    # Setup Ansible in the Control Machine
+    # 1. Install Ansible from the PPA
+    host_config.vm.provision "shell", path: "<%= hivemind_home_path %>/scripts/install-ansible.sh", run: "once"
 
-      # 2. Copy the Ansible hosts file: First to /tmp, next from /tmp to /etc/ansible/hosts using sudo
-      host_config.vm.provision "file", source: "<%= local_data_path %>/ansible.hosts", destination: "/tmp/ansible.hosts", run: "always"
-      host_config.vm.provision "shell", path: "<%= hivemind_home_path %>/scripts/post-install-ansible.sh", run: "always"
-    end
+    # 2. Copy the Ansible hosts file: First to /tmp, next from /tmp to /etc/ansible/hosts using sudo
+    host_config.vm.provision "file", source: "<%= local_data_path %>/ansible.hosts", destination: "/tmp/ansible.hosts", run: "always"
+    host_config.vm.provision "shell", path: "<%= hivemind_home_path %>/scripts/post-install-ansible.sh", run: "always"
+    <% end %>
 
     # Setup Drone SSH
     # 1. Copy the Control Machine public key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hivemind
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nap Ramirez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler