diff --git a/gentoo.json b/gentoo.json index 48df0db..1dcea3c 100644 --- a/gentoo.json +++ b/gentoo.json @@ -7,9 +7,9 @@ "providers": [ { "name": "lxd", - "url": "file:///data/ghopp/projects/vagrant/vagrant-lxd/gentoo_001_lxd.box", + "url": "file:///home/hopp/projects/vagrant/vagrant-lxd/gentoo_001_lxd.box", "checksum_type": "sha1", - "checksum": "303573ec033c0eb1939df486f444c5bcc3f82d1e" + "checksum": "279b73b0a0f51368376a89283c842c5b474f9274" } ] } diff --git a/gentoo_001_lxd.box b/gentoo_001_lxd.box index 336e0fe..2e3f702 100644 Binary files a/gentoo_001_lxd.box and b/gentoo_001_lxd.box differ diff --git a/gentoo_box/metadata.json b/gentoo_box/metadata.json index b10263b..aaf6c8c 100644 --- a/gentoo_box/metadata.json +++ b/gentoo_box/metadata.json @@ -11,7 +11,7 @@ }, "packages": { "exec": [ - ["emerge", "--update", "sudo"] + ["emerge", "--update", "sudo", "dhcpcd"] ] }, "sudo": { diff --git a/lib/vagrant/lxd/action.rb b/lib/vagrant/lxd/action.rb index 6326c3c..07fe64c 100644 --- a/lib/vagrant/lxd/action.rb +++ b/lib/vagrant/lxd/action.rb @@ -49,6 +49,13 @@ module Vagrant b.use SSHExec end end + + def self.action_provision + Vagrant::Action::Builder.new.tap do |b| + #b.use CheckAccessible + b.use Provision + end + end end end end diff --git a/lib/vagrant/lxd/action/create.rb b/lib/vagrant/lxd/action/create.rb index cd96b6e..a381a3e 100644 --- a/lib/vagrant/lxd/action/create.rb +++ b/lib/vagrant/lxd/action/create.rb @@ -18,6 +18,12 @@ module Vagrant env[:ui].info "--- #{driver.name} created ---", :prefix => false end + # TODO maybe not optimal, check if it would be better to include the + # pid of the init process to the id of the machine. + # Well, in that case the id changes with every restart which might + # not be feasable... + env[:machine].id = driver.name + @app.call(env) end end diff --git a/lib/vagrant/lxd/command.rb b/lib/vagrant/lxd/command.rb index 9a703dd..4bcd041 100644 --- a/lib/vagrant/lxd/command.rb +++ b/lib/vagrant/lxd/command.rb @@ -7,6 +7,9 @@ module Vagrant def execute @env.ui.info("my own plugin", :prefix => false) + @env.ui.info("--- #{@env.inspect} ---", :prefix => false) + @env.ui.info("--- #{@local_data_path} ---", :prefix => false) + @env.ui.info("--- #{@env.active_machines} ---", :prefix => false) end end end diff --git a/lib/vagrant/lxd/config.rb b/lib/vagrant/lxd/config.rb new file mode 100644 index 0000000..d4ce8cb --- /dev/null +++ b/lib/vagrant/lxd/config.rb @@ -0,0 +1,6 @@ +module Vagrant + module Lxd + class Config < Vagrant.plugin("2", :config) + end + end +end diff --git a/lib/vagrant/lxd/plugin.rb b/lib/vagrant/lxd/plugin.rb index 484a0cb..970a3fd 100644 --- a/lib/vagrant/lxd/plugin.rb +++ b/lib/vagrant/lxd/plugin.rb @@ -16,10 +16,10 @@ module Vagrant Provider end - #config(:lxd, :provider) do - # require File.expand_path("../config", __FILE__) - # Config - #end + config(:lxd, :provider) do + require_relative "config" + Config + end #synced_folder(:virtualbox) do # require File.expand_path("../synced_folder", __FILE__) diff --git a/playbook.yml b/playbook.yml new file mode 100644 index 0000000..14349b2 --- /dev/null +++ b/playbook.yml @@ -0,0 +1,6 @@ +--- +- hosts: all + become: true + tasks: + - name: test connection + ping: diff --git a/sid.json b/sid.json index 2c98206..27d502e 100644 --- a/sid.json +++ b/sid.json @@ -7,9 +7,9 @@ "providers": [ { "name": "lxd", - "url": "file:///data/ghopp/projects/vagrant/vagrant-lxd/sid_001_lxd.box", + "url": "file:///home/hopp/projects/vagrant/vagrant-lxd/sid_001_lxd.box", "checksum_type": "sha1", - "checksum": "a533654e7577931659c1cb457b13e6b184d4013d" + "checksum": "21d7376327acdb7f36aa25ed89039248c6562415" } ] } diff --git a/sid_001_lxd.box b/sid_001_lxd.box index 8e2e25d..d1617f4 100644 Binary files a/sid_001_lxd.box and b/sid_001_lxd.box differ diff --git a/sid_box/metadata.json b/sid_box/metadata.json index afe625c..a01cbc6 100644 --- a/sid_box/metadata.json +++ b/sid_box/metadata.json @@ -10,7 +10,8 @@ "packages": { "exec": [ ["apt-get", "install", "-y", "sudo"], - ["apt-get", "install", "-y", "openssh-server"] + ["apt-get", "install", "-y", "openssh-server"], + ["apt-get", "install", "-y", "python"] ] }, "sudo": {