From 7f3150f3295c4d38b354990701278af1bfd9025f Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 9 Feb 2015 16:26:40 +0200 Subject: [PATCH 1/8] add name to metadata --- metadata.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/metadata.rb b/metadata.rb index 46ef148..9754483 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,9 +1,10 @@ -maintainer "VPSLab" -maintainer_email "pawel.pacana@gmail.com" -license "Apache 2.0" -description "Installs libvirt and provides libvirt resources." +name 'libvirt' +maintainer 'VPSLab' +maintainer_email 'pawel.pacana@gmail.com' +license 'Apache 2.0' +description 'Installs libvirt and provides libvirt resources.' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version "0.2.1" +version '0.2.1' %w(ubuntu debian).each do |os| supports os From c49c3f08520e0561affdfa7322fb561ee525183b Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 10 Feb 2015 10:08:36 +0200 Subject: [PATCH 2/8] add condition for ip in network xml --- templates/default/network.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/templates/default/network.xml b/templates/default/network.xml index 40c07f0..555dd18 100644 --- a/templates/default/network.xml +++ b/templates/default/network.xml @@ -4,8 +4,10 @@ <% if @forward %> -<%end %> +<% end %> +<% if @gateway && @netmask %> +<% end %> <% if @dhcp %> From 96b76fc5efd2928469b4ca40f1632150b3fdecc7 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 10 Feb 2015 10:14:10 +0200 Subject: [PATCH 3/8] fix network xml --- templates/default/network.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/default/network.xml b/templates/default/network.xml index 555dd18..ed040b2 100644 --- a/templates/default/network.xml +++ b/templates/default/network.xml @@ -7,11 +7,11 @@ <% end %> <% if @gateway && @netmask %> -<% end %> <% if @dhcp %> <% end %> +<% end %> From fede426a90343859f82244ad655a1e61c46b5ce0 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 10 Feb 2015 11:39:49 +0200 Subject: [PATCH 4/8] add virtualport --- providers/network.rb | 1 + resources/network.rb | 1 + templates/default/network.xml | 3 +++ 3 files changed, 5 insertions(+) diff --git a/providers/network.rb b/providers/network.rb index 84ffc6e..3a4d0da 100644 --- a/providers/network.rb +++ b/providers/network.rb @@ -19,6 +19,7 @@ def load_current_resource :netmask => new_resource.netmask, :gateway => new_resource.gateway, :forward => new_resource.forward, + :virtualport => new_resource.virtualport, :dhcp => new_resource.dhcp_range, :uuid => ::UUIDTools::UUID.random_create ) diff --git a/resources/network.rb b/resources/network.rb index 5c9783c..77c918a 100644 --- a/resources/network.rb +++ b/resources/network.rb @@ -10,4 +10,5 @@ def initialize(*args) attribute :gateway, :kind_of => String attribute :forward, :kind_of => String attribute :dhcp_range, :kind_of => Hash +attribute :virtualport, :kind_of => String attribute :uri, :kind_of => String, :default => 'qemu:///system' diff --git a/templates/default/network.xml b/templates/default/network.xml index ed040b2..f9f06dd 100644 --- a/templates/default/network.xml +++ b/templates/default/network.xml @@ -5,6 +5,9 @@ <% if @forward %> <% end %> +<% if @virtualport %> + +<% end %> <% if @gateway && @netmask %> <% if @dhcp %> From 9d84bf6df588a50f3bf2e880bf2a1e4323823a1f Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 10 Feb 2015 12:02:36 +0200 Subject: [PATCH 5/8] README; bump version --- README.md | 9 +++++---- metadata.rb | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 8c3183d..2934234 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,11 @@ Usage ===== libvirt_network 'fake_network' do - netmask '255.255.0.0' - gateway '192.168.42.1' - bridge 'fakebr' - forward 'nat' + netmask '255.255.0.0' + gateway '192.168.42.1' + bridge 'fakebr' + forward 'nat' + virtualport 'openvswitch' dhcp_range :start => '192.168.42.100', :end => '192.168.42.200' action [:define, :create, :autostart] diff --git a/metadata.rb b/metadata.rb index 9754483..e1560a7 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license 'Apache 2.0' description 'Installs libvirt and provides libvirt resources.' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '0.2.1' +version '0.2.2' %w(ubuntu debian).each do |os| supports os From 2474ec338c1ffe6106cd0e7f2618056cbc829030 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Tue, 10 Feb 2015 18:19:27 +0200 Subject: [PATCH 6/8] add boot attribute --- providers/domain_kvm.rb | 1 + providers/network.rb | 1 + resources/domain.rb | 1 + templates/default/kvm_domain.xml | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/providers/domain_kvm.rb b/providers/domain_kvm.rb index f1de437..3ee7cde 100644 --- a/providers/domain_kvm.rb +++ b/providers/domain_kvm.rb @@ -21,6 +21,7 @@ def load_current_resource :memory => memory_in_bytes, :vcpu => new_resource.vcpu, :arch => libvirt_arch, + :boot => new_resource.boot, :uuid => ::UUIDTools::UUID.random_create ) action :nothing diff --git a/providers/network.rb b/providers/network.rb index 3a4d0da..5330e52 100644 --- a/providers/network.rb +++ b/providers/network.rb @@ -21,6 +21,7 @@ def load_current_resource :forward => new_resource.forward, :virtualport => new_resource.virtualport, :dhcp => new_resource.dhcp_range, + :boot => new_resource.boot, :uuid => ::UUIDTools::UUID.random_create ) action :nothing diff --git a/resources/domain.rb b/resources/domain.rb index 49afa3f..e1e3f39 100644 --- a/resources/domain.rb +++ b/resources/domain.rb @@ -8,4 +8,5 @@ def initialize(*args) attribute :vcpu, :kind_of => [Integer, String], :required => true attribute :memory, :kind_of => [Integer, String], :required => true attribute :arch, :kind_of => String, :required => true +attribute :boot, :kind_of => String, :default => 'dh' attribute :uri, :kind_of => String, :default => 'qemu:///system' diff --git a/templates/default/kvm_domain.xml b/templates/default/kvm_domain.xml index 9f3654b..af25d3f 100644 --- a/templates/default/kvm_domain.xml +++ b/templates/default/kvm_domain.xml @@ -6,7 +6,7 @@ <%= @uuid %> hvm - + From ef0d69dbdf1b13fef1dcd584de3d4ced06e1065b Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 11 Feb 2015 09:17:00 +0200 Subject: [PATCH 7/8] fix boot default --- resources/domain.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/domain.rb b/resources/domain.rb index e1e3f39..a3450e2 100644 --- a/resources/domain.rb +++ b/resources/domain.rb @@ -8,5 +8,5 @@ def initialize(*args) attribute :vcpu, :kind_of => [Integer, String], :required => true attribute :memory, :kind_of => [Integer, String], :required => true attribute :arch, :kind_of => String, :required => true -attribute :boot, :kind_of => String, :default => 'dh' +attribute :boot, :kind_of => String, :default => 'hd' attribute :uri, :kind_of => String, :default => 'qemu:///system' From c9412a263d91341b2cc6a5344a004d9293a3b927 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 6 May 2015 12:10:47 +0300 Subject: [PATCH 8/8] fix network provider; move uuid require to recipe --- providers/network.rb | 3 --- recipes/default.rb | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/providers/network.rb b/providers/network.rb index 5330e52..ab59bb4 100644 --- a/providers/network.rb +++ b/providers/network.rb @@ -1,5 +1,3 @@ -require 'uuidtools' - def load_current_resource @current_resource = Chef::Resource::LibvirtNetwork.new(new_resource.name) @libvirt = ::Libvirt.open(new_resource.uri) @@ -21,7 +19,6 @@ def load_current_resource :forward => new_resource.forward, :virtualport => new_resource.virtualport, :dhcp => new_resource.dhcp_range, - :boot => new_resource.boot, :uuid => ::UUIDTools::UUID.random_create ) action :nothing diff --git a/recipes/default.rb b/recipes/default.rb index f9dd0f2..f8dcba0 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -1,4 +1,4 @@ -%w(libvirt-bin libvirt-dev).each do |name| +%w(libvirt-bin libvirt-dev build-essential).each do |name| package name do action :nothing end.run_action(:install) @@ -12,3 +12,4 @@ $LOAD_PATH.delete("/usr/bin/../lib") # scumbag LOAD_PATH: https://github.com/opscode/chef/blob/master/bin/chef-solo#L22 require 'libvirt' +require 'uuidtools' \ No newline at end of file