From imain at redhat.com  Fri Oct  1 01:13:30 2010
From: imain at redhat.com (Ian Main)
Date: Thu, 30 Sep 2010 18:13:30 -0700
Subject: [Ovirt-devel] libvirt-qpid and live migration
In-Reply-To: <201009300933.26326.aclement@linagora.com>
References: <201009300933.26326.aclement@linagora.com>
Message-ID: <1285895610.10091.6.camel@len.mains.priv>

On Thu, 2010-09-30 at 09:33 +0200, Arthur Cl?ment wrote:
> I have troubles with live migration since I upgraded libvirt on my nodes
> 
> 1) I have to change 'Libvirt::Domain::MIGRATE_LIVE'  to '1' in taskomatic
> error :
> Error: uninitialized constant Libvirt::Domain::MIGRATE_LIVE
> and why '1' : http://libvirt.org/html/libvirt-libvirt.html
> 
> 
> 2) the migration fails with this error : 
> Task action processing failed: RuntimeError: Timed out waiting for response
> 
> So I looked into taskomatic code and I saw this comment :
> 
> # Sadly migrate with qpid is broken because it requires a connection between
> # both nodes and currently that can't happen securely.  For now we do it
> # the old fashioned way..
> 
> I could'nt get Ian Main on Irc, so I asked here if someone knows about this 
> issue.
> 
> I tried to test qpid migration with python (method : migrate(destinationUri, 
> flags, newDomainName, uri, bandwidth)) but I might be to stupid to know what's 
> the difference between destinationUri and uri. I tested objectid, hostname...  
> I only got errors.
> 
> My idea is to test live migration with qpid and replace the old method if it 
> works.

My guess is it's some kind of networking issue.  Especially the
timeoutaerror makes me think it's probably firewalled or something.  I
seem to recall this worked at one point but it's definitely not ideal.

IIRC we figured that what we needed was to create an API for libvirt
which split the migrate into two parts.. one would call setup_migrate
and return a string containing auth, port info etc. and a second call on
the source machine that would take that string and do the actual
migration.

Best thing would be to get it working using virsh first to make sure it
works and then debug with libvirt-qpid.

	Ian




From aclement at linagora.com  Mon Oct  4 15:36:24 2010
From: aclement at linagora.com (Arthur Clement)
Date: Mon,  4 Oct 2010 17:36:24 +0200
Subject: [Ovirt-devel] [PATCH] Fix js issue with Chrome in migrate form
Message-ID: <1286206584-30039-1-git-send-email-aclement@linagora.com>


Signed-off-by: Simon Courtois <scourtois at linagora.com>
---
 src/app/views/vm/migrate.rhtml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/app/views/vm/migrate.rhtml b/src/app/views/vm/migrate.rhtml
index 9165425..dacb9d0 100644
--- a/src/app/views/vm/migrate.rhtml
+++ b/src/app/views/vm/migrate.rhtml
@@ -5,7 +5,6 @@
   Please choose migration destination. Leave the selection blank to allow oVirt to choose the most appropriate destination host.
 <%- end -%>
 <script type="text/javascript">
-<%= popup_footer("migrate_vm()", "Migrate") %>
   function migrate_vm_select(selected_rows)
   {
     var selected_ids = new Array();
-- 
1.7.2.3



From aclement at linagora.com  Mon Oct  4 15:39:47 2010
From: aclement at linagora.com (Arthur =?iso-8859-15?q?Cl=E9ment?=)
Date: Mon, 4 Oct 2010 17:39:47 +0200
Subject: [Ovirt-devel] [PATCH] Fix js issue with Chrome in migrate form
In-Reply-To: <1286206584-30039-1-git-send-email-aclement@linagora.com>
References: <1286206584-30039-1-git-send-email-aclement@linagora.com>
Message-ID: <201010041739.47758.aclement@linagora.com>

Pushed

On lundi 04 octobre 2010 17:36:24 you wrote:
> Fix js issue with Chrome in migrate form

-- 
Arthur CLEMENT
Linagora Paris



From nicolas.ochem at gmail.com  Mon Oct 11 08:04:00 2010
From: nicolas.ochem at gmail.com (Nicolas Ochem)
Date: Mon, 11 Oct 2010 08:04:00 +0000
Subject: [Ovirt-devel] [PATCH] Introduce ability to select any kind of nic
	model, not just default or virtio.
Message-ID: <1286784240-1917-1-git-send-email-nicolas.ochem@gmail.com>

There was no release since virtio support was introduced, so a proper
migration is not necessary.

This amended commit introduces the "default" model which leaves the
model choice up to qemu-kvm.
---
 src/app/controllers/vm_controller.rb   |    6 ++-
 src/app/models/nic.rb                  |    2 +
 src/app/views/vm/_form.rhtml           |   25 +++++++++-------
 src/db/migrate/046_add_model_to_nic.rb |   29 ++++++++++++++++++
 src/public/stylesheets/components.css  |   51 +++++++++++++++++++++++--------
 src/task-omatic/task_vm.rb             |    5 +--
 src/task-omatic/taskomatic.rb          |    2 +-
 7 files changed, 89 insertions(+), 31 deletions(-)
 create mode 100644 src/db/migrate/046_add_model_to_nic.rb

diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
index adc8988..54abd15 100644
--- a/src/app/controllers/vm_controller.rb
+++ b/src/app/controllers/vm_controller.rb
@@ -199,7 +199,7 @@ class VmController < ApplicationController
          nnic = Nic.new(:mac => nic.mac,
                         :vm_id => @vm.id,
                         :network => nic.network,
-                        :virtio => nic.virtio)
+                        :model => nic.model)
 
          if(nic.network.boot_type.proto == 'static')
            nnic.ip_addresses << IpAddress.new(:address => nic.ip_address)
@@ -221,6 +221,8 @@ class VmController < ApplicationController
         @nics.push nnic
     }
 
+    @nic_models = Nic::NIC_MODELS
+
   end
 
   # merges vm / network parameters as submitted on the vm form
@@ -241,7 +243,7 @@ class VmController < ApplicationController
              nic = { :mac => params[:macs][i],
                      :network_id => network_id,
                      :bandwidth => 0,
-                     :virtio => params[:virtio][i.to_s] }
+                     :model => params[:models][i] }
 
              if(Network.find(network_id).boot_type.proto == 'static')
                 # FIXME make this able to be v4 or v6 address
diff --git a/src/app/models/nic.rb b/src/app/models/nic.rb
index 51425bc..93aef17 100644
--- a/src/app/models/nic.rb
+++ b/src/app/models/nic.rb
@@ -53,6 +53,8 @@ class Nic < ActiveRecord::Base
   validates_numericality_of :bandwidth,
      :greater_than_or_equal_to => 0
 
+  NIC_MODELS = ["default","ne2k_pci","i82551","i82557b","i82559er","rtl8139","e1000","pcnet","virtio"]
+
   # Returns whether the nic has networking defined.
   def networking?
     (network != nil)
diff --git a/src/app/views/vm/_form.rhtml b/src/app/views/vm/_form.rhtml
index 1ab6dda..465733d 100644
--- a/src/app/views/vm/_form.rhtml
+++ b/src/app/views/vm/_form.rhtml
@@ -67,6 +67,7 @@
       <div id="vm_network_config_header">
         <div id="vm_network_config_header_network">Network:</div>
         <div id="vm_network_config_header_mac">MAC Address:</div>
+        <div id="vm_network_config_header_model">Model:</div>
 
         <%# this column is only populated if a static ip network is selected: %>
         <div id="vm_network_config_header_ip" style="display: none;">IP Address:</div>
@@ -92,14 +93,16 @@
                 <input name="macs[]" id="vm_network_config_mac_<%= i %>" ></input>
               </div>
 
-              <div class="vm_network_config_ip">
-                &nbsp;
+              <div class="vm_network_config_model">
+                <select name="models[]" id="vm_network_config_model_<%= i %>" class="vm_network_config_select">
+	           <% @nic_models.each { |model| %>
+                     <option value="<%= model %>"><%= model %></option>
+	           <% } %>
+                </select>
               </div>
 
-              <div class="vm_network_config_virtio">
-                <%= hidden_field_tag "virtio[#{i}]", "0" %>
-                <%= check_box_tag "virtio[#{i}]", "1", @nics[i].virtio, :id => "vm_network_config_virtio_#{i}" %>
-		<%= label_tag "vm_network_config_virtio_#{i}", "Use virtio" %>
+              <div class="vm_network_config_ip">
+                &nbsp;
               </div>
 
               <% if i != 0 %>
@@ -196,7 +199,7 @@ ${htmlList(pools, id)}
        jnic.name        = "<%= rnic.network.name %>";
        jnic.mac         = "<%= rnic.mac %>";
        jnic.ip          = "<%= rnic.ip_address %>";
-       jnic.virtio      = <%= rnic.virtio ? 'true' : 'false' %>;
+       jnic.model      = "<%= rnic.model %>"
        jnic.static_ip   = <%= rnic.network.boot_type.proto == 'static' %>;
        jnic.selected    = false;
        jnic.row         = null;
@@ -270,15 +273,15 @@ ${htmlList(pools, id)}
              $('#vm_network_config_mac_'+row).attr('value', nic.mac);
 
              // show / hide ip address textbox
-             ip_div = $('#vm_network_config_mac_'+row).parent().next();
+             ip_div = $('#vm_network_config_model_'+row).parent().next();
              if(nic.static_ip){
 	           ip_div.html('<input name="ip_addresses[]" id="#vm_network_config_ip_'+row+'" value="'+nic.ip+'" />');
              }else{
                ip_div.html('&nbsp;');
 	         }
 
-             // set virtio if checked
-             $('#vm_network_config_virtio_'+row).attr('checked', nic.virtio ? 'checked' : '');
+             // set model
+             $('#vm_network_config_model_'+row).attr('value', nic.model);
 
              // show new row only if last row's select box was
              // previously empty, and if all are not shown
@@ -302,7 +305,7 @@ ${htmlList(pools, id)}
             // clear row mac and ip addresses
             $('#vm_network_config_mac_'+row).attr('value', '');
             $('#vm_network_config_mac_'+row).parent().next().html('&nbsp;');
-            $('#vm_network_config_virtio_'+row).attr('checked', '');
+            //$('#vm_network_config_virtio_'+row).attr('checked', '');
 
             // hide row if not the first
 	        if(row != 0){
diff --git a/src/db/migrate/046_add_model_to_nic.rb b/src/db/migrate/046_add_model_to_nic.rb
new file mode 100644
index 0000000..1ec42a9
--- /dev/null
+++ b/src/db/migrate/046_add_model_to_nic.rb
@@ -0,0 +1,29 @@
+# Copyright (C) 2010 Alcatel-Lucent
+# Written by Nicolas Ochem <nicolas.ochem at alcatel-lucent.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA  02110-1301, USA.  A copy of the GNU General Public License is
+# also available at http://www.gnu.org/copyleft/gpl.html.
+class AddModelToNic < ActiveRecord::Migration
+  def self.up
+    add_column :nics, :model, :string
+    remove_column :nics, :virtio
+  end
+
+  def self.down
+    remove_column :nics, :model
+    add_column :nics, :virtio, :boolean, :default => false
+  end
+end
+
diff --git a/src/public/stylesheets/components.css b/src/public/stylesheets/components.css
index 3cdbf49..fe4043e 100644
--- a/src/public/stylesheets/components.css
+++ b/src/public/stylesheets/components.css
@@ -349,41 +349,66 @@
    min-width: 500px;
 }
 
-#vm_network_config_header_network,
-#vm_network_config_header_mac,
 #vm_network_config_header_ip{
   float: left;
-  width: 150px;
+  width: 102px;
 }
 
-.vm_network_config_net,
-.vm_network_config_mac{
+#vm_network_config_header_network{
+  float: left;
+  width:92px;
+}
+
+#vm_network_config_header_mac{
+  float: left;
+  width: 132px;
+}
+
+#vm_network_config_header_model{
+  float: left;
+  width: 76px;
+}
+
+.vm_network_config_net{
   float: left;
-  width: 150px;
+  width: 92px;
 }
 
+.vm_network_config_mac{
+  float: left;
+  width: 132px;
+}
 .vm_network_config_ip{
   float: left;
-  max-width: 150px;
+  width: 100px;
 }
 
-.vm_network_config_virtio {
+.vm_network_config_model {
   float: left;
-  width: 80px;
+  width: 76px;
+}
+
+.vm_network_config_ip input{
+  width: 100px;
 }
 
-.vm_network_config_net select,
-.vm_network_config_mac input,
-.vm_network_config_ip input {
-  width: 130px;
+.vm_network_config_net select{
+  width: 90px;
 }
 
+.vm_network_config_model select {
+  width: 74px;
+}
+.vm_network_config_mac input{
+  width:125px;
+}
 .vm_network_config_remove {
   float: left;
   color: #0033CC;
   padding-top: 5px;
   padding-left: 5px;
 }
+
 .vm_network_config_remove:hover {
   cursor: pointer;
 }
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index cf84ea2..165363a 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -99,10 +99,7 @@ def create_vm_xml(name, uuid, memAllocated, memUsed, vcpus, bootDevice,
     interface.add_attribute("type", "bridge")
     interface.add_element("mac", {"address" => nic[:mac]})
     interface.add_element("source", {"bridge" => nic[:interface]})
-
-    if nic[:virtio]
-      interface.add_element("model", {"type" => "virtio"})
-    end
+    interface.add_element("model", {"type" => nic[:model]}) unless nic[:model]=="default"
     doc.root.elements["devices"] << interface
   }
 
diff --git a/src/task-omatic/taskomatic.rb b/src/task-omatic/taskomatic.rb
index a24a80e..d9efecc 100755
--- a/src/task-omatic/taskomatic.rb
+++ b/src/task-omatic/taskomatic.rb
@@ -413,7 +413,7 @@ class TaskOmatic
        else
           net_device = "breth0" # FIXME remove this default at some point
        end
-       net_interfaces.push({ :mac => nic.mac, :interface => net_device, :virtio => nic.virtio })
+       net_interfaces.push({ :mac => nic.mac, :interface => net_device, :model => nic.model })
     }
     # network_always indicates that the boot device is "network" and will not change
     # upon reboot.
-- 
1.7.2.1



From jboggs at redhat.com  Fri Oct 22 14:38:01 2010
From: jboggs at redhat.com (Joey Boggs)
Date: Fri, 22 Oct 2010 10:38:01 -0400
Subject: [Ovirt-devel] [PATCH node] First draft of replacing some of the
	ovirt-config-* scripts with python equivalents.
Message-ID: <1287758281-2090-1-git-send-email-jboggs@redhat.com>

Putting these out for feedback and comments.

These will eventually support the new newt/python based ui for installation/configuration

storage.py functions will be moved under a class for better data portability before final version

---
 scripts/ovirtfunctions.py |  672 +++++++++++++++++++++++++++++++++++++++++++++
 scripts/storage.py        |  451 ++++++++++++++++++++++++++++++
 2 files changed, 1123 insertions(+), 0 deletions(-)
 create mode 100644 scripts/ovirtfunctions.py
 create mode 100644 scripts/storage.py

diff --git a/scripts/ovirtfunctions.py b/scripts/ovirtfunctions.py
new file mode 100644
index 0000000..f2b9e39
--- /dev/null
+++ b/scripts/ovirtfunctions.py
@@ -0,0 +1,672 @@
+#!/usr/bin/python
+import subprocess
+import os
+from subprocess import Popen, PIPE, STDOUT
+import tempfile
+import string
+import sys
+
+
+OVIRT_LOGFILE="/var/log/ovirt.log"
+OVIRT_TMP_LOGFILE="/tmp/ovirt.log"
+# label of the oVirt partition
+OVIRT_LABEL="OVIRT"
+# configuration values are loaded in the following order:
+# 1. /etc/sysconfig/node-config sets the default values
+# 2. /etc/default/ovirt is loaded to override defaults with karg values
+NODE_SYSCONFIG="/etc/sysconfig/node-config"
+OVIRT_DEFAULTS="/etc/default/ovirt"
+
+OVIRT_VARS = {}
+# Parse all OVIRT_* variables
+if os.path.exists(NODE_SYSCONFIG):
+    try:
+        f = open(NODE_SYSCONFIG, 'r')
+        for line in f:
+            try:
+                line = line.strip()
+                key, value = line.split("\"", 1)
+                key = key.strip("=")
+                value = value.strip("\"")
+                OVIRT_VARS[key] = value
+            except:
+                pass
+        f.close()
+    except:
+        pass
+
+f = open(OVIRT_DEFAULTS, 'r')
+for line in f:
+    try:
+        line = line.strip()
+        key, value = line.split("\"", 1)
+        key = key.strip("=")
+        value = value.strip("\"")
+        OVIRT_VARS[key] = value
+    except:
+        pass
+f.close()
+
+OVIRT_BACKUP_DIR="/var/lib/ovirt-backup"
+
+MANAGEMENT_SCRIPTS_DIR="/etc/node.d"
+
+OVIRT_CONFIG_FILES = ["/etc/sysconfig/network-scripts/ifcfg-*", \
+                      "/etc/rsyslog.conf", \
+                      "/etc/libvirt/libvirtd.conf", \
+                      "/etc/sasl2/libvirt.conf", \
+                      "/etc/libvirt/passwd.db", \
+                      "/etc/passwd", \
+                      "/etc/shadow", \
+                      "/etc/ssh/ssh_host*_key*", \
+                      "/etc/default/ovirt", \
+                      "/etc/sysconfig/network", \
+                      "/etc/collectd.conf", \
+                      "/etc/logrotate.d/ovirt-logrotate.conf" ]
+
+def log(log_entry):
+  # placeholder for now
+  print log_entry 
+
+def set_console_colors():
+    GIO_CMAP = 0x4B70
+    PIO_CMAP = 0x4B71
+
+    tty_file = open("/dev/console", "rw")
+    existing_color_array = bytearray(fcntl.ioctl(tty_file.fileno(), GIO_CMAP, b"\x00" * 48))
+    color_array = existing_color_array
+    color_array[3] = 0xde
+    color_array[4] = 0xde
+    color_array[5] = 0xde
+    color_array[6] = 0x30
+    color_array[7] = 0x30
+    color_array[8] = 0x30
+    color_array[12] = 0x38
+    color_array[13] = 0x8f
+    color_array[14] = 0xcd
+    color_array[15] = 0xea
+    color_array[16] = 0xea
+    color_array[17] = 0xea
+    color_array[18] = 0x71
+    color_array[19] = 0x71
+    color_array[20] = 0x71
+    color_array[22] = 0xff
+    color_array[23] = 0xff
+    color_array[9] = 0x52
+    color_array[10] = 0x52
+    color_array[11] = 0x52
+    fcntl.ioctl(tty_file.fileno(), PIO_CMAP, bytes(color_array))
+
+def restore_console_colors():
+    GIO_CMAP = 0x4B70
+    PIO_CMAP = 0x4B71
+    tty_file = open("/dev/console", "rw")
+    fcntl.ioctl(tty_file.fileno(), PIO_CMAP, bytes(.existing_color_array))
+
+def ovirt_store_firstboot_config():
+    # persist config for standalone
+    ovirt_store_config(OVIRT_CONFIG_FILES)
+
+# return 1 if oVirt Node is running in standalone mode
+# return 0 if oVirt Node is managed by the oVirt Server
+def is_managed():
+    return OVIRT_VARS["OVIRT_STANDALONE"]
+
+# oVirt Node in standalone mode does not try to contact the oVirt Server
+def is_standalone():
+    if is_managed:
+        return False
+    else:
+        return True
+
+# return 0 if local storage is configured
+# return 1 if local storage is not configured
+def is_local_storage_configured():
+    ret = os.system("lvs HostVG/Config >/dev/null >&1")
+    if ret > 0:
+        return False
+    return True
+
+# perform automatic local disk installation
+# when at least following boot parameters are present:
+# for networking - OVIRT_BOOTIF, management NIC
+#       if other ip bootparams are not specified, IPv4 DHCP is assumed
+# for storage - OVIRT_INIT, local disk to use
+#       if ovirt_vol is not specified, default volume sizes are set
+def is_auto_install():
+    if OVIRT_VARS.has_key("OVIRT_BOOTIF") and OVIRT_VARS.has_key("OVIRT_INIT"):
+        return True
+    else:
+        return False
+
+# return 0 if this is an upgrade
+# return 1 otherwise
+def is_upgrade():
+    if OVIRT_VARS.has_key("OVIRT_UPGRADE") and OVIRT_VARS["OVIRT_UPGRADE"] == 1:
+        return True
+    else:
+        return False
+
+# return 0 if booted from local disk
+# return 1 if booted from other media
+def is_booted_from_local_disk():
+    ret = os.system("grep -q /dev/HostVG/ /proc/cmdline")
+    if ret == 0:
+        return True
+    else:
+        return False
+
+# was firstboot menu already shown?
+# state is stored in persistent config partition
+def is_firstboot():
+    if not OVIRT_VARS.has_key("OVIRT_FIRSTBOOT") or OVIRT_VARS["OVIRT_FIRSTBOOT"] == 1:
+        return True
+    else:
+        return False
+
+def disable_firstboot():
+    if mount_config:
+        firstboot = augeas.Augeas(root="/")
+        firstboot.set("/files/etc/defaults/ovirt/OVIRT_FIRSTBOOT", "0")
+        firstboot.set("/files/etc/defaults/ovirt/OVIRT_INIT", '""')
+        firstboot.set("/files/etc/defaults/OVIRT_UPGRADE", "0")
+        firstboot.save()
+
+# Destroys a particular volume group and its logical volumes.
+
+def wipe_volume_group(vg):
+    files_cmd = "grep %s /proc/mounts|awk '{print $2}'|sort -r" % vg
+    files = subprocess.Popen(files_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    files_output = files.stdout.read()
+    for file in files_output.split():
+        umount_cmd = "umount %s" % file
+        os.system(umount_cmd)
+
+    
+    swap_cmd = "grep %s /proc/swaps|awk '{print $1}'" % vg
+    swap = subprocess.Popen(swap_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    swap_output = swap.stdout.read()
+    for d in swap_output:
+        log ("Turning off %s") % d
+        os.system("swapoff %s") % d
+    vgremove_cmd = "vgremove -f %s" % vg
+    os.system(vgremove_cmd)
+
+# find_srv SERVICE PROTO
+#
+# reads DNS SRV record
+# sets SRV_HOST and SRV_PORT if DNS SRV record found, clears them if not
+# Example usage:
+# find_srv ovirt tcp
+def find_srv(srv, proto):
+    domain = subprocess.Popen("dnsdomainname 2>/dev/null", shell=True, stdout=PIPE, stderr=STDOUT)
+    domain_output = domain.stdout.read()
+    if domain_output == "localdomain":
+        domain=""
+    # FIXME dig +search does not seem to work with -t srv
+    # dnsreply=$(dig +short +search -t srv _$1._$2)
+    # This is workaround:
+    search = subprocess.Popen("grep search /etc/resolv.conf", shell=True, stdout=PIPE, stderr=STDOUT)
+    search_output = search.stdout.read()
+    search = search.replace("search ","")
+    domain_search = domain_output + search_output
+    for d in domain_search.split():
+        dig_cmd = "dig +short -t srv _%s._%s.%s" % (srv, proto,search)
+        dig = subprocess.Popen(dig_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+        dig_output = dig.stdout.read()
+        dig.poll()
+        dig_rc = dnsreply.returncode()
+        if dig_rc == 0:
+            a,b,port,host = dig_output.split("=", 4)
+            return (port, host)
+        return False
+
+def ovirt_setup_libvirtd():
+    # just to get a boot warning to shut up
+    os.system("touch /etc/resolv.conf")
+
+    # make libvirtd listen on the external interfaces
+    os.system("sed -i -e 's/^#\(LIBVIRTD_ARGS=\"--listen\"\).*/\1/' /etc/sysconfig/libvirtd")
+
+    # set up qemu daemon to allow outside VNC connections
+    os.system("sed -i -e 's/^[[:space:]]*#[[:space:]]*\(vnc_listen = \"0.0.0.0\"\).*/\1/' /etc/libvirt/qemu.conf")
+    # set up libvirtd to listen on TCP (for kerberos)
+    os.system('sed -i -e "s/^[[:space:]]*#[[:space:]]*\(listen_tcp\)\>.*/\1 = 1/" \
+       -e "s/^[[:space:]]*#[[:space:]]*\(listen_tls\)\>.*/\1 = 0/" \
+       /etc/libvirt/libvirtd.conf')
+
+    # with libvirt (0.4.0), make sure we we setup gssapi in the mech_list
+    sasl_conf="/etc/sasl2/libvirt.conf"
+    ret = os.system('grep -qE "^mech_list: gssapi %s') % sasl_conf
+    if ret > 0:
+        os.system("sed -i -e \"s/^\([[:space:]]*mech_list.*\)/#\1/\" %s") % sasl_conf
+        os.system("echo \"mech_list: gssapi\" >> %s") % sasl_conf
+
+def ovirt_setup_anyterm():
+   # configure anyterm
+   anyterm_conf = open("/etc/sysconfig/anyterm", "w")
+   anyterm_conf.write("ANYTERM_CMD=\"sudo /usr/bin/virsh console %p\"")
+   anyterm_conf.write("ANYTERM_LOCAL_ONLY=false")
+   anyterm_conf.close()
+   # permit it to run the virsh console
+   os.system("echo \"anyterm ALL=NOPASSWD: /usr/bin/virsh console *\" >> /etc/sudoers")
+
+# mount livecd media
+# e.g. CD /dev/sr0, USB /dev/sda1,
+# PXE /dev/loop0 (loopback ISO)
+# not available when booted from local disk installation
+def mount_live():
+    if os.path.ismount("/live"):
+        return
+    
+    live_dev="/dev/live"
+    if not os.path.exists(live_dev):
+        ret = os.system("losetup /dev/loop0|grep -q '\.iso'")
+        if ret == 0:
+        # PXE boot
+            live_dev="/dev/loop0"
+        else:
+            return False
+        os.system("mkdir -p /live")
+        os.system("mount -r %s /live || mount %s /live") % (live_dev, live_dev)
+
+
+# mount root partition
+# boot loader + kernel + initrd + LiveOS
+def mount_liveos():
+    if os.path.ismount("/liveos"):
+        return
+    else:
+        os.system("mkdir -p /liveos")
+        os.system("mount LABEL=Root /liveos")
+
+# mount config partition
+# /config for persistance
+def mount_config():
+    # Only try to mount /config if the persistent storage exists
+    if os.path.exists("/dev/HostVG/Config"):
+        os.system("mkdir -p /config")
+        if not os.path.ismount("/config"):
+            ret = os.system("mount /dev/HostVG/Config /config")
+            if ret > 0:
+                return False
+
+        # optional config embedded in the livecd image
+        if os.path.exists("/live/config"):
+            os.system("cp -rv --update /live/config/* /config")
+
+        # bind mount all persisted configs to rootfs
+        for f in os.listdir("/config"):
+            if os.path.isfile("/config/%s") % f:
+                target = string.replace(f, "/config", "")
+                mounted = os.system("grep -q  %s ext3 /proc/mounts") % target
+                if mounted == 0:
+                    # skip if already bind-mounted
+                    pass
+                else:
+                    dirname = os.path.dirname(target)
+                    os.system("mkdir -p %s") % dirname
+                    if not os.path.exists(target): 
+                        os.open(target, 'w').close() 
+                        os.system("mount -n --bind %s %s" % (f,target))
+                return True
+    else:
+        # /config is not available
+        return False
+
+def mount_boot():
+    if os.path.ismount("/boot"):
+       return
+    else:
+        os.system("mkdir -p /boot")
+        os.system("mount LABEL=Boot /boot")
+
+# stop any service which keeps /var/log busy
+# keep the list of services
+def unmount_logging_services():
+    # mapping command->service is lame, but works for most initscripts
+    logging_services=""
+    prgs_cmd = "cd /etc/init.d|sudo lsof -Fc +D /var/log|grep ^c|sort -u"
+    prgs = subprocess.Popen(prgs_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    prgs_output = prgs.stdout.read()
+    for prg in prgs_output:
+        srvs = subprocess.Popen("grep -l ${prg#c}$ *", shell=True, stdout=PIPE, stderr=STDOUT)
+        srvs_output = srvs.stdout.read()
+    for svc in srv_output:
+        os.system("service %s stop") % svc
+        logging_services+= svc
+    # debugging help
+    os.system("lsof +D /var/log")
+
+# mount logging partition
+# this only gets executed when disk is re-partitioned, HostVG/Logging is empty
+def mount_logging():
+    if os.path.ismount("/var/log"):
+        return True
+    if os.path.exists("/dev/HostVG/Logging"):
+        log("Mounting log partition")
+        # temporary mount-point
+        log2 = tempfile.mkdtemp()
+        os.system("mount /dev/HostVG/Logging %s") % log2
+        unmount_logging_services()
+        # save logs from tmpfs
+        os.system("cp -av /var/log/* %s") % log2
+        # save temporary log
+        if os.path.exists("/tmp/ovirt.log"):
+            os.system("cp /tmp/ovirt.log %s/ovirt.log-tmp") % log2
+        os.system("mount --move %s /var/log") % log2
+        shutil.rmtree(log2)
+        os.system("restorecon -rv /var/log")
+        for srv in logging_services:
+            os.system("service %s start") % srv
+        return
+    else:
+        # /var/log is not available
+        log("\nThe logging partion has not been created. Please create it at the main menu.\n")
+        return False
+
+def unmount_logging():
+    if not os.path.ismount("/var/log"):
+        return True
+    log("Unmounting log partition")
+    # plymouthd keeps /var/log/boot.log
+    ret = os.system("plymouth --ping")
+    if ret == 0:
+        os.system("plymouth --quit")
+    unmount_logging_services()
+
+    ret = os.system("umount /var/log")
+    if ret > 0:
+        return ret
+    for srv in logging_services:
+        os.system("service %s start") % srv
+    return
+
+# mount data partition
+def mount_data():
+    if os.path.ismount("/data"):
+        return
+
+    if os.path.exists("/dev/HostVG/Data"):
+        os.system("mkdir -p /data")
+        os.system("mount /data")
+        os.system("mkdir -p /data/images")
+        os.system("mkdir -p /var/lib/libvirt/images")
+        os.system("mount /var/lib/libvirt/images")
+        os.system("restorecon -rv /var/lib/libvirt/images")
+        os.system("mkdir -p /data/core")
+        os.system("mkdir -p /var/log/core")
+        os.system("mount /var/log/core")
+        os.system("restorecon -rv /var/log/core")
+        return
+    else:
+        # /data is not available
+        log("\nThe data partion has not been created. Please create it at the main menu.\n")
+        return False
+
+def md5sum(filename):
+    m = md5()
+    with open(filename) as f:
+        data = f.read(buf_size)
+        while data:
+            m.update(data)
+            data = f.read(buf_size)
+        return m.hexdigest()
+
+
+# persist configuration to /config
+#   ovirt_store_config /etc/config /etc/config2 ...
+#   copy to /config and bind-mount back
+
+def ovirt_store_config(files):
+    if os.path.ismount("/config"):
+        for p in files:
+            filename = os.path.abspath(filename)
+            persist_it=true
+
+            # ensure that, if this is a directory
+            # that it's not already persisted
+            if os.path.isdir(filename):
+                if os.path.isdir("/config/" + filename):
+                    log("Directory already persisted: ${filename}\n")
+                    log("You need to unpersist its child directories and/or files and try again.\n")
+                    persist_it=false
+
+            # if it's a file then make sure it's not already
+            # persisted
+            if os.path.isfile(filename):
+                if os.path.isfile("/config/" + filename):
+                    md5root=md5sum(filename)
+                    md5stored=md5sum("/config" + filename)
+                    if md5root == md5stored:
+                        log("File already persisted: %s\n") % filename
+                        persist_it=false
+                    else:
+                        # persistent copy needs refresh
+                        ret = os.system("umount -n %s 2> /dev/null") % filename
+                        if ret != 0:
+                            os.system("rm -f /config%s") % filename
+
+            if persist_it:
+                # skip if file does not exist
+                if not os.path.exists(filename):
+                    log("Skipping, file '%s' does not exist\n") % filename
+                # skip if already bind-mounted
+                if not check_bind_mount(filename):
+                    dirname = os.path.dirname(filename)
+                    os.system("mkdir -p /config/%s") % dirname
+                    ret = os.system("cp -a %s /config%s") % (filename, filename)
+                    if ret == 0:
+                        ret = os.system("mount -n --bind /config%s %s") % (filename, filename)
+                        if ret != 0:
+                            log("Failed to persist\n")
+                            rc=1
+                        else:
+                            log("File persisted\n")
+                # register in /config/files used by rc.sysinit
+                ret = os.system("grep -q \"^$%s$\" /config/files 2> /dev/null") % filename
+                if ret > 0:
+                    os.system("echo \"%s\n\" >> /config/files") % filename
+                log("\nSuccessfully persisted ${filename}\n")
+    else:
+        log("WARNING: persistent config storage not available\n")
+        rc=2
+    return rc
+
+def is_persisted(filename):
+    abspath = os.path.abspath(filename)
+    if os.path.exists("/config" + abspath):
+        return True
+    else:
+        return False
+
+# unmount bindmounted config files
+#       unmount_config /etc/config /etc/config2 ...
+#
+# Use before running commands which fail on bindmounted files.
+# After the file is replaced, call ovirt_store_config /etc/config ...
+# to bindmount the config file again.
+#
+
+def check_bind_mount(config_file):
+    bind_mount_cmd = "grep -q \"%s ext4\" /proc/mounts" % config_file
+    bind_mount_ret = os.system(bind_mount_cmd)
+    return bind_mount_ret
+
+def unmount_config(config_file):
+    if os.path.ismount("/config"):
+        for p in config_file.split():
+            f = os.path.abspath(p)
+            if check_bind_mount(f):
+                ret = os.system("umount -n %s" % f)
+                if ret == 0:
+                    if os.path.exists("/config%s" % f):
+                # refresh the file in rootfs if it was mounted over
+                        shutil.copy("/config%s %s" % (f,f))
+
+# remove persistent config files
+#       remove_config /etc/config /etc/config2 ...
+#
+def remove_config(config_file):
+    # if there are no persisted files then just exit
+    if os.path.exists("/config/files"):
+        if os.path.getsize('/config/files') == 0:
+            print "There are currently no persisted files."
+        return
+    if os.path.ismount("/config"):
+        for p in config_file:
+            filename = os.path.abspath(filename)
+            ret = os.system("grep \"^%s\$\" /config/files > /dev/null 2>&1") % filename
+            if ret == 0:
+                if check_bind_mount(filename):
+                    ret = os.system("umount -n %s") % filename
+                    if ret == 0:
+                        if os.path.isdir(filename):
+                            ret = os.system("cp -ar /config/%s/* %s") % (filename,filename)
+                            if ret > 0:
+                                log(" Failed to unpersist %s\n") % filename
+                                return False
+                            else:
+                                log("%s successully unpersisted\n") % filename
+                                return True
+                        else:
+                            if os.path.isfile(filename):
+                                # refresh the file in rootfs if it was mounted over
+                               ret = os.system("cp -a /config%s") % (filename, filename)
+                               if ret > 0:
+                                    log("Failed to unpersist %s\n") % filename
+                                    return False
+                               else:
+                                   log("%s successully unpersisted\n") % filename
+                    # clean up the persistent store
+                    os.system("rm -Rf /config%s") % filename
+                    # unregister in /config/files used by rc.sysinit
+                    os.system("sed --copy -i \"\|^%s$|d\" /config/files") % filename
+                else:
+                    log("%s is not a persisted file.\n") % filename
+            else:
+                log("File not explicitly persisted: %s\n") % filename
+
+# ovirt_safe_delete_config
+#       ovirt_safe_delete_config /etc/config /etc/config2 ...
+#
+# Use to *permanently* remove persisted configuration file.
+# WARNING: file is shredded and removed
+#
+def ovirt_safe_delete_config(target):
+    for t in target:
+        if check_bind_mount(target):
+            os.system("umount -n %s") % target
+
+        os.system("sed --copy -i \"\|%s$|d\" /config/files") % target
+
+        if os.path.isdir(target):
+            child = subprocess.Popen("ls -d %s')", shell=True, stdout=PIPE, stderr=STDOUT) % target
+            child_output = swap.stdout.read()
+            for child in child_output:
+                ovirt_safe_delete_config(child)
+            os.system("rm -rf /config%s") % target
+            os.system("rm -rf %s") % target
+        else:
+            os.system("shred -u /config%s") % target
+            os.system("shred -u %s") % target
+
+
+# compat function to handle different udev versions
+def udev_info(name, query):
+    # old udev command with shortopts
+    udev_cmd = "udevinfo -n %s -q %s" % (name, query)
+    udev = subprocess.Popen(udev_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    udev_output = udev.stdout.read()
+    udev.poll()
+    udev_rc = udev.returncode()
+    if udev_rc > 0:
+        udev_cmd = "udevadm info --name=%s --query=%s" % (name, query)
+        udev = subprocess.Popen(udev_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+        udev_output = udev.stdout.read()
+        udev.poll()
+        udev_rc = udev.returncode()
+    if udev_rc == 0:
+        os.system("echo %s") % udev_output
+    return udev_output
+
+def backup_file(file):
+    dir = os.path.dirname(file)
+    if dir in os.listdir("/"):
+        print "unexpected non-absolute dir: %s" % dir
+        sys.exit(1)
+    os.system("mkdir -p %s%s") % (OVIRT_BACKUP_DIR, dir)
+    if os.path.exists(file):
+        shutil.copy(file, OVIRT_BACKUP_DIR + file)
+
+# reboot wrapper
+#   cleanup before reboot
+def reboot():
+    if not OVIRT_VARS.has_key("$OVIRT_ISCSI_ENABLED"):
+        # setup new Root if update is prepared
+        ret = os.system("findfs LABEL=RootUpdate >/dev/null 2>&1")
+        if ret == 0:
+            root_update_dev_lookup = subprocess.Popen("findfs LABEL=RootUpdate >/dev/null 2>&1", shell=True, stdout=PIPE, stderr=STDOUT)
+            root_update_dev = root_update_dev_lookup.stdout.read()
+            root_dev_lookup = subprocess.Popen("findfs LABEL=Root >/dev/null 2>&1", shell=True, stdout=PIPE, stderr=STDOUT)
+            root_dev = root_dev_lookup.stdout.read()
+            os.system("e2label %s RootBackup") % root_dev
+            os.system("e2label %s Root") % root_update_dev
+    # run post-install hooks
+    # e.g. to avoid reboot loops using Cobbler PXE only once
+    # Cobbler XMLRPC post-install trigger (XXX is there cobbler SRV record?):
+    # wget "http://192.168.50.2/cblr/svc/op/trig/mode/post/system/$(hostname)"
+    #   -O /dev/null
+    for hook in os.listdir("/etc/ovirt-config-boot.d"):
+        os.system(hook)
+    os.system("/sbin/reboot")
+
+# Check if networking is already up
+def network_up():
+    ret = os.system("ip addr show | grep -q 'inet.*scope global'")
+    if ret == 0:
+        return True
+    return False
+# Cleans partition tables
+def wipe_partitions(drive):
+    log("Wiping old boot sector")
+    os.system("dd if=/dev/zero of=\"%s\" bs=1024K count=1") % drive
+    # zero out the GPT secondary header
+    log("Wiping secondary gpt header")
+    disk_kb = subprocess.Popen("sfdisk -s \"%s\" 2>/dev/null", shell=True, stdout=PIPE, stderr=STDOUT) % drive
+    disk_kb_count = disk_kb.stdout.read()
+    os.system("dd if=/dev/zero of=\"%s\" bs=1024 seek=$((%s - 1)) count=1") % (drive,disk_kb_count)
+
+def test_ntp_configuration():
+    # stop ntpd service for testing
+    os.system("service ntpd stop > /dev/null 2>&1")
+    for server in ntp_servers:
+        ret = os.system("ntpdate %s > /dev/null 2>&1") % server
+        if ret > 0:
+            print "\n Unable to verify NTP server: %s \n" % server
+        else:
+            log("\n Verified NTP server: %s \n") % server
+    os.system("service ntpd start")
+
+def get_dm_device(device):
+    dev_path = os.path.abspath(device)
+    major_cmd = "ls -al %s|awk {'print $5'}" % dev_path
+    major = subprocess.Popen("major_dev_cmd", shell=True, stdout=PIPE, stderr=STDOUT)
+    major = major.stdout.read()
+    minor_cmd = "ls -al %s|awk {'print $6'}" % dev_path
+    minor = subprocess.Popen("minor_dev_cmd", shell=True, stdout=PIPE, stderr=STDOUT)
+    minor = minor.stdout.read()
+    dm_device=""
+    rc = 1
+    for dm in os.listdir("/dev/mapper/"):
+        dm_major_cmd = "ls -al %s |awk {'print $5'}" % dm
+        dm_major = subprocess.Popen("dm_major_dev_cmd", shell=True, stdout=PIPE, stderr=STDOUT)
+        dm_major = dm_major.stdout.read()
+        dm_major = dm_major.strip(",")
+        dm_minor_cmd = "ls -al %s|awk {'print $6'}" % dm
+        dm_minor = subprocess.Popen("dm_minor_dev_cmd", shell=True, stdout=PIPE, stderr=STDOUT)
+        dm_minor = dm_minor.stdout.read()
+        if dm_major == major and dm_minor == minor:
+            dm_device=dm
+    return dm_device
+
diff --git a/scripts/storage.py b/scripts/storage.py
new file mode 100644
index 0000000..a2a83a5
--- /dev/null
+++ b/scripts/storage.py
@@ -0,0 +1,451 @@
+#!/usr/bin/python
+from ovirtfunctions import *
+import os
+import time
+import re
+import subprocess
+from subprocess import PIPE, STDOUT
+
+
+default_overcommit=0.5
+default_boot_size=50
+default_root_size=256
+default_config_size=5
+default_logging_size=2048
+BOOTDRIVE = ""
+RootBackup_end = ""
+# -1 indicates data partition should use remaining disk
+default_data_size=-1
+
+mem_size_cmd = "awk '/MemTotal:/ { print $2 }' /proc/meminfo"
+mem_size_mb = subprocess.Popen(mem_size_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+MEM_SIZE_MB = mem_size_mb.stdout.read()
+
+MEM_SIZE_MB= int(MEM_SIZE_MB) / 1024
+
+overcommit=default_overcommit
+# we multiply the overcommit coefficient by 10 then divide the
+# product by 10 to avoid decimals in the result
+OVERCOMMIT_SWAP_SIZE = int(MEM_SIZE_MB) * overcommit * 10 / 10
+
+# add to the swap the amounts from http://kbase.redhat.com/faq/docs/DOC-15252
+MEM_SIZE_GB= MEM_SIZE_MB/1024
+if MEM_SIZE_GB < 4:
+    BASE_SWAP_SIZE=2048
+elif MEM_SIZE_GB < 16:
+    BASE_SWAP_SIZE=4096
+elif MEM_SIZE_GB < 64:
+    BASE_SWAP_SIZE=8192
+else:
+    BASE_SWAP_SIZE=16384
+
+CALC_SWAP_SIZE = int(BASE_SWAP_SIZE) + int(OVERCOMMIT_SWAP_SIZE)
+
+BOOT_SIZE=default_boot_size
+SWAP_SIZE=CALC_SWAP_SIZE
+ROOT_SIZE=default_root_size
+CONFIG_SIZE=default_config_size
+LOGGING_SIZE=default_logging_size
+DATA_SIZE=default_data_size
+
+def translate_multipath_device(dev):
+    #trim so that only sdX is stored, but support passing /dev/sdX
+    if dev is None:
+        return False
+    if "/dev/mapper" in dev:
+        return dev
+    mpath_cmd = "multipath -ll %s" % dev
+    ret = os.system(mpath_cmd)
+    if ret > 0: 
+        return dev
+    dm_dev_cmd = "multipath -ll \"%s\" | egrep dm-[0-9]+ | sed -r 's/^.& (dm-[0-9]+) .*$/\1/'" % dev
+    dm_dev = subprocess.Popen(dm_dev_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    dm_dev_output = "/dev/" + dm_dev.stdout.read()
+    mpath_device = get_dm_device(dm_dev_output)
+
+    if mpath_device is None:
+        return dev
+    else:
+        return mpath_device
+
+def get_drive_size(drive):
+    size_cmd = "sfdisk -s %s 2>null" % drive
+    size = subprocess.Popen(size_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    size = size.stdout.read()
+#    size = int(size.stdout.read().strip()) # / 1024)
+    return size
+
+if OVIRT_VARS.has_key("OVIRT_INIT"):
+    # if present, use the drive selected with 'ovirt_init' boot parameter
+    # setting these the same until kernel cmdline argument implemented
+    DRIVE=translate_multipath_device(OVIRT_VARS["OVIRT_INIT"])
+    ROOTDRIVE = DRIVE
+    HOSTVGDRIVE = DRIVE
+    ROOTDRIVESPACE = get_drive_size(ROOTDRIVE)
+
+# if the node is Fedora then use GPT, otherwise use MBR
+if os.path.isfile("/etc/fedora-release"):
+    LABEL_TYPE="gpt"
+else:
+    LABEL_TYPE="msdos"
+
+
+
+##################################################################
+
+def wipe_lvm_on_disk(dev):
+    unmount_logging
+    part_delim="p"
+    if "/dev/sd" in dev:
+        part_delim=""
+    vg_cmd = "pvs -o vg_uuid --noheadings %s \"%s%s[0-9]\"* 2>/dev/null|sort -u" % (dev, dev, part_delim) 
+    vg = subprocess.Popen(vg_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    vg_output = vg.stdout.read()
+    for vg in vg_output:
+        pvs = os.system("pvscan -o pv_name,vg_uuid --noheadings | grep \"%s\" | egrep -v -q \"%s%s[0-9]+|%s \" 2>/dev/null") % (vg, dev, part_delim, dev)
+        if pvs > 0:
+            log("The volume group \"%s\" spans multiple disks.") % vg
+            log("This operation cannot complete.  Please manually")
+            log("cleanup the storage using standard disk tools.")
+            sys.exit(1)
+        wipe_volume_group(vg)
+    return
+
+
+def reread_partitions(drive):
+    if "dev/mapper" in drive:
+        # kpartx -a -p p "$drive"
+        # XXX fails with spaces in device names (TBI)
+        # ioctl(3, DM_TABLE_LOAD, 0x966980) = -1 EINVAL (Invalid argument)
+        # create/reload failed on 0QEMU    QEMU HARDDISK   drive-scsi0-0-0p1
+        os.system("partprobe ||:")
+        # partprobe fails on cdrom:
+        # Error: Invalid partition table - recursive partition on /dev/sr0.
+    else:
+        os.system("blockdev --rereadpt %s") % drive
+
+
+def get_sd_name(id):
+    device_sys_cmd = "grep -H \"^%s$\" /sys/block/*/dev | cut -d: -f1" % id
+    device_sys = subprocess.Popen(device_sys_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    device_sys_output = device_sys.stdout.read().strip()
+    if not device_sys_output is "":
+        device = os.path.basename(device_sys_output)
+        return device
+    return False
+
+
+# gets the dependent block devices for multipath devices
+def get_multipath_deps(mpath_device, deplist_var):
+    return
+    deplist=""
+    #get dependencies for multipath device
+    deps_cmd ="dmsetup deps -u \"mpath-%s\" \
+    | sed -r 's/\(([0-9]+), ([0-9]+)\)/\1:\2/g' \
+    | sed 's/ /\n/g' | grep [0-9]:[0-9] 2>/dev/null" % mpath_device
+    deps = subprocess.Popen(deps_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    deps_output = deps.stdout.read()
+
+    for dep in deps_output.split():
+        device=get_sd_name(dep)
+        dep_list=[]
+        if device is None:
+            if deplist is None:
+                deplist = device
+            else:
+                deplist.append(device)
+    return deplist
+
+# Find a usable/selected storage device.
+# If there are none, give a diagnostic and return nonzero.
+# If there is just one, e.g., /dev/sda, treat it as selected (see below).
+# and return 0.  If there are two or more, make the user select one
+# or decline.  Upon decline, return nonzero. Otherwise, print the
+# selected name, then return 0.
+# Sample output: /dev/sda
+def get_dev_name():
+    devices=""
+    # list separator
+    for d in os.listdir("/sys/block/"):
+        if re.match("^[hsv]+d", d):
+            devices="/dev/%s %s" % (d,devices)
+    byid_list_cmd = "find /dev/disk/by-id -mindepth 1 -not -name '*-part*' 2>/dev/null"
+    byid_list = subprocess.Popen(byid_list_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    byid_list_output = byid_list.stdout.read()
+    for d in byid_list_output.split():
+        d = os.readlink(d)
+        d_basename = os.path.basename(d)
+        udev_cmd = "udevadm info --name=/dev/%s --query=property | grep -q ^ID_BUS:" % d_basename
+        if os.system(udev_cmd):
+            devices="/dev/%s %s" % (d_basename, devices)
+    # FIXME: workaround for detecting cciss devices
+    if os.path.exists("/dev/cciss"):
+        for d in os.listdir("/dev/cciss"):
+            if not re.match("p[0-9]+\$", d):
+                devices="%s %s" % (d, devices)
+
+    # include multipath devices
+    devs_to_remove=""
+    multipath_list_cmd = "dmsetup ls --target=multipath | cut -f1"
+    multipath_list = subprocess.Popen(multipath_list_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    multipath_list_output = multipath_list.stdout.read()
+
+    for d in multipath_list_output:
+        devices="/dev/mapper/%s %s" % (d, devices)
+        sd_devs=""
+        get_multipath_deps(d, sd_devs)
+
+        dm_dev_cmd = "multipath -ll \"%s\" | grep \"%s\" | sed -r 's/^.*(dm-[0-9]+ ).*$/\1/' )" % (d, d)
+        dm_dev = subprocess.Popen(dm_dev_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+        dm_dev_output = dm_dev.stdout.read()
+        devs_to_remove="%s %s %s" % (devs_to_remove, sd_devs, dm_dev)
+    # Remove /dev/sd* devices that are part of a multipath device
+    dev_list=[]
+    for d in devices.split():
+        if os.path.basename(d) not in devs_to_remove:
+             dev_list.append(d)
+
+    for dev in dev_list:
+        if dev_list.count(dev) > 1:
+            count = dev_list.count(dev)
+            while (count > 1):
+                dev_list.remove(dev)
+                count = count - 1
+
+    return dev_list
+
+def check_partition_sizes():
+   #  disk_size need_size
+    drive_list = []
+    drive_space_dict = {}
+    min_data_size = OVIRT_VARS["DATA_SIZE"]
+    if DATA_SIZE == -1 :
+        min_data_size=5
+
+    if OVIRT_VARS["OVIRT_ISCSI_ENABLED"] == "y":
+        BOOTDRIVESPACE = get_drive_size(BOOTDRIVE)
+        drive_list.append("BOOT")
+        drive_space_dict["BOOTDRIVESPACE"] = BOOTDRIVESPACE
+        drive_space_dict["BOOT_NEED_SIZE"] = BOOT_SIZE
+    else:
+	ROOTDRIVESPACE = get_drive_size(ROOTDRIVE)
+        HOSTVGDRIVESPACE = get_drive_size(HOSTVGDRIVE)
+        ROOT_NEED_SIZE=ROOT_SIZE * 2
+        HOSTVG_NEED_SIZE=SWAP_SIZE + CONFIG_SIZE + LOGGING_SIZE + min_data_size
+        drive_space_dict["ROOTDRIVESPACE"] = ROOTDRIVESPACE
+        drive_space_dict["ROOT_NEED_SIZE"] = ROOT_NEED_SIZE
+        drive_space_dict["HOSTVGDRIVESPACE"] = HOSTVGDRIVESPACE
+        drive_space_dict["HOSTVG_NEED_SIZE"] = HOSTVG_NEED_SIZE
+
+        if ROOTDRIVE == HOSTVGDRIVE:
+            drive_list.append("ROOT")
+            ROOT_NEED_SIZE=ROOT_SIZE * 2 + HOSTVG_NEED_SIZE
+            drive_space_dict["ROOT_NEED_SIZE"] = ROOT_NEED_SIZE
+        else:
+            drive_list.append("ROOT")
+            drive_list.append("HOSTVG")
+
+    for drive in drive_list:
+        drive_need_size = drive_space_dict["drive" + "NEED_SIZE"]
+        drive_disk_size= drive_space_dict["drive" + "DRIVESPACE"]
+        
+        if drive_need_size > drive_disk_size:
+            gap_size = drive_need_size - drive_disk_size
+            log("\n")
+            log("=============================================================\n")
+            log("The target storage device is too small for the desired sizes:\n")
+            log(" Disk Target: $drive \n")
+            log(" Size of target storage device: $drive_disk_size MB\n")
+            log(" Total storage size to be used: $drive_need_size MB\n")
+            log("\n")
+            log("You need an additional $gap_size MB of storage.\n")
+            log("\n")
+            sys.exit(1)
+        else:
+            log("Required Space : $drive_need_size MB\n\n")
+
+
+#def get_drive_size(drive):
+#    size_cmd = "sfdisk -s \"%s\" 2>null)" % drive
+#    size = subprocess.Popen(size_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+#    size_output = size.stdout.read()
+#    size_output = size_output / 1024
+#    log("%s (%s MB)") % (drive, size_output)
+#    if not space_var is None:
+#        return space_var
+
+def check_existing_hostvg(install_dev):
+    if install_dev is None:
+        devices="$(pvs --separator=\" \" -o pv_name,vg_name --noheadings | grep \"HostVG\" | cut -f1)"
+    else:
+        devices="$(pvs --separator=\" \" -o pv_name,vg_name --noheadings | grep -v \"%s\" | grep \"HostVG\" | cut -f1)" % install_dev
+    if devices is not None:
+        log("\n")
+        log("There appears to already be an installation on another device:\n")
+        for device in devices.split():
+            log("\t%s\n") % device
+        log("The installation cannot proceed until the device is removed\n")
+        log("from the system of the HostVG volume group is removed.\n")
+    return devices
+
+#ROOTDRIVE = "/dev/sda"
+def create_hostvg():
+    BOOTDRIVE = ""
+    log("Creating LVM partition")
+    global ROOTDRIVE
+    global HOSTVGDRIVE
+    global BOOTDRIVE
+    global RootBackup_end
+    if ROOTDRIVE == HOSTVGDRIVE:
+        parted_cmd = "parted %s -s \"mkpart primary ext2 %sM -1\"" % (HOSTVGDRIVE, RootBackup_end)
+        os.system(parted_cmd)
+        hostvgpart="3"
+    elif BOOTDRIVE == HOSTVGDRIVE:
+        parted_cmd = "parted %s -s \"mkpart primary ext2 %s -1\"" % (HOSTVGDRIVE, boot_size_si)
+        os.system(parted_cmd)
+        hostvgpart="2"
+        ROOTDRIVE = BOOTDRIVE
+    else:
+        os.system("parted \"%s\" -s \"mkpart primary ext2 0M -1") % HOSTVGDRIVE
+        hostvgpart = "1"
+    log("Toggling LVM on")
+    parted_cmd = "parted \"%s\" -s \"set %s lvm on\"" % (HOSTVGDRIVE, hostvgpart)
+    os.system(parted_cmd)
+    os.system("parted \"%s\" -s \"print\"") % ROOTDRIVE
+    os.system("udevadm settle 2> /dev/null || udevsettle")
+    reread_partitions(HOSTVGDRIVE)
+
+    # sync GPT to the legacy MBR partitions
+    if OVIRT_VARS.has_key["OVIRT_INSTALL_ROOT"] and OVIRT_VARS["OVIRT_INSTALL_ROOT"] == "y" :
+        if self.LABEL_TYPE == "gpt":
+            log("Running gptsync to create legacy mbr")
+            os.system("gptsync \"%s\"") % ROOTDRIVE
+
+    partpv = HOSTVGDRIVE + hostvgpart
+    if not os.path.exists(partpv):
+        # e.g. /dev/cciss/c0d0p2
+        partpv = HOSTVGDRIVE + "p" + hostvgpart
+    log("Creating physical volume")
+    if not os.path.exists(partpv):
+        log("%s is not available!") % partpv
+        sys.exit(1)
+    os.system("dd if=/dev/zero of=\"%s\" bs=1024k count=1") % partpv
+    os.system("pvcreate -ff -y \"%s\"") % partpv
+    log("Creating volume group")
+    os.system("vgcreate /dev/HostVG \"%s\"") % partpv
+
+    if SWAP_SIZE > 0:
+        log("Creating swap partition")
+        os.system("lvcreate --name Swap --size %sM /dev/HostVG") % SWAP_SIZE
+        os.system("mkswap -L \"SWAP\" /dev/HostVG/Swap")
+        os.system("echo \"/dev/HostVG/Swap swap swap defaults 0 0\" >> /etc/fstab")
+    if CONFIG_SIZE > 0:
+        log("Creating config partition")
+        os.system("lvcreate --name Config --size %sM /dev/HostVG") % CONFIG_SIZE
+        os.system("mke2fs -j /dev/HostVG/Config -L \"CONFIG\"")
+        os.system("tune2fs -c 0 -i 0 /dev/HostVG/Config")
+    if LOGGING_SIZE > 0:
+        log("Creating log partition")
+        os.system("lvcreate --name Logging --size %sM /dev/HostVG") % LOGGING_SIZE
+        os.system("mke2fs -j /dev/HostVG/Logging -L \"LOGGING\"")
+        os.system("tune2fs -c 0 -i 0 /dev/HostVG/Logging")
+        os.system("echo \"/dev/HostVG/Logging /var/log ext3 defaults,noatime 0 0\" >> /etc/fstab")
+    use_data=1
+    if DATA_SIZE == -1:
+        log("Creating data partition with remaining free space")
+        os.system("lvcreate --name Data -l 100%FREE /dev/HostVG")
+        use_data=0
+    elif DATA_SIZE > 0:
+        log("Creating data partition")
+        os.system("lvcreate --name Data --size %sM /dev/HostVG") % DATA_SIZE
+        use_data=0
+
+    if use_data == 0:
+        os.system("mke2fs -j /dev/HostVG/Data -L \"DATA\"")
+        os.system("tune2fs -c 0 -i 0 /dev/HostVG/Data")
+        os.system("echo \"/dev/HostVG/Data /data ext3 defaults,noatime 0 0\" >> /etc/fstab")
+        os.system("echo \"/data/images /var/lib/libvirt/images bind bind 0 0\" >> /etc/fstab")
+        os.system("echo \"/data/core /var/log/core bind bind 0 0\" >> /etc/fstab")
+
+    log("Mounting config partition")
+    if mount_config:
+        ovirt_store_config /etc/fstab
+
+    mount_logging
+    if use_data == 0:
+        log("Mounting data partition")
+        mount_data
+    log("Completed!")
+
+
+def perform_partitioning():
+    if HOSTVGDRIVE is None and OVIRT_VARS["OVIRT_ISCSI_ENABLED"] != "y":
+        log("\nNo storage device selected.\n")
+        return False
+
+    if BOOTDRIVE is None and OVIRT_VARS["OVIRT_ISCSI_ENABLED"] == "y":
+        log("\nNo storage device selected.\n")
+        return False
+
+    log("Saving parameters")
+    unmount_config("/etc/default/ovirt")
+
+    log("Removing old LVM partitions")
+    wipe_volume_group("HostVG")
+    wipe_lvm_on_disk(HOSTVGDRIVE)
+    wipe_lvm_on_disk(ROOTDRIVE)
+
+    mem_size_cmd = "awk '/MemTotal:/ { print $2 }' /proc/meminfo"
+    mem_size_mb = subprocess.Popen(mem_size_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    MEM_SIZE_MB = int(mem_size_mb.stdout.read())
+
+    MEM_SIZE_MB = MEM_SIZE_MB / 1024
+    boot_size_si = BOOT_SIZE * (1024 * 1024) / (1000 * 1000)
+
+    if OVIRT_VARS.has_key("OVIRT_ISCSI_ENABLED") and OVIRT_VARS["OVIRT_ISCSI_ENABLED"] == "y":
+        log("iSCSI enabled, partitioning boot drive: $BOOTDRIVE")
+        wipe_partitions(BOOTDRIVE)
+        reread_partitions(BOOTDRIVE)
+        log("Creating boot partition")
+        os.system("parted \"%s\" -s \"mklabel %s\"") % (BOOTDRIVE, LABEL_TYPE)
+        os.system("parted \"%s\" -s \"mkpartfs primary ext2 0M %sM") % (BOOTDRIVE, boot_size_si)
+        reread_partitions(BOOTDRIVE)
+        partboot= BOOTDRIVE + "1"
+        if not os.path.exists(partboot):
+            partboot = BOOTDRIVE + "p1"
+        # sleep to ensure filesystems are created before continuing
+        time.sleep("10")
+        os.system("mke2fs \"%s\" -L Boot") % partboot
+        os.system("tune2fs -c 0 -i 0 %s") % partboot
+        if OVIRT_VARS["OVIRT_ISCSI_HOSTVG"] == "y":
+            create_hostvg()
+        log("Completed!")
+        return
+
+    if OVIRT_VARS.has_key("OVIRT_ROOT_INSTALL") and OVIRT_VARS["OVIRT_ROOT_INSTALL"] == "y":
+        log("Partitioning root drive: %s") % ROOTDRIVE
+        wipe_partitions(ROOTDRIVE)
+        reread_partitions(ROOTDRIVE)
+        log("Labeling Drive: %s") % ROOTDRIVE
+        os.system("parted \"%s\" -s \"mklabel %s\"")  % (ROOTDRIVE, LABEL_TYPE)
+        log("Creating Root and RootBackup Partitions")
+        RootBackup_end= ROOT_SIZE * 2
+        os.system("parted \"%s\" -s \"mkpart primary ext2 0M %sM\"") % (ROOTDRIVE, ROOT_SIZE)
+        os.system("parted \"%s\" -s \"mkpart primary ext2 %sM %sM\"") % (ROOTDRIVE, ROOT_SIZE, RootBackup_end)
+        # sleep to ensure filesystems are created before continuing
+        time.sleep("10")
+        reread_partitions(ROOTDRIVE)
+        partroot = ROOTDRIVE + "1"
+        partrootbackup = ROOTDRIVE + "2"
+        if not os.path.exists(partroot):
+            partroot = ROOTDRIVE + "p1"
+            partrootbackup= ROOTDRIVE + "p2"
+        os.system("mke2fs \"%s\" -L Root") % partroot
+        os.system("mke2fs \"%s\" -L RootBackup") % partrootbackup
+        os.system("tune2fs -c 0 -i 0 \"%s\"") % partroot
+        os.system("tune2fs -c 0 -i 0 \"%s\"") % partrootbackup
+
+    if ROOTDRIVE != HOSTVGDRIVE:
+        log("Labeling Drive: %s") % abc #HOSTVGDRIVE
+        os.system("parted \"%s\" -s \"mklabel %s\"") % (HOSTVGDRIVE, LABEL_TYPE)
+    create_hostvg()
-- 
1.7.2.3



From jboggs at redhat.com  Mon Oct 25 16:28:33 2010
From: jboggs at redhat.com (Joey Boggs)
Date: Mon, 25 Oct 2010 12:28:33 -0400
Subject: [Ovirt-devel] [PATCH node] add network.py script
Message-ID: <1288024113-4841-1-git-send-email-jboggs@redhat.com>

---
 scripts/network.py |  207 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 207 insertions(+), 0 deletions(-)
 create mode 100644 scripts/network.py

diff --git a/scripts/network.py b/scripts/network.py
new file mode 100644
index 0000000..28e32f2
--- /dev/null
+++ b/scripts/network.py
@@ -0,0 +1,207 @@
+#!/usr/bin/python
+
+from ovirtfunctions import *
+import tempfile
+import sys
+
+class Network:
+
+    def __init__(self):
+        self.WORKDIR=tempfile.mkdtemp()
+        self.IFCONFIG_FILE_ROOT="/files/etc/sysconfig/network-scripts/ifcfg"
+        self.NTPCONF_FILE_ROOT="/files/etc/ntp"
+        self.NTP_CONFIG_FILE="/etc/ntp.conf"
+        self.NTPSERVERS=""
+        self.CONFIGURED_NIC= ""
+        self.IF_CONFIG = ""
+        self.BR_CONFIG = ""
+        self.VL_CONFIG = ""
+        self.VLAN_ID=""
+        self.VL_ROOT=""
+        self.VL_FILENAME =""
+        self.nic=""
+        self.bridge=""
+        self.vlan_id=""
+
+    def configure_interface(self):
+        log("Configuring Interface")
+        if OVIRT_VARS.has_key("OVIRT_IP_ADDRESS"):
+            IPADDR = OVIRT_VARS["OVIRT_IP_ADDRESS"]
+            NETMASK = OVIRT_VARS["OVIRT_IP_NETMASK"]
+            GATEWAY = OVIRT_VARS["OVIRT_IP_GATEWAY"]
+            PREFIX = OVIRT_VARS["OVIRT_IP_PREFIX"]
+
+        if OVIRT_VARS.has_key("OVIRT_BOOTIF"):
+            self.CONFIGURED_NIC = OVIRT_VARS["OVIRT_BOOTIF"]
+        if not self.CONFIGURED_NIC is None:
+            log("\nDeleting existing network configuration...\n")
+            os.system("cp -a  /etc/sysconfig/network-scripts/ifcfg-lo /etc/sysconfig/network-scripts/backup.lo")
+            remove_config("/etc/sysconfig/network-scripts/ifcfg-*")
+            os.system("rm -rf /etc/sysconfig/network-scripts/ifcfg-*")
+            os.system("cp -a  /etc/sysconfig/network-scripts/backup.lo /etc/sysconfig/network-scripts/ifcfg-lo")
+        else:
+            log("\nAborting...\n")
+            return
+
+        for file in os.listdir(self.WORKDIR):
+            os.system("rm -rf %s/%s") % (self.WORKDIR, file)
+        BRIDGE = "br" + self.CONFIGURED_NIC
+        IF_FILENAME = self.WORKDIR + "/augtool-" + self.CONFIGURED_NIC
+        BR_FILENAME = self.WORKDIR + "/augtool-" + BRIDGE
+        log("\nConfigure $BRIDGE for use by $NIC..\n\n")
+        IF_ROOT = "%s-%s" % (self.IFCONFIG_FILE_ROOT, self.CONFIGURED_NIC)
+        self.IF_CONFIG += "rm %s\nset %s/DEVICE %s\n" % (IF_ROOT, IF_ROOT, self.CONFIGURED_NIC)
+        BR_ROOT = "%s-%s" % (self.IFCONFIG_FILE_ROOT, BRIDGE)
+        self.BR_CONFIG += "rm %s\nset %s/DEVICE %s\n" % (BR_ROOT, BR_ROOT, BRIDGE)
+        self.BR_CONFIG += "set %s/TYPE Bridge\n" % BR_ROOT
+        self.BR_CONFIG += "set %s/PEERNTP yes\n" % BR_ROOT
+
+        if OVIRT_VARS.has_key("OVIRT_IPV6"):
+            if OVIRT_VARS["OVIRT_IPV6"]  == auto:
+                self.BR_CONFIG += "set %s/IPV6INIT yes\n" % BR_ROOT
+                self.BR_CONFIG += "set %s/IPV6FORWARDING no\n" % BR_ROOT
+                BR_CONFIG += "set %s/IPV6_AUTOCONF yes\n" % BR_ROOT
+            elif OVIRT_VARS["OVIRT_IPV6"] == "dhcp":
+                self.BR_CONFIG += "set %s/IPV6INIT yes\n" % BR_ROOT
+                self.BR_CONFIG += "set %s/IPV6_AUTOCONF no\n" % BR_ROOT
+                self.BR_CONFIG += "set %s/IPV6FORWARDING no\n" % BR_ROOT
+                self.BR_CONFIG += "set %s/DHCPV6C yes\n" % BR_ROOT
+            else:
+                self.BR_CONFIG += "set %s/IPV6INIT yes\n" % BR_ROOT
+                self.BR_CONFIG += "set %s/IPV6ADDR $OVIRT_IPV6\n" % BR_ROOT
+                self.BR_CONFIG += "set %s/IPV6_AUTOCONF no\n" % BR_ROOT
+                self.BR_CONFIG += "set %s/IPV6FORWARDING no\n" % BR_ROOT
+
+        if OVIRT_VARS.has_key("OVIRT_VLAN"):
+            VLAN_ID=OVIRT_VARS["OVIRT_VLAN"]
+            VL_ROOT = "%s.%s" % (IF_ROOT, VLAN_ID)
+            VL_CONFIG += "rm %s\\nset \%s/DEVICE %s.%s\\n" % (VL_ROOT, VL_ROOT, self.CONFIGURED_NIC, VLAN_ID)
+            VL_CONFIG += "set %s/BRIDGE %s\\n" % (VL_ROOT, BRIDGE)
+            VL_CONFIG += "set %s/VLAN yes\n" % VL_ROOT
+            self.VL_FILENAME = "%s.%s" % (IF_FILENAME, OVIRT_VARS[OVIRT_VLAN])
+
+        if not OVIRT_VARS.has_key("OVIRT_IP_ADDRESS"):
+	    if not self.VL_CONFIG:
+	        self.IF_CONFIG += "set %s/BRIDGE %s\n" % (IF_ROOT, BRIDGE)
+                self.BR_CONFIG += "set %s/BOOTPROTO dhcp\n" % BR_ROOT
+        else:
+            if OVIRT_VARS.has_key("OVIRT_IP_ADDRESS") and OVIRT_VARS["OVIRT_IP_ADDRESS"] != "off":
+		if self.VL_CONFIG is None:
+                    self.IF_CONFIG =+ "set %s/BRIDGE %s\n" % (IF_ROOT, BRIDGE)
+                self.BR_CONFIG += "set %s/IPADDR %s\n" % (BR_ROOT, OVIRT_VARS["OVIRT_IP_ADDRESS"])
+                if OVIRT_VARS.has_key("OVIRT_IP_NETMASK"):
+                    self.BR_CONFIG += "set %s/NETMASK %s\n" (BR_ROOT, OVIRT_IP_NETMASK)
+                if OVIRT_VARS.has_key("OVIRT_IP_GATEWAY"):
+                    self.BR_CONFIG += "set %s/GATEWAY %s\n" % (BR_ROOT, OVIRT_IP_GATEWAY)
+        self.IF_CONFIG += "set %s/ONBOOT yes" % IF_ROOT
+        self.BR_CONFIG += "set %s/ONBOOT yes" % BR_ROOT
+        
+        if OVIRT_VARS.has_key("OVIRT_VLAN") and VL_CONFIG is not "" :
+	    self.VL_CONFIG="set %s/ONBOOT yes" % VL_ROOT
+        self.IF_CONFIG = self.IF_CONFIG.split("\n")
+        self.BR_CONFIG = self.BR_CONFIG.split("\n")
+        try:
+            self.VL_CONFIG = self_VL_CONFIG.split("\n")
+        except:
+            pass
+    def configure_dns(self):
+        if OVIRT_VARS.has_key("OVIRT_DNS"):
+            DNS=OVIRT_VARS["OVIRT_DNS"]
+            IF_FILENAME="%s/augtool-br%s" % (self.WORKDIR, CONFIGURED_NIC)
+            IF_ROOT="%s-br%s" % (self.IFCONFIG_FILE_ROOT, self.CONFIGURED_NIC)
+            if not DNS is None:
+                try:
+                    DNS1, DNS2 = DNS.split(" ", 1)
+                    if not DNS1 is None:
+                        os.system("echo \"set %s/DNS1 %s\n\" >> %s") % (IF_ROOT, DNS1)
+                    if not DNS2 is None:
+                        os.system("echo \"set %s/DNS2 %s\n\" >> %s") % (IF_ROOT, DNS2)
+                except:
+                    pass
+
+    def configure_ntp(self):
+        if OVIRT_VARS.has_key("OVIRT_NTP"):
+            NTPSERVERS=OVIRT_NTP
+        else:
+            NTPSERVERS=""
+
+    def save_ntp_configuration(self):
+        ntproot = "/files/etc/ntp.conf"
+        ntpconf = "rm %s\n" % ntproot
+        ntpconf += "set %s/driftfile /var/lib/ntp/drift\n" % ntproot
+        ntpconf += "set %s/includefile /etc/ntp/crypto/pw\n" % ntproot
+        ntpconf += "set %s/keys /etc/ntp/keys" % ntproot
+        ntpconf = ntpconf.split("\n")
+        for line in ntpconf:
+            try:
+                oper, file, value = line.split()
+            except:
+                oper, file = line.split()
+            
+            augtool(line)
+
+        if OVIRT_VARS.has_key("NTPSERVERS"):
+            offset=1
+            SERVERS = OVIRT_VARS["NTPSERVERS"].split(":")
+            for server in SERVERS:
+                os.system("echo \"set /files/etc/ntp.conf/server[%s] %s\n\" >> %s") % (offset, server, ntpconf)
+                offset = offset + 1
+
+    def save_network_configuration(self):
+        net_configured=0
+        augtool_workdir_list = "ls %s/augtool-* >/dev/null"
+        log("Configuring network")
+
+        # delete existing scripts
+        try:
+            for vlan in os.listdir("/proc/net/vlan/"):
+                if "config" in vlan:
+                    os.system("vconfig rem %s") % vlan
+        except:
+            pass
+
+        for script in os.listdir("/etc/sysconfig/network-scripts/"):
+            if "ifcfg" in script:
+                if not "ifcfg-lo" in script:
+                    ovirt_safe_delete_config(script)
+
+        config = self.WORKDIR + "/config-augtool"
+        
+            
+        for line in self.IF_CONFIG:
+            try:
+                oper, file, value = line.split()
+            except:
+                oper, file = line.split()
+            augtool(line)
+            net_configured=1
+            ovirt_store_config("/etc/sysconfig/network-scripts/ifcfg* NTP_CONFIG_FILE")
+            log("Network configured successfully")
+        if net_configured == 1:
+            os.system("service network stop > /dev/null 2>&1")
+            brctl_cmd = "brctl show|grep breth|awk '{print $1}'"
+            brctl = subprocess.Popen(brctl_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+            brctl_output = brctl.stdout.read()
+            for i in brctl_output.split():
+                if_down_cmd = "ifconfig %s down" % i
+                os.system(if_down_cmd)
+                del_br_cmd = "brctl delbr %s" % i
+                os.system(del_br_cmd)
+                os.system("service network start 2> /dev/null")
+            if OVIRT_VARS.has_key("NTP"):
+                log("Testing NTP Configuration")
+                test_ntp_configuration()
+try:
+    if "AUTO" in sys.argv[1]:
+        if OVIRT_VARS.has_key("OVIRT_INIT"):
+            network = Network()
+            network.configure_interface()
+            network.configure_dns()
+            network.configure_ntp()
+            network.save_ntp_configuration()
+            network.save_network_configuration()
+        else:
+            log("No network interface specified. Unable to configure networking.")
+except:
+    log("Exiting..")
+    sys.exit(0)
-- 
1.7.2.3



From jboggs at redhat.com  Tue Oct 26 17:32:33 2010
From: jboggs at redhat.com (Joey Boggs)
Date: Tue, 26 Oct 2010 13:32:33 -0400
Subject: [Ovirt-devel] [PATCH node] add install.py
Message-ID: <1288114353-1687-1-git-send-email-jboggs@redhat.com>

---
 scripts/install.py |  247 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 247 insertions(+), 0 deletions(-)
 create mode 100755 scripts/install.py

diff --git a/scripts/install.py b/scripts/install.py
new file mode 100755
index 0000000..ddffb53
--- /dev/null
+++ b/scripts/install.py
@@ -0,0 +1,247 @@
+#!/usr/bin/python
+#
+# install.py - configure local boot/root disk partitions
+
+# SYNOPSIS
+# ovirt-config-boot livecd_path bootparams reboot
+#
+#       livecd_path - where livecd media is mounted,
+#                     parent of LiveOS and isolinux folders
+#                     default is /live
+#
+#       bootparams  - extra boot parameters like console=...
+#                     default is $OVIRT_BOOTPARAMS
+#
+#       reboot      - reboot after install
+#                     default is yes
+
+from ovirtfunctions import *
+import shutil
+import sys
+
+def ovirt_boot_setup():
+
+    log("installing the image.")
+
+    if OVIRT_VARS["OVIRT_ROOT_INSTALL"] == "n":
+        log("done.")
+        return
+
+    found_boot=False
+    rc = os.system("findfs LABEL=Boot 2>&1 >/dev/null")
+    if rc == 0:
+        found_boot = True
+        grub_dev_label = "Boot"
+    rc = os.system("findfs LABEL=Root 2>&1 >/dev/null")
+    if rc == 0:
+        found_boot = False
+        grub_dev_label = "Root"
+    if found_boot:
+        mount_boot()
+        if not os.path.ismount("/boot"):
+            log("Boot partition not available")
+            sys.exit(1)
+        # Grab OVIRT_ISCSI VARIABLES from boot partition for upgrading
+        # file created only if OVIRT_ISCSI_ENABLED=y
+        if os.path.exists("/boot/ovirt"):
+            try:
+                f = open("/boot/ovirt", 'r')
+                for line in f:
+                    try:
+                        line = line.strip()
+                        key, value = line.split("\"", 1)
+                        key = key.strip("=")
+                        key = key.strip()
+                        value = value.strip("\"")
+                        OVIRT_VARS[key] = value
+                    except:
+                        pass
+                f.close()
+                iscsiadm_cmd = "iscsiadm -p %s:%s -m discovery -t sendtargets" % (OVIRT_VARS["OVIRT_ISCSI_TARGET_IP"], OVIRT_VARS["OVIRT_ISCSI_TARGET_PORT"])
+                os.system("iscsiadm_cmd")
+                log("Restarting iscsi service")
+                os.system("service iscsi restart")
+            except:
+                pass
+    else:
+        grub_dev_label="RootBackup"
+
+    # check that /boot mounted ok and find partition number for GRUB, $4 is to allow 0 as a partition number for grub
+    grub_part_info_cmd = "findfs LABEL=%s 2>/dev/null" % grub_dev_label
+    grub_part_info = subprocess.Popen(grub_part_info_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    disk = grub_part_info.stdout.read()
+    disk = disk.rstrip(disk[-1:])
+    length = len(disk) - 1
+    partN = disk[length:]
+    partN = int(partN) - 1
+    disk = disk.rstrip(disk[-1:])
+
+    if disk is None and partN < 0:
+      log("unable to determine Root partition")
+      sys.exit(1)
+    if OVIRT_VARS.has_key("OVIRT_ISCSI_ENABLED") and OVIRT_VARS["OVIRT_ISCSI_ENABLED"] != "y":
+        mount_liveos()
+        if not os.path.ismount("/liveos"):
+          log("Root partition not available")
+          sys.exit(1)
+
+        # prepare Root partition update
+        candidate=""
+        if os.system("findfs LABEL=RootBackup 2>&1 >/dev/null"):
+            candidate = "RootBackup"
+        elif os.system("findfs LABEL=RootUpdate 2>&1 >/dev/null"):
+            candidate = "RootUpdate"
+        elif os.system("findfs LABEL=RootNew 2>&1 >/dev/null"):
+            candidate = "RootNew"
+        if candidate == "":
+            rc=1
+        elif candidate == "RootNew":
+            os.system("umount /liveos")
+            rc=0
+        else:
+            candidate_dev_cmd = "findfs LABEL=%s 2>/dev/null" % candidate
+            candidate_dev = subprocess.Popen(grub_part_info_cmd, shell=True, stdout=PIPE, stderr=STDOUT, stdin=PIPE)
+            candidate_dev = candidate_dev.stdout.read()
+            e2label_cmd = "e2label %s RootNew" % candidate_dev
+            rc = os.system(e2label_cmd)
+        if rc != 0:
+          log("root partition not available.")
+          label_debug = os.listdir("ls -al /dev/disk/by-label")
+          log(label_debug)
+          return rc
+        mount_cmd = "mount %s /liveos" % candidate_dev
+        os.system(mount_cmd)
+        os.system("rm -rf /liveos/LiveOS")
+        os.system("mkdir -p /liveos/LiveOS")
+
+    # install oVirt Node image for local boot
+    if os.path.exists("/live/syslinux"):
+        syslinux = "syslinux"
+    if os.path.exists("/live/isolinux"):
+        syslinux = "isolinux"
+    else:
+        syslinux=""
+
+    if OVIRT_VARS.has_key("OVIRT_ISCSI_ENABLED") and OVIRT_VARS["OVIRT_ISCSI_ENABLED"] == "y":
+        initrd_dest = "/boot"
+        grub_dir = "/boot/grub"
+        grub_prefix = "/grub"
+    else:
+        initrd_dest = "/liveos"
+        grub_dir = "/liveos/boot/grub"
+        grub_prefix = "/boot/grub"
+    if os.path.isdir(grub_dir):
+        shutil.rmtree(grub_dir)
+    if not os.path.exists(grub_dir):
+        os.makedirs(grub_dir)
+    os.system("cp -p /live/" + syslinux + "/vmlinuz0 " + initrd_dest)
+    rc = os.system("cp -p /live/" + syslinux + "/initrd0.img " + initrd_dest)
+    if rc != 0:
+        log("kernel image copy failed.")
+        return rc
+
+    if not OVIRT_VARS.has_key("OVIRT_ISCSI_ENABLED"):
+        rc = os.system("cp -p /live/LiveOS/squashfs.img /liveos/LiveOS")
+        if rc > 0:
+          log("squashfs image copy failed.")
+          return rc
+    version_cmd = "rpm -q --qf '%{version}' ovirt-node"
+    version = subprocess.Popen(version_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    version = version.stdout.read()
+    release_cmd = "rpm -q --qf '%{version}' ovirt-node"
+    release = subprocess.Popen(release_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+    release = release.stdout.read()
+    # reorder tty0 to allow both serial and phys console after installation
+    if OVIRT_VARS.has_key("OVIRT_ISCSI_ENABLED") and OVIRT_VARS["OVIRT_ISCSI_ENABLED"] == "y":
+        bootparams="ro root=LABEL=ovirt-node-root roottypefs=ext3 console=tty0 \
+                    netroot=iscsi:$OVIRT_ISCSI_TARGET_IP::$OVIRT_ISCSI_TARGET_PORT::$OVIRT_ISCSI_NODE_NAME ip=eth0:dhcp"
+    else:
+        bootparams="ro root=live:LABEL=Root roottypefs=ext3 console=tty0 \
+                $(echo $bootparams | sed s/console=tty0//g)"
+    grub_config_file = "%s/grub.conf" % grub_dir
+    GRUB_CONFIG_TEMPLATE = """
+default=0
+timeout=5
+hiddenmenu
+title oVirt Node (%(version)s-%(release)s)
+    root (hd0,%(partN)s)
+    kernel /vmlinuz0 %(bootparams)s
+    initrd /initrd0.img
+    """
+    device_map_conf = open(grub_dir + "/device.map\n", "w")
+    device_map_conf.write("(hd0) " + disk)
+    device_map_conf.close()
+    grub_files = ["stage1", "stage2", "e2fs_stage1_5"]
+    for file in grub_files:
+        os.system("cp /usr/share/grub/x86_64-redhat/" + file + " " + grub_dir)
+
+    GRUB_SETUP_TEMPLATE = """
+    grub --device-map=%(grub_dir)s/device.map
+root (hd0,%(partN)s)
+setup --prefix=%(grub_prefix)s (hd0)
+    """
+
+    grub_dict = {
+        "version" : version,
+        "release" : release,
+        "partN" : partN,
+        "bootparams" : bootparams,
+        "disk" : disk,
+        "grub_dir" : grub_dir,
+        "grub_prefix" : grub_prefix
+    }
+    grub_config_out = GRUB_CONFIG_TEMPLATE % grub_dict
+    grub_setup_out = GRUB_SETUP_TEMPLATE % grub_dict
+    grub_conf = open(grub_config_file, "w")
+    subprocess.Popen(grub_setup_out, shell=True, stdout=PIPE, stderr=STDOUT)
+    grub_conf.write(grub_config_out)
+    grub_conf.close()
+
+    if OVIRT_VARS.has_key("OVIRT_ISCSI_ENABLED") and OVIRT_VARS["OVIRT_ISCSI_ENABLED"] != "y":
+        os.system("umount /liveos")
+        # mark new Root ready to go, reboot() in ovirt-function switches it to active
+        e2label_cmd = "e2label %s RootUpdate" % candidate_dev
+        os.system(e2label_cmd)
+        os.system("rm -rf %s") % tmpdir
+    if OVIRT_VARS.has_key("OVIRT_ISCSI_ENABLED") and OVIRT_VARS["OVIRT_ISCSI_ENABLED"] == "y":
+        # copy default for when Root/HostVG is inaccessible(iscsi upgrade)
+        shutil.copy(OVIRT_DEFAULTS, "/boot")
+    log("done.")
+
+def Usage():
+
+    print "Usage: %s [livecd_path] [bootparams] [reboot(yes/no)]" % sys.argv[0]
+    print "       livecd_path - where livecd media is mounted parent of LiveOS"
+    print "                     and isolinux folders default is /live"
+    print ""                                      
+    print "       bootparams - extra boot parameters like console=..." 
+    print "                    default is \"$OVIRT_BOOTPARAMS\""
+    print ""
+    print "       reboot     - reboot after install, default is yes"
+    sys.exit(1)
+
+if len(sys.argv) < 3:
+    Usage()
+
+live = sys.argv[1]
+bootparams = sys.argv[2]
+try:
+    doreboot=sys.argv[3]
+    doreboot="no"
+except:
+    doreboot = "yes"
+
+if bootparams is None:
+    bootparams=OVIRT_VARS["OVIRT_BOOTPARAMS"]
+if doreboot == "":
+    doreboot="yes"
+
+if OVIRT_VARS["OVIRT_ROOT_INSTALL"] == "n":
+    log("done.")
+else:
+    rc = ovirt_boot_setup()   #(live, bootparams)
+if rc == 0 and doreboot == "yes":
+    disable_firstboot()
+    if OVIRT_VARS["OVIRT_ISCSI_ENABLED"] != "y":
+        ovirt_store_firstboot_config()
+    reboot()
-- 
1.7.2.3



From jboggs at redhat.com  Tue Oct 26 18:24:43 2010
From: jboggs at redhat.com (Joey Boggs)
Date: Tue, 26 Oct 2010 14:24:43 -0400
Subject: [Ovirt-devel] [PATCH node] add collectd.py
Message-ID: <1288117483-5889-1-git-send-email-jboggs@redhat.com>

---
 scripts/collectd.py |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)
 create mode 100755 scripts/collectd.py

diff --git a/scripts/collectd.py b/scripts/collectd.py
new file mode 100755
index 0000000..729f3a9
--- /dev/null
+++ b/scripts/collectd.py
@@ -0,0 +1,40 @@
+#!/usr/bin/python
+#
+# Configures the collectd daemon.
+
+import os
+import sys
+from ovirtfunctions import *
+from subprocess import Popen, PIPE, STDOUT
+
+collectd_conf="/etc/collectd.conf"
+
+def ovirt_collectd(server, port):
+    if os.path.exists(collectd_conf + ".in"):
+        sed_cmd = "sed -e \"s/@COLLECTD_SERVER@/%s/\" \
+            -e \"s/@COLLECTD_PORT@/%s/\" %s.in \
+            > %s" % (server, port, collectd_conf, collectd_conf)
+        sed = subprocess.Popen(sed_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+        sed.poll()
+        rc = sed.returncode()
+        if rc != 0:
+            log("Failed to write $collectd_conf")
+            sys.exit(1)
+
+    os.system("chkconfig collectd on")
+    os.system("service collectd restart")
+
+# AUTO for auto-install
+if len(sys.argv) > 1:
+    if sys.argv[1] == "AUTO":
+        if not OVIRT_VARS.has_key("OVIRT_COLLECTD_SERVER") or not OVIRT_VARS.has_key["OVIRT_COLLECTD_PORT"]:
+            log("\nAttempting to locate remote collectd server...")
+            host, port = find_srv("collectd", "udp")
+            if not host is None and not port is None:
+                log("found! Using collectd server " + host + ":" + port)
+                ovirt_collectd(host, port)
+            else:
+                log("collectd server not found!\n")
+        else:
+            log("\nUsing default collectd server '$OVIRT_COLLECTD_SERVER:$OVIRT_COLLECTD_PORT'.\n")
+            ovirt_collectd(OVIRT_VARS["OVIRT_COLLECTD_SERVER"], OVIRT_VARS["OVIRT_COLLECTD_PORT"])
-- 
1.7.2.3



From jboggs at redhat.com  Tue Oct 26 19:07:59 2010
From: jboggs at redhat.com (Joey Boggs)
Date: Tue, 26 Oct 2010 15:07:59 -0400
Subject: [Ovirt-devel] [PATCH node] add more network and iscsi-initiator
	related functions to network.py
Message-ID: <1288120079-9229-1-git-send-email-jboggs@redhat.com>

---
 scripts/network.py |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/scripts/network.py b/scripts/network.py
index 28e32f2..97cefe7 100644
--- a/scripts/network.py
+++ b/scripts/network.py
@@ -191,6 +191,32 @@ class Network:
             if OVIRT_VARS.has_key("NTP"):
                 log("Testing NTP Configuration")
                 test_ntp_configuration()
+    def identify_nic(self, nic):
+        os.system("ethtool -p %s 10") % nic
+        return
+
+    def is_valid_hostname(self, hostname):
+        if re.search("^([a-zA-Z0-9.-]+)$", hostname):
+            return True
+
+    def set_hostname(self, hostname):
+        if is_valid_hostname(hostname) or hostname == "":
+            if hostname == "":
+                hostname = "localhost"
+            ret = os.system("hostname %s")
+            if ret == 0:
+                set_hostname = augeas.Augeas("root=/")
+                set_hostname.set("/files/etc/sysconfig/network/HOSTNAME", "%s") % hostname
+                set_hostname.save()
+
+    def set_iscsi_initiator(self, initiator_name):
+        iscsi_config = open(INITIATOR_FILE, "w")
+        iscsi_config.write("InitiatorName=" + INITIATOR_NAME)
+        if ovirt_store_config(INITIATOR_FILE):
+            log("Initiator name set as: " + INITIATOR_NAME)
+        else:
+            log("Setting initiator name failed\n")
+
 try:
     if "AUTO" in sys.argv[1]:
         if OVIRT_VARS.has_key("OVIRT_INIT"):
-- 
1.7.2.3



From jboggs at redhat.com  Tue Oct 26 20:44:30 2010
From: jboggs at redhat.com (Joey Boggs)
Date: Tue, 26 Oct 2010 16:44:30 -0400
Subject: [Ovirt-devel] [PATCH node] add logging.py
Message-ID: <1288125870-16507-1-git-send-email-jboggs@redhat.com>

Adds rsyslog configaration module

---
 scripts/logging.py |   89 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 89 insertions(+), 0 deletions(-)
 create mode 100755 scripts/logging.py

diff --git a/scripts/logging.py b/scripts/logging.py
new file mode 100755
index 0000000..6a32b7a
--- /dev/null
+++ b/scripts/logging.py
@@ -0,0 +1,89 @@
+#!/usr/bin/python
+#
+# Configures the rsyslog daemon.
+
+import os
+import sys
+from ovirtfunctions import *
+
+RSYSLOG_FILE="/etc/rsyslog.conf"
+
+RSYSLOG_CONFIG_TEMPLATE = """
+#ovirt rsyslog config file
+
+#### MODULES ####
+\$ModLoad imuxsock.so    # provides support for local system logging (e.g. via logger command)
+\$ModLoad imklog.so      # provides kernel logging support (previously done by rklogd)
+
+#### GLOBAL DIRECTIVES ####
+# Use default timestamp format
+\$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+#### RULES ####
+# Log anything (except mail) of level info or higher.
+# Don't log private authentication messages!
+*.info;mail.none;authpriv.none;cron.none                /var/log/messages
+
+# The authpriv file has restricted access.
+authpriv.*                                              /var/log/secure
+
+# Log all the mail messages in one place.
+mail.*                                                  -/var/log/maillog
+
+# Log cron stuff
+cron.*                                                  /var/log/cron
+
+# Everybody gets emergency messages
+*.emerg                                                 *
+
+# Save news errors of level crit and higher in a special file.
+uucp,news.crit                                          /var/log/spooler
+
+# Save boot messages also to boot.log
+local7.*                                                /var/log/boot.log
+
+\$WorkDirectory /var/spool/rsyslog
+\$ActionQueueFileName ovirtNode
+\$ActionQueueMaxDiskSpace 10m
+\$ActionQueueSaveOnShutdown on
+\$ActionQueueType LinkedList
+\$ActionResumeRetryCount -1
+*.* %(delim)s%(server)s:s(port)s
+"""
+
+
+def ovirt_rsyslog(server, port, protocol):
+    if protocol == "tcp":
+        DELIM="@@"
+    else:
+        DELIM="@"
+
+    rsyslog_dict = {
+        "delim" : DELIM,
+        "server" : server,
+        "port" : port
+    }
+    rsyslog_config_out = RSYSLOG_CONFIG_TEMPLATE % rsyslog_dict
+    rsyslog_config = open(RSYSLOG_FILE, "w")
+    rsyslog_config.write(rsyslog_config_out)
+    rsyslog_config.close()
+    os.system("/sbin/service rsyslog restart")
+
+if len(sys.argv) > 1:
+    try:
+        if sys.argv[1] == "AUTO":
+            if not OVIRT_VARS.has_key("OVIRT_SYSLOG_SERVER") or not OVIRT_VARS.has_key("OVIRT_SYSLOG_PORT"):
+                
+                log("\nAttempting to locate remote syslog server...")
+                host, port = find_srv("syslog", "udp")
+                if not host is None and not port is None:
+                    log("found! Using syslog server " + host + ":" + port) 
+                    ovirt_rsyslog(host, port, udp)
+                else:
+                    log("not found!\n")
+            else:
+                log("\nUsing default syslog server " + OVIRT_SYSLOG_SERVER + ":" + OVIRT_SYSLOG_PORT + ".\n")
+                ovirt_rsyslog(OVIRT_VARS["OVIRT_SYSLOG_SERVER"], OVIRT_VAR["OVIRT_SYSLOG_PORT"], udp)
+    except:
+        log("Error configuring rsyslog server")
+        sys.exit(1)
-- 
1.7.2.3



From jboggs at redhat.com  Wed Oct 27 01:44:30 2010
From: jboggs at redhat.com (Joey Boggs)
Date: Tue, 26 Oct 2010 21:44:30 -0400
Subject: [Ovirt-devel] [PATCH node] add password.py
Message-ID: <1288143870-6490-1-git-send-email-jboggs@redhat.com>

add module for ssh/password configuration
---
 scripts/password.py |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)
 create mode 100755 scripts/password.py

diff --git a/scripts/password.py b/scripts/password.py
new file mode 100755
index 0000000..bb8f3ee
--- /dev/null
+++ b/scripts/password.py
@@ -0,0 +1,34 @@
+import ovirtfunctions
+import libuser
+
+def cryptPassword(password):
+    saltlen = 2
+    algo = 'sha512'
+    saltlen = 16
+    saltstr = '$6$'
+    for i in range(saltlen):
+        saltstr = saltstr + random.choice (string.letters +
+                                           string.digits + './')
+    return crypt.crypt (password, saltstr)
+
+def set_root_password(password):
+    user = self.__admin.initUser(root)
+    passwd = cryptPassword()
+    unmount_config("/etc/shadow")
+    user.set(passwd, password)
+    ovirt_store_config("/etc/shadow")
+
+def check_ssh_password_auth(self):
+    password_auth_status = augeas.Augeas("root=/")
+    password_auth_status.get("/files/etc/ssh/sshd_config/PasswordAuthentication")
+    return password_auth_status
+
+def toggle_ssh_access(status):
+    ssh_config = augeas.Augeas("root=/")
+    ssh_config.set("/files/etc/ssh/sshd_config", status)
+    ssh_config.save()
+    ovirt_store_config("/etc/ssh/sshd_config")
+    os.system("service sshd reload")
+
+def set_sasl_password(user, password):
+    os.system("saslpasswd2 -a libvirt -p " + user)
-- 
1.7.2.3



From jboggs at redhat.com  Wed Oct 27 17:21:21 2010
From: jboggs at redhat.com (Joey Boggs)
Date: Wed, 27 Oct 2010 13:21:21 -0400
Subject: [Ovirt-devel] [PATCH node] add uninstall module
Message-ID: <1288200081-5395-1-git-send-email-jboggs@redhat.com>

---
 scripts/uninstall.py |   75 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 75 insertions(+), 0 deletions(-)
 create mode 100755 scripts/uninstall.py

diff --git a/scripts/uninstall.py b/scripts/uninstall.py
new file mode 100755
index 0000000..9e0baff
--- /dev/null
+++ b/scripts/uninstall.py
@@ -0,0 +1,75 @@
+#!/usr/bin/python
+#
+# uninstall.py - destroys an installed copy of the oVirt node
+
+# SYNOPSIS
+# Destroys the HostVG volume group and logical volumes.
+#
+import ovirtfunctions
+import subprocess
+from subprocess import STDOUT, PIPE
+
+def uninstall():
+    if os.path.isdir("/dev/HostVG"):
+        log("Uninstalling node")
+        log("Detaching logging")
+        # multipathd holds all mounts under /var in a private namespace
+        os.system("service multipathd stop")
+        os.system("rm -f /var/lib/multipath/bindings")
+        unmount_logging()
+        unmount_config("/etc/default/ovirt")
+        #get partition info
+        root2=""
+        rc = os.system("findfs LABEL=RootBackup 2>&1 >/dev/null")
+        if rc == 0:
+            root2 = "RootBackup"
+        rc = os.system("findfs LABEL=RootUpdate 2>&1 >/dev/null")
+        if rc == 0:
+            root2 = "RootUpdate"
+        rc = os.system("findfs LABEL=RootNew 2>&1 >/dev/null")
+        if rc == 0:
+            root2 = "RootNew"
+
+        root_label_lookup_cmd = "findfs LABEL=Root"
+        root_label_lookup = subprocess.Popen(root_label_lookup_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+        root_device = root_label_lookup.stdout.read()
+        if root_device is None:
+            log("Can't find Root device")
+            sys.exit(2)
+        root_dev, root_part = get_part_info(root_device) 
+
+        root2_label_lookup_cmd = "findfs LABEL=" + root2
+        root2_label_lookup = subprocess.Popen(root2_label_lookup_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+        root2_device = root2_label_lookup.stdout.read()
+        if root2_device is None:
+            log("Can't find RootBackup/RootNew/RootUpdate device")
+            sys.exit(3)
+        root2_dev, root2_part = get_part_info(root2_device)
+
+        pv_lookup_cmd = "pvs --noheadings -o pv_name,vg_name | grep HostVG | awk '{print $1}'"
+        pv_lookup = subprocess.Popen(pv_lookup_cmd, shell=True, stdout=PIPE, stderr=STDOUT)
+        pv_device = pv_lookup.stdout.read()
+        if pv_device is None:
+            log("Can't find HostVG device")
+            sys.exit(4)
+        pv_dev, pv_part = get_part_info(pv_device)
+
+        log("Removing volume group")
+        wipe_volume_group("HostVG")
+        log("Removing partitions")
+        os.system("parted -s " + root_dev + "\"rm " + root_part + "\"")
+        os.system("pvremove " + vg_dev)
+        os.system("parted -s " + root2_dev + "\"rm " + root2_part +"\"")
+        os.system("parted -s " + vg_dev + "\"rm " + vg_part + "\"")
+        wipe_partitions(pv_dev)
+        wipe_partitions(root_dev)
+        wipe_partitions(root2_dev)
+        #restart multipath
+        os.system("multipath -F")
+        os.system("multipath -v3")
+        os.system("service multipathd start")
+        log("Finished uninstalling node.")
+    else:
+	    log("There is no installed node instance to remove.")
+	    log("Aborting")
+	    sys.exit(1)
-- 
1.7.2.3