vagrant-ovirt 0.0.1 → 0.0.2

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+# 0.0.2 (Jul 22, 2013)
+
+* Private networks support.
+* Guest interfaces configuration.
+* Setting guest hostname (via `config.vm.hostname`).
+* Bug fix in number of parameters for provisioner.
+
+# 0.0.1 (Apr 20, 2013)
+
+* Initial release.

data/README.md

@@ -5,18 +5,26 @@ This is a [Vagrant](http://www.vagrantup.com) 1.1+ plugin that adds an
 [rhev](http://www.redhat.com/products/virtualization/) provider to Vagrant,
 allowing Vagrant to control and provision machines in oVirt and RHEV.
 
-**Note:** Actual version (0.0.1) is still a development one.
+In this document, both oVirt and RHEV names are used interchangeably and
+represent the same platform on top of which this provider should work.
 
-## Features (Version 0.0.1)
+**Note:** Actual version (0.0.2) is still a development one. It was developed
+and tested on RHEV 3.1 only.
 
-* Vagrant `up`, `destroy` commands.
-* Create and boot oVirt machines from oVirt templates.
+## Features (Version 0.0.2)
+
+* Vagrant `up` and `destroy` commands.
+* Create and boot oVirt machines from templates.
 * SSH into domains.
 * Provision domains with any built-in Vagrant provisioner.
 * Minimal synced folder support via `rsync`.
 
 ## Future work
 
+* Validation of configuration parameters.
+* Test it on other versions of oVirt and RHEV.
+* Template preparation scripts for other distros than RHEL.
+* Vagrant commands `halt`, `resume`, `ssh`, `provision`, `suspend` and `resume`.
 * Take a look at [open issues](https://github.com/pradels/vagrant-ovirt/issues?state=open).
 
 ## Installation
@@ -46,19 +54,23 @@ your information where necessary.
 Vagrant.configure("2") do |config|
   config.vm.define :test_vm do |test_vm|
     test_vm.vm.box = "ovirt"
+    test_vm.vm.network :private_network,
+      :ip => '10.20.30.40',
+      :ovirt__network_name => 'ovirt_network',
+
     test_vm.vm.provider :ovirt do |ovirt|
-      ovirt.template = "example-template-name"
-      ovirt.quota = "quota name"
+      ovirt.template = "Template name"
+      ovirt.quota = "Quota name"
       ovirt.cpus = 1
       ovirt.memory = 1024
     end
   end
 
   config.vm.provider :ovirt do |ovirt|
-    ovirt.url = "https://rhevm.example.com:443"
-    ovirt.username = "example_user"
-    ovirt.password = "example_password"
-    ovirt.datacenter = "example_datacenter"
+    ovirt.url = "https://ovirt.example.com:443"
+    ovirt.username = "Username"
+    ovirt.password = "Secret"
+    ovirt.datacenter = "Datacenter name"
   end
 end
 
@@ -73,16 +85,17 @@ This provider exposes quite a few provider-specific configuration options:
 * `password` - Password to access oVirt.
 * `datacenter` - oVirt datacenter name, where machines will be created.
 * `cluster` - oVirt cluster name. Defaults to first cluster found.
-* ``ip_command` - Shell command, which shoud return IP address string for
- MAC address specified in MAC environment variable. By default, this command
- searches in local arp table.
+* `ip_command` - Shell command, which shoud return IP address string for
+ MAC address specified in environment variable named $MAC. By default, this
+ command searches IP in local arp table.
 
 ### Domain Specific Options
 
 * `memory` - Amount of memory in MBytes. Defaults to 512 if not set.
 * `cpus` - Number of virtual cpus. Defaults to 1 if not set.
 * `template` - Name of template from which new VM should be created.
-* `quota` - Name of oVirt quota for VM. Defaults to first quota found.
+* `quota` - Name of oVirt quota for VM. Defaults to first quota found in
+  datacenter.
 
 Specific domain settings can be set for each domain separately in multi-VM
 environment. Example below shows a part of Vagrantfile, where specific options
@@ -122,27 +135,33 @@ Vagrant goes through steps below when creating new project:
 1.	Connect to oVirt via REST API on every REST query.
 2.	Create new oVirt machine from template with additional network interfaces.
 3.	Start oVirt machine.
-4.	Check for IP address of VM with ip_command.
+4.	Check for IP address of VM with `ip_command`.
 5.	Wait till SSH is available.
 6.	Sync folders via `rsync` and run Vagrant provisioner on new domain if
 	setup in Vagrantfile.
 
-## Networks
+## Network Interfaces
 
-Networking features in the form of `config.vm.network` are supported only
-in bridged format, no hostonly network is supported in current version of
-provider.
+Networking features in the form of `config.vm.network` support private networks
+concept. No public network or port forwarding are supported in current version
+of provider.
 
-Example of network interface definition:
+An examples of network interface definitions:
 
 ```ruby
-  config.vm.define :test_vm do |test_vm|
-    test_vm.vm.network :bridged, :bridge => "rhevm", :adapter => 1
+  config.vm.define :test_vm1 do |test_vm1|
+    test_vm1.vm.network :private_network,
+      :ip      => "10.20.30.40",
+      :netmask => "255.255.255.0",
+      :ovirt__network_name => "ovirt_networkname"
   end
 ```
 
-In example above, bridged network adapter connected to network `rhevm` is
-defined.
+In example below, one additional network interface is created for VM test_vm1.
+Interface is connected to `ovirt_networkname` network and configured to ip
+address `10.20.30.40/24`. If you omit ip address, interface will be configured
+dynamicaly via dhcp.
+
 
 ## Obtaining Domain IP Address
 

data/example_box/Vagrantfile

@@ -15,8 +15,8 @@ Vagrant.configure("2") do |config|
 
   #config.vm.provider :ovirt do |ovirt|
   #  ovirt.url = "https://ovirt.example.com:443"
-  #  ovirt.username = "username"
-  #  ovirt.password = "secret"
+  #  ovirt.username = "Username"
+  #  ovirt.password = "Secret"
   #  ovirt.datacenter = "Datacenter name"
   #end
 end

data/lib/vagrant-ovirt/action.rb

@@ -17,12 +17,13 @@ module VagrantPlugins
               next
             end
 
-            # Create and start VM if not yet created.
             b2.use SetNameOfDomain
             b2.use CreateVM
-            b2.use CreateNetworkInterfaces
 
             b2.use TimedProvision
+            b2.use CreateNetworkInterfaces
+
+            b2.use SetHostname
             b2.use StartVM
             b2.use WaitTillUp
             b2.use SyncFolders

data/lib/vagrant-ovirt/action/create_network_interfaces.rb

@@ -1,10 +1,12 @@
 require 'log4r'
+require 'vagrant/util/scoped_hash_override'
 
 module VagrantPlugins
   module OVirtProvider
     module Action
       # Create network interfaces for machine, before VM is running.
       class CreateNetworkInterfaces
+        include Vagrant::Util::ScopedHashOverride
 
         def initialize(app, env)
           @logger = Log4r::Logger.new("vagrant_ovirt::action::create_network_interfaces")
@@ -26,41 +28,53 @@ module VagrantPlugins
 
           # First interface is for provisioning, so this slot is not usable.
           # This interface should be available already from template.
-          adapters[0] = :reserved
+          adapters[0] = {
+            :network_name => 'rhevm'
+          }
 
           env[:machine].config.vm.networks.each do |type, options|
-            # Other types than bridged are not supported for now.
-            next if type != :bridged
-
-            network_name = 'rhevm'
-            network_name = options[:bridge] if options[:bridge]
+            # We support private and public networks only. They mean both the
+            # same right now.
+            next if type != :private_network and type != :public_network
+
+            # Get options for this interface. Options can be specified in
+            # Vagrantfile in short format (:ip => ...), or provider format
+            # (:ovirt__network_name => ...).
+            options = scoped_hash_override(options, :ovirt)
+            options = {
+              :netmask      => '255.255.255.0',
+              :network_name => 'rhevm'
+            }.merge(options)
 
             if options[:adapter]
               if adapters[options[:adapter]]
                 raise Errors::InterfaceSlotNotAvailable
               end
 
-              adapters[options[:adapter].to_i] = network_name
+              free_slot = options[:adapter].to_i
             else
-              empty_slot = find_empty(adapters, start=1)
-              raise Errors::InterfaceSlotNotAvailable if empty_slot == nil
+              free_slot = find_empty(adapters, start=1)
+              raise Errors::InterfaceSlotNotAvailable if free_slot == nil
+            end
 
-              adapters[empty_slot] = network_name
-            end           
+            adapters[free_slot] = options
           end
 
           # Create each interface as new domain device
-          adapters.each_with_index do |network_name, slot_number|
-            next if network_name == :reserved
+          adapters.each_with_index do |opts, slot_number|
+            next if slot_number == 0
             iface_number = slot_number + 1
 
+            #require 'pp'
+            #pp env[:ovirt_client].networks(:cluster => env[:ovirt_cluster].id)
+
             # Get network id
             network = OVirtProvider::Util::Collection.find_matching(
-              env[:ovirt_client].networks(:cluster => env[:ovirt_cluster].id),
-              network_name)
+              env[:ovirt_client].networks(:cluster_id => env[:ovirt_cluster].id),
+              opts[:network_name])
             if network == nil
               raise Errors::NoNetworkError,
-                :network_name => network_name
+                :network_name => opts[:network_name]
             end
 
             @logger.info("Creating network interface nic#{iface_number}")
@@ -78,7 +92,40 @@ module VagrantPlugins
             end
           end
 
+          # Continue the middleware chain.
           @app.call(env)
+
+          # Configure interfaces that user requested. Machine should be up and
+          # running now.
+          networks_to_configure = []
+
+          adapters.each_with_index do |opts, slot_number|
+            # Skip configuring first interface. It's used for provisioning and
+            # it has to be available during provisioning - ifdown command is
+            # not acceptable here.
+            next if slot_number == 0
+
+            network = {
+              :interface => slot_number,
+              #:mac => ...,
+            }
+
+            if opts[:ip]
+              network = {
+                :type    => :static,
+                :ip      => opts[:ip],
+                :netmask => opts[:netmask],
+              }.merge(network)
+            else
+              network[:type] = :dhcp
+            end
+
+            networks_to_configure << network
+          end
+
+          env[:ui].info I18n.t("vagrant.actions.vm.network.configuring")
+          env[:machine].guest.capability(
+            :configure_networks, networks_to_configure)
         end
 
         private

data/lib/vagrant-ovirt/action/timed_provision.rb

@@ -6,7 +6,7 @@ module VagrantPlugins
       # This is the same as the builtin provision except it times the
       # provisioner runs.
       class TimedProvision < Vagrant::Action::Builtin::Provision
-        def run_provisioner(env, p)
+        def run_provisioner(env, name, p)
           timer = Util::Timer.time do
             super
           end

data/lib/vagrant-ovirt/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module OVirtProvider
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end
 

data/tools/prepare_redhat_for_box.sh

@@ -89,7 +89,7 @@ chmod 600 ~root/.ssh/authorized_keys
 chkconfig iptables off
 chkconfig ip6tables off
 sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/sysconfig/selinux
-sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config
+[ -f /etc/selinux/config ] && sed -i 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/config
 
 
 # Networking setup..
@@ -113,16 +113,17 @@ set_sysctl 'net.ipv4.conf.all.arp_ignore' 1
 set_sysctl 'net.ipv4.conf.all.arp_announce' 2
 set_sysctl 'net.ipv4.conf.all.rp_filter' 3
 
+# Ok, this is not very clean solution. Should be replaced in future. It allows
+# all machines on local network to have arp record about new VM.
 echo 'for NETWORK in $(ip a | grep -w inet | grep -v "127.0.0.1" | awk "{ print \$2 }"); do nmap -sP $NETWORK; done' > /etc/rc3.d/S99ping_broadcast
 chmod +x /etc/rc3.d/S99ping_broadcast
 
-
 # Don't fix ethX names to hw address.
 rm -f /etc/udev/rules.d/*persistent-net.rules
 rm -f /etc/udev/rules.d/*-net.rules
 rm -fr /var/lib/dhclient/*
 
-# Interface eth0 should get IP address via dhcp.
+# Interface eth0 should always get IP address via dhcp.
 cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
 DEVICE="eth0"
 BOOTPROTO="dhcp"

data/vagrant-ovirt.gemspec

@@ -4,8 +4,8 @@ require File.expand_path('../lib/vagrant-ovirt/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Lukas Stanek"]
   gem.email         = ["ls@elostech.cz"]
-  gem.description   = %q{Vagrant provider for oVirt.}
-  gem.summary       = %q{Vagrant provider for oVirt.}
+  gem.description   = %q{Vagrant provider for oVirt and RHEV.}
+  gem.summary       = %q{Vagrant provider for oVirt and RHEV.}
   gem.homepage      = "https://github.com/pradels/vagrant-ovirt"
 
   gem.files         = `git ls-files`.split($\)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ovirt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -59,7 +59,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Vagrant provider for oVirt.
+description: Vagrant provider for oVirt and RHEV.
 email:
 - ls@elostech.cz
 executables: []
@@ -67,6 +67,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -124,5 +125,5 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Vagrant provider for oVirt.
+summary: Vagrant provider for oVirt and RHEV.
 test_files: []