vagrant-openvz 0.0.4 → 0.0.6

data/README.md

@@ -4,7 +4,7 @@
 
 #### LINUX ONLY TECHNOLOGY.
 
-This is provider plugin for vagrant. The provider integrates [OpenVZ](http://openvz.org/Main_Page) with the normal actions associated with vagrant including: up, ssh, halt, destroy.
+This is a provider plugin for vagrant. The provider integrates [OpenVZ](http://openvz.org/Main_Page) with the normal actions associated with vagrant including: up, ssh, halt, destroy.
 
 Successfully used in combination with the following vagrant plugins:
 
@@ -50,9 +50,10 @@ During development on Centos 6(.4), in order to use: "bundle exec vagrant box ad
 
 ## ROADMAP (Features not yet added).
 
-* Port Forwarding.
-* Improve usage of env[:ui] logging. 
-* Tokenize all hardcoded text.
+* OpenVZ focused: [Virtual Ethernet devices](http://openvz.org/Virtual_Ethernet_device).
+* Vagrant focused: Port Forwarding.
+* Vagrant focuused: Improve usage of env[:ui] logging. 
+* Vagrant focused: Tokenize all hardcoded text.
 
 ## Credits
 

data/Vagrantfile

@@ -11,15 +11,16 @@ Vagrant.configure('2') do |config|
 
   config.vm.define "vz1" do |vm_vz1|
     vm_vz1.vm.provider :openvz do |openvz| 
-							openvz.vzctid="1"
-							openvz.physpages="0:1G"
-							openvz.hostname="vz1"
-							openvz.ipadd="192.168.101.1"
-							openvz.nameserver="8.8.8.8"
-							openvz.diskspace="1000000:1100000"
-							openvz.diskinodes="100000:101000"
-							openvz.quotatime="600"
-							openvz.pubkey="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key"
+	  openvz.vzctid="1"
+	  openvz.physpages="0:1G"
+	  openvz.hostname="vz1"
+	  openvz.ipadd="192.168.101.1"
+      #openvz.netadapter="eth1" #Allow this line to give the container complete control over a network adapter.
+	  openvz.nameserver="8.8.8.8"
+	  openvz.diskspace="1000000:1100000"
+	  openvz.diskinodes="100000:101000"
+	  openvz.quotatime="600"
+	  openvz.pubkey="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key"
 		  end
 		 
     vm_vz1.vm.provision "shell", inline: $script

data/lib/vagrant-openvz/action/boot.rb

@@ -1,21 +1,27 @@
 module VagrantPlugins
   module Openvz
-    module Action
-      class Boot
-        def initialize(app, env)
-          @app = app
-        end
+	module Action
+	  class Boot
+		def initialize(app, env)
+		  @app = app
+		end
 
-        def call(env)
-          @env = env
+		def call(env)
+		  @env = env
 
-          config = env[:machine].provider_config
+		  config = env[:machine].provider_config
 
-          env[:machine].provider.driver.start(config.vzctid,config.pubkey)
+		  env[:machine].provider.driver.start(config.vzctid,config.pubkey)
 
-          @app.call env
-        end
-      end
-    end
+		  if ! config.netadapter.nil?
+			env[:machine].provider.driver.set_netadapter(
+			  config.vzctid,config.netadapter
+			)
+		  end
+
+		  @app.call env
+		end
+	  end
+	end
   end
 end

data/lib/vagrant-openvz/action/fetch_ip.rb

@@ -8,8 +8,12 @@ module VagrantPlugins
 
         def call(env)
 		  config = env[:machine].provider_config
-
-          env[:machine_ip] ||= env[:machine].provider.driver.fetch_ip(config.vzctid)
+         
+		  if config.netadapter.nil?		  
+             env[:machine_ip] ||= env[:machine].provider.driver.fetch_ip(config.vzctid)
+		  else
+			 env[:machine_ip] ||= env[:machine].provider.driver.fetch_ip_netadapter(config.vzctid)
+          end
 
           @app.call(env)
         end

data/lib/vagrant-openvz/config.rb

@@ -6,6 +6,7 @@ module VagrantPlugins
 	  attr_accessor :physpages
 	  attr_accessor :hostname
 	  attr_accessor :ipadd
+	  attr_accessor :netadapter
 	  attr_accessor :nameserver
 	  attr_accessor :vzctid
 	  attr_accessor :pubkey
@@ -32,7 +33,7 @@ module VagrantPlugins
 
 		errors << "config.physpages" if physpages.nil?
 		errors << "config.hostname" if hostname.nil?
-		errors << "config.ipadd" if ipadd.nil?
+		errors << "config.ipadd or config.netadapter" if ipadd.nil? && netadapter.nil?
 		errors << "config.nameserver" if nameserver.nil?
 		errors << "config.vzctid" if vzctid.nil?
 		errors << "config.pubkey" if pubkey.nil?

data/lib/vagrant-openvz/driver/cli.rb

@@ -18,6 +18,10 @@ module VagrantPlugins
 		  run(:vzlist,"-a","-H","-t","-o","ip","#{vzctlid}")
 		end
 
+		def fetch_ip_netadapter(vzctlid)
+          run(:vzctl,"exec","#{vzctlid}","ip -4 addr show eth1 | egrep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | grep -v 255")
+		end
+		
 		def create(vzctlid,settings={})
 
 		  # run :rsync, settings[:box_location],settings[:template_location] 
@@ -34,6 +38,12 @@ module VagrantPlugins
 
 		end
 
+		def set_netadapter(vzctlid,netadapter) 
+		  run :vzctl,'set',vzctlid,"--netdev_add","#{netadapter}","--save"
+          run :vzctl,'exec',vzctlid,"ifconfig","#{netadapter}","up"
+          run :vzctl,'exec',vzctlid,"dhclient","#{netadapter}"
+		end
+
 		def start(vzctlid,pubkey)
 		  run :vzctl, 'start', "#{vzctlid}"
 		  add_vagrant_user(vzctlid,pubkey)

data/lib/vagrant-openvz/driver.rb

@@ -61,6 +61,11 @@ module VagrantPlugins
 		@cli.create vzctlid, settings 
 	  end
 
+	  def set_netadapter(vzctlid,netadapter)
+		@logger.info("Adding network adapter: #{netadapter}")
+		@cli.set_netadapter(vzctlid,netadapter)
+	  end
+	
 	  def start(vzctlid,pubkey)
 		@logger.info('Starting container...')
 		@cli.start(vzctlid,pubkey)
@@ -85,6 +90,11 @@ module VagrantPlugins
 		@cli.fetch_ip(vzctlid)
 	  end
 
+	  def fetch_ip_netadapter(vzctlid)
+		@cli.fetch_ip_netadapter(vzctlid)
+	  end
+
+
 	end
   end
 end

data/lib/vagrant-openvz/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Openvz
-	VERSION = "0.0.4"
+	VERSION = "0.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openvz
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler