vagabond 0.2.0 → 0.2.2

data/lib/vagabond/cookbooks/lxc/providers/default.rb

@@ -0,0 +1,57 @@
+def load_current_resource
+  @lxc = ::Lxc.new(
+    new_resource.name,
+    :base_dir => node[:lxc][:container_directory],
+    :dnsmasq_lease_file => node[:lxc][:dnsmasq_lease_file]
+  )
+end
+
+action :create do
+  _lxc = @lxc
+  execute "LXC Create: #{new_resource.name}" do
+    command "lxc-create -n #{new_resource.name} -t #{new_resource.template} -- #{new_resource.template_opts.to_a.flatten.join(' ')}"
+    only_if do
+      !_lxc.exists? && new_resource.updated_by_last_action(true)
+    end
+  end
+end
+
+action :clone do
+  _lxc = @lxc
+  _base_lxc = ::Lxc.new(
+    new_resource.base_container,
+    :base_dir => node[:lxc][:container_directory],
+    :dnsmasq_lease_file => node[:lxc][:dnsmasq_lease_file]
+  )
+
+  unless(_base_lxc.exists?)
+    raise "LXC clone failed! Base container #{new_resource.base_container} does not exist. Cannot create #{new_resource.name}"
+  end
+  
+  execute "LXC Clone: #{new_resource.base_container} -> #{new_resource.name}" do
+    command "lxc-clone -o #{new_resource.base_container} -n #{new_resource.name}"
+    only_if do
+      !_lxc.exists? && new_resource.updated_by_last_action(true)
+    end
+  end
+
+end
+
+action :delete do
+  _lxc = @lxc
+  ruby_block "Stop container #{new_resource.name}" do
+    block do
+      _lxc.shutdown
+    end
+    only_if do
+      _lxc.exists? && _lxc.running?
+    end
+  end
+
+  execute "Destroy container #{new_resource.name}" do
+    command "lxc-destroy #{new_resource.name}"
+    only_if do
+      _lxc.exists?
+    end
+  end
+end

data/lib/vagabond/cookbooks/lxc/providers/ephemeral.rb

@@ -0,0 +1,40 @@
+use_inline_resources if self.respond_to?(:use_inline_resources)
+
+def load_current_resource
+  @lxc = ::Lxc.new(
+    new_resource.base_container,
+    :base_dir => node[:lxc][:container_directory],
+    :dnsmasq_lease_file => node[:lxc][:dnsmasq_lease_file]
+  )
+  unless(@lxc.exists?)
+    raise "Requested base contianer: #{new_resource.base_container} does not exist"
+  end
+  @start_script = node[:lxc][:awesome_ephemerals] ? '/usr/local/bin/lxc-awesome-ephemeral' : 'lxc-ephemeral-start'
+  unless(node[:lxc][:awesome_ephemerals])
+    %w(host_rootfs virtual_device).each do |key|
+      if(resource.send(key))
+        raise "#{key} lxc ephemeral attribute only valid when awesome_ephemerals is true!"
+      end
+    end
+  end
+end
+
+action :run do
+  com = [@start_script]
+  com << "-o #{new_resource.base_container}"
+  com << "-b #{new_resource.bind_directory}" if new_resource.bind_directory
+  com << "-U #{new_resource.union_type}"
+  com << "-u #{new_resource.user}"
+  com << "-S #{new_resource.key}"
+  com << "-z #{new_resource.host_rootfs}" if new_resource.host_rootfs
+  com << "-D #{new_resource.virtual_device}" if new_resource.virtual_device 
+  if(new_resource.background)
+    Chef::Log.warn("Ephemeral container will be backgrounded: #{new_resource.name}")
+    com << '-d'
+  end
+  com << "\"#{new_resource.command}\"" # TODO: fix this to be proper
+  execute "LXC ephemeral: #{new_resource.name}" do
+    command com.join(' ')
+    stream_output new_resource.stream_output
+  end
+end

data/lib/vagabond/cookbooks/lxc/providers/fstab.rb

@@ -1,71 +1,30 @@
 def load_current_resource
-  new_resource._lxc Lxc.new(
-    new_resource.container,
-    :base_dir => node[:lxc][:container_directory],
-    :dnsmasq_lease_file => node[:lxc][:dnsmasq_lease_file]
-  )
-  @loaded ||= {}
+  if(new_resource.auto_join_rootfs_mount)
+    new_resource.mount_point(
+      ::Lxc.new(new_resource.container).rootfs.join(
+        new_resource.mount_point
+      ).to_path
+    )
+  end
   node.run_state[:lxc] ||= Mash.new
   node.run_state[:lxc][:fstabs] ||= Mash.new
   node.run_state[:lxc][:fstabs][new_resource.container] ||= []
 end
 
 action :create do
-  unless(@loaded[new_resource.container])
-    @loaded[new_resource.container] = true
-    ruby_block "lxc_fstab_notifier[#{new_resource.container}]" do
-      action :create
-      block{ true }
-      only_if do
-        new_resource.updated_by_last_action?
-      end
-    end
-    template ::File.join(new_resource._lxc.container_path, 'fstab') do
-      cookbook 'lxc'
-      source 'fstab.erb'
-      mode 0644
-      variables :container => new_resource.container
-      subscribes :create, resources(:ruby_block => "lxc_fstab_notifier[#{new_resource.container}]"), :delayed
-    end
-  end
 
   line = "#{new_resource.file_system}\t#{new_resource.mount_point}\t" <<
     "#{new_resource.type}\t#{Array(new_resource.options).join(',')}\t" <<
     "#{new_resource.dump}\t#{new_resource.pass}"
 
+  if(new_resource.create_mount_point)
+    directory new_resource.mount_point do
+      recursive true
+    end
+  end
+  
   unless(node.run_state[:lxc][:fstabs][new_resource.container].include?(line))
     node.run_state[:lxc][:fstabs][new_resource.container] << line
-    new_resource.updated_by_last_action(true)
-  end
-
-end
-
-action :delete do
-  unless(@loaded[new_resource.container])
-    @loaded[new_resource.container] = true
-    
-    ruby_block "lxc_fstab_notifier[#{new_resource.container}]" do
-      action :create
-      block{ true }
-      only_if do
-        new_resource.updated_by_last_action?
-      end
-    end
-
-    template ::File.join(new_resource._lxc.container_path, 'fstab') do
-      cookbook 'lxc'
-      source 'fstab.erb'
-      mode 0644
-      variables :container => new_resource.container
-      subscribes :create, resources(:ruby_block => "lxc_fstab_notifier[#{new_resource.container}]"), :delayed
-    end
   end
 
-  line = "#{new_resource.file_system}\t#{new_resource.mount_point}\t" <<
-    "#{new_resource.type}\t#{Array(new_resource.options).join(' ')}\t" <<
-    "#{new_resource.dump}\t#{new_resource.pass}"
-  if(node.run_state[:lxc][:fstabs][new_resource.container].include?(line))
-    node.run_state[:lxc][:fstabs][new_resource.container].delete(line)
-    new_resource.updated_by_last_action(true)
-  end
 end

data/lib/vagabond/cookbooks/lxc/providers/interface.rb

@@ -1,5 +1,5 @@
 def load_current_resource
-  @lxc = Lxc.new(
+  @lxc = ::Lxc.new(
     new_resource.container,
     :base_dir => node[:lxc][:container_directory],
     :dnsmasq_lease_file => node[:lxc][:dnsmasq_lease_file]
@@ -11,89 +11,35 @@ def load_current_resource
       raise "#{key} is required for static interfaces" if new_resource.send(key).nil?
     end
   end
-  # address checks
-  unless(new_resource.dynamic)
-    %w(address).each do |key|
-      new_resource.send(key).split('.').each do |oct|
-        raise "#{key} is not a valid address" if oct.to_i > 254
-      end
-    end
-    new_resource.netmask.split('.').each do |oct|
-      raise 'netmask is not valid' if oct.to_i > 255
-    end
-  end
-  interfaces = node[:lxc][:interfaces] || Mash.new
-  interfaces[new_resource.container] ||= []
-  node[:lxc][:interfaces] = interfaces
+  node.run_state[:lxc] ||= Mash.new
+  node.run_state[:lxc][:interfaces] ||= Mash.new
+  node.run_state[:lxc][:interfaces][new_resource.container] ||= []
 end
 
 action :create do
+  raise 'Device is required for creating an LXC interface!' unless new_resource.device
+  
   unless(@loaded[new_resource.container])
     @loaded[new_resource.container] = true
-    ruby_block "lxc_interface_notifier[#{new_resource.container}]" do
-      action :create
-      block{ true }
-      only_if do
-        new_resource.updated_by_last_action?
-      end
-    end
-    template ::File.join(@lxc.rootfs, 'etc', 'network', 'interfaces') do
-      source 'interface.erb'
-      cookbook 'lxc'
-      variables :container => new_resource.container
-      subscribes :create, resources(:ruby_block => "lxc_interface_notifier[#{new_resource.container}]"), :delayed
-      mode 0644
-    end
   end
 
   net_set = Mash.new(:device => new_resource.device)
   if(new_resource.dynamic)
     net_set[:dynamic] = true
   else
+    net_set[:auto] = new_resource.auto
     net_set[:address] = new_resource.address
     net_set[:gateway] = new_resource.gateway
     net_set[:netmask] = new_resource.netmask
+    net_set[:up] = new_resource.up if new_resource.up
+    net_set[:down] = new_resource.down if new_resource.down
+    net_set[:ipv6] = new_resource.ipv6
   end
 
-  unless(node[:lxc][:interfaces][new_resource.container].include?(net_set))
-    current_interfaces = node[:lxc][:interfaces][new_resource.container].dup
-    current_interfaces << net_set
-    node[:lxc][:interfaces][new_resource.contaienr] = current_interfaces
-    new_resource.updated_by_last_action(true)
-  end
+  node.run_state[:lxc][:interfaces][new_resource.container] << net_set
 end
 
 action :delete do
-  unless(@loaded[new_resource.container])
-    @loaded[new_resource.container] = true
-    ruby_block "lxc_interface_notifier[#{new_resource.container}]" do
-      action :create
-      block{ true }
-      only_if do
-        new_resource.updated_by_last_action?
-      end
-    end
-    template ::File.join(@lxc.rootfs, 'etc', 'interfaces') do
-      cookbook 'lxc'
-      source 'interface.erb'
-      variables :container => new_resource.container
-      subscribes :create, resources(:ruby_block => "lxc_interface_notifier[#{new_resource.container}]"), :delayed
-    end
-  end
-
-  net_set = Mash.new(:device => new_resource.device)
-  if(new_resource.dynamic)
-    net_set[:dynamic] = true
-  else
-    net_set[:address] = new_resource.address
-    net_set[:gateway] = new_resource.gateway
-    net_set[:netmask] = new_resource.netmask
-  end
-
-  if(node[:lxc][:interfaces][new_resource.container].include?(net_set))
-    current_interfaces = node[:lxc][:interfaces][new_resource.container].dup
-    current_interfaces.delete(net_set)
-    node[:lxc][:interfaces][new_resource.contaienr] = current_interfaces
-    new_resource.updated_by_last_action(true)
-  end
+  # do nothing, simply not provided to run_state, and thus implicitly
+  # deleted
 end

data/lib/vagabond/cookbooks/lxc/providers/service.rb

@@ -1,5 +1,5 @@
 def load_current_resource
-  new_resource._lxc Lxc.new(
+  @lxc = ::Lxc.new(
     new_resource.name,
     :base_dir => node[:lxc][:container_directory],
     :dnsmasq_lease_file => node[:lxc][:dnsmasq_lease_file]
@@ -10,44 +10,44 @@ def load_current_resource
 end
 
 action :start do
-  if(new_resource._lxc.stopped?)
-    new_resource._lxc.start
+  if(@lxc.stopped?)
+    @lxc.start
     new_resource.updated_by_last_action(true)
   end
 end
 
 action :halt do
-  if(new_resource._lxc.running?)
-    new_resource._lxc.stop
+  if(@lxc.running?)
+    @lxc.stop
     new_resource.updated_by_last_action(true)
   end
 end
 
 action :restart do
-  if(new_resource._lxc.running?)
-    new_resource._lxc.shutdown
+  if(@lxc.running?)
+    @lxc.shutdown
   end
-  new_resource._lxc.start
+  @lxc.start
   new_resource.updated_by_last_action(true)
 end
 
 action :stop do
-  if(new_resource._lxc.running?)
-    new_resource._lxc.stop
+  if(@lxc.running?)
+    @lxc.stop
     new_resource.updated_by_last_action(true)
   end
 end
 
 action :freeze do
-  if(new_resource._lxc.running?)
-    new_resource._lxc.freeze
+  if(@lxc.running?)
+    @lxc.freeze
     new_resource.updated_by_last_action(true)
   end
 end
 
 action :unfreeze do
-  if(new_resource._lxc.frozen?)
-    new_resource._lxc.unfreeze
+  if(@lxc.frozen?)
+    @lxc.unfreeze
     new_resource.updated_by_last_action(true)
   end
 end

data/lib/vagabond/cookbooks/lxc/recipes/default.rb

@@ -5,6 +5,15 @@ end
 
 include_recipe 'lxc::install_dependencies'
 
+directory '/usr/local/bin' do
+  recursive true
+end
+
+cookbook_file '/usr/local/bin/lxc-awesome-ephemeral' do
+  source 'lxc-awesome-ephemeral'
+  mode 0755
+end
+
 #if the server uses the apt::cacher-client recipe, re-use it
 unless Chef::Config[:solo]
   if File.exists?('/etc/apt/apt.conf.d/01proxy')
@@ -38,8 +47,12 @@ template '/etc/default/lxc' do
   )
 end
 
-#this just reloads the dnsmasq rules when
-service "lxc-net" do
-  action :enable
-  subscribes :restart, resources("template[/etc/default/lxc]")
+# this just reloads the dnsmasq rules when the template is adjusted
+service 'lxc-net' do
+  action [:enable]
+  subscribes :restart, resources("template[/etc/default/lxc]"), :immediately
+end
+
+service 'lxc' do
+  action [:enable, :start]
 end

data/lib/vagabond/cookbooks/lxc/recipes/install_dependencies.rb

@@ -11,5 +11,5 @@ raise 'OpenSuse not currently supported' if node[:lxc][:allowed_types].include?(
 
 #store a copy of the Omnibus installer for use by the lxc containers
 if(node[:omnibus_updater] && node[:omnibus_updater][:cache_omnibus_installer])
-  include_recipe 'omnibus_updater::deb_downloader'
+  include_recipe 'omnibus_updater::downloader'
 end

data/lib/vagabond/cookbooks/lxc/resources/config.rb

@@ -2,6 +2,7 @@ actions :create, :delete
 default_action :create
 
 attribute :utsname, :kind_of => String, :default => nil # defaults to resource name
+attribute :aa_profile, :kind_of => String, :default => nil # platform specific?
 attribute :network, :kind_of => [Array, Hash]
 attribute :default_bridge, :kind_of => String
 attribute :static_ip, :kind_of => String
@@ -13,7 +14,6 @@ attribute :cgroup, :kind_of => Hash, :default => Mash.new
 attribute :cap_drop, :kind_of => [String, Array], :default => %w(sys_module mac_admin)
 attribute :mount, :kind_of => String
 attribute :mount_entry, :kind_of => String
-attribute :rootfs, :kind_of => String
+attribute :rootfs, :kind_of => [String,Pathname]
 attribute :rootfs_mount, :kind_of => String
 attribute :pivotdir, :kind_of => String
-attribute :_lxc

data/lib/vagabond/cookbooks/lxc/resources/container.rb

@@ -1,7 +1,11 @@
-actions :create, :delete, :clone
+def initialize(*args)
+  @subresources = []
+  super
+end
+
+actions :create, :delete
 default_action :create
 
-attribute :base_container, :kind_of => String
 attribute :validation_client, :kind_of => String
 attribute :validator_pem, :kind_of => String, :default => nil
 attribute :server_uri, :kind_of => String
@@ -20,10 +24,31 @@ attribute :default_config, :kind_of => [TrueClass, FalseClass], :default => true
 attribute :default_fstab, :kind_of => [TrueClass, FalseClass], :default => true
 attribute :container_commands, :kind_of => Array, :default => []
 attribute :initialize_commands, :kind_of => Array, :default => []
-attribute :new_container, :kind_of => [TrueClass, FalseClass], :default => false
+attribute :clone, :kind_of => String
 attribute :template, :kind_of => String, :default => 'ubuntu'
 attribute :template_opts, :kind_of => Hash, :default => {}
 attribute :create_environment, :kind_of => Hash, :default => {}
-attribute :_lxc
-# TODO: We should ultimately have support for all these templates
-#attribute :template, :equal_to => %w(busybox debian fedora opensuse sshd ubuntu ubuntu-cloud), :default => 'ubuntu'
+
+def fstab_mount(fname, &block)
+  fstab = Chef::Resource::LxcFstab.new("lxc_fstab[#{self.name} - #{fname}]", nil)
+  fstab.action :nothing
+  fstab.container self.name
+
+  @subresources << [fstab, block]
+end
+
+def interface(iname, &block)
+  iface = Chef::Resource::LxcInterface.new("lxc_interface[#{self.name} - #{iname}]", nil)
+  iface.container self.name
+  iface.action :nothing
+  @subresources << [iface, block]
+end
+
+def config(cname, &block)
+  conf = Chef::Resource::LxcConfig.new("lxc_config[#{self.name} - #{cname}]", nil)
+  conf.container self.name
+  conf.action :nothing
+  @subresources << [conf, block]
+end
+
+attr_reader :subresources