From apevec at gmail.com Sun Jul 3 22:44:02 2011 From: apevec at gmail.com (Alan Pevec) Date: Mon, 4 Jul 2011 00:44:02 +0200 Subject: [Ovirt-devel] Should we use "master" for development Message-ID: Hi all, I've just pushed v2.0.0 tag to the master branch, Fedora build and ISO is in the works and will be announced separately. But this occasion made me thinking about our 'next' branch and I'm not sure I like it any more: this used to be the place to do development of new features and master was supposed to be for stable release only. This made confusion for most of the people expecting to see new development in the default branch they get after checkout, master. I'd like to propose we drop 'next' branch and have only 'master' in the upstream repo and do development there, like in other projects e.g. libvirt.git What do you think? Alan -------------- next part -------------- An HTML attachment was scrubbed... URL: From pmyers at redhat.com Mon Jul 4 00:31:57 2011 From: pmyers at redhat.com (Perry Myers) Date: Sun, 03 Jul 2011 20:31:57 -0400 Subject: [Ovirt-devel] Should we use "master" for development In-Reply-To: References: Message-ID: <4E1109FD.10500@redhat.com> On 07/03/2011 06:44 PM, Alan Pevec wrote: > Hi all, > > I've just pushed v2.0.0 tag to the master branch, Fedora build and ISO > is in the works and will be announced separately. > But this occasion made me thinking about our 'next' branch and I'm not > sure I like it any more: this used to be the place to do development of > new features and master was supposed to be for stable release only. This > made confusion for most of the people expecting to see new development > in the default branch they get after checkout, master. > I'd like to propose we drop 'next' branch and have only 'master' in the > upstream repo and do development there, like in other projects e.g. > libvirt.git > What do you think? ack, go for it :) From andrew at beekhof.net Mon Jul 4 22:00:02 2011 From: andrew at beekhof.net (Andrew Beekhof) Date: Tue, 5 Jul 2011 08:00:02 +1000 Subject: [Ovirt-devel] Should we use "master" for development In-Reply-To: <4E1109FD.10500@redhat.com> References: <4E1109FD.10500@redhat.com> Message-ID: On Mon, Jul 4, 2011 at 10:31 AM, Perry Myers wrote: > On 07/03/2011 06:44 PM, Alan Pevec wrote: >> >> Hi all, >> >> I've just pushed v2.0.0 tag to the master branch, Fedora build and ISO >> is in the works and will be announced separately. >> But this occasion made me thinking about our 'next' branch and I'm not >> sure I like it any more: this used to be the place to do development of >> new features and master was supposed to be for stable release only. This >> made confusion for most of the people expecting to see new development >> in the default branch they get after checkout, master. >> I'd like to propose we drop 'next' branch and have only 'master' in the >> upstream repo and do development there, like in other projects e.g. >> libvirt.git >> What do you think? > > ack, go for it :) > I also think its a good idea. I'd also consider creating a 2.0 stable branch though. From apevec at gmail.com Mon Jul 4 22:53:51 2011 From: apevec at gmail.com (Alan Pevec) Date: Tue, 5 Jul 2011 00:53:51 +0200 Subject: [Ovirt-devel] Should we use "master" for development In-Reply-To: References: <4E1109FD.10500@redhat.com> Message-ID: On Tue, Jul 5, 2011 at 12:00 AM, Andrew Beekhof wrote: > I also think its a good idea. > ok, I've removed 'next' form node.git > I'd also consider creating a 2.0 stable branch though. > We'll do that when we have a long-term stable release, 2.0.0 is not the one. Plan is to push monthly releases from now on, and when we get the required features in, we'll create a stable branch. Alan -------------- next part -------------- An HTML attachment was scrubbed... URL: From mburns at redhat.com Thu Jul 14 11:58:54 2011 From: mburns at redhat.com (Mike Burns) Date: Thu, 14 Jul 2011 07:58:54 -0400 Subject: [Ovirt-devel] oVirt updates In-Reply-To: <1308148999.8144.108.camel@beelzebub.mburnsfire.net> References: <1308148999.8144.108.camel@beelzebub.mburnsfire.net> Message-ID: <1310644734.9648.1.camel@mburns-laptop.usersys.redhat.com> Just an update for everyone. We have pushed 2.0 to the fedorahosted git repos. We've encountered a few problems with Fedora 15 based isos that we're attempting to work out before we push an official release iso and tarball, but the git repo is updated and all work will be done on there going forward. Mike On Wed, 2011-06-15 at 10:43 -0400, Mike Burns wrote: > Hi everyone, > > It's been awhile since there have been any updates to the oVirt project > but that's going to be changing shortly. We've re-launched the > http://ovirt.org site and made a number of updates to the wiki. > Additional updates will be coming over the coming days and weeks. > > As for the projects themselves, we're changing the focus a little for > the overall oVirt project. > > ovirt-node > > * Version 2.0 will be coming in the next week or two > * New newt based UI for easier configuration > * Current Backlog/Roadmap: https://fedorahosted.org/ovirt/wiki/Backlog > > ovirt-server > > * There is no active development happening here at this time > * If you're interested in adopting the project, please lest us know on > the ovirt-devel at redhat.com mailing list > > > The oVirt Team > http://ovirt.org > IRC: #ovirt on oftc.net > ovirt-devel at redhat.com > > _______________________________________________ > Ovirt-devel mailing list > Ovirt-devel at redhat.com > https://www.redhat.com/mailman/listinfo/ovirt-devel From mburns at redhat.com Thu Jul 14 11:59:20 2011 From: mburns at redhat.com (Mike Burns) Date: Thu, 14 Jul 2011 07:59:20 -0400 Subject: [Ovirt-devel] [PATCH node] add adminpw command line option Message-ID: <1310644760-14935-1-git-send-email-mburns@redhat.com> Add the adminpw command line option to set the password for the admin user during autoinstall. The password will expire on first login and need to be reset. rhbz#708189 Signed-off-by: Mike Burns --- scripts/ovirt-early | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/scripts/ovirt-early b/scripts/ovirt-early index 732362f..250bb3f 100755 --- a/scripts/ovirt-early +++ b/scripts/ovirt-early @@ -254,6 +254,12 @@ start_ovirt_early () { # WARNING: use for debugging only, this is not secure! rootpw= + # adminpw= + # sets a temporary password for admin, change is forced on first login + # password is crypted, same as Kickstart option rootpw --iscrypted + # WARNING: use for debugging only, this is not secure! + adminpw= + # snmp_password= # enable snmpd and set password for "root" SNMPv3 USM user snmp_password= @@ -487,6 +493,9 @@ start_ovirt_early () { rescue) rescue=1 ;; + adminpw=*) + adminpw=${i#adminpw=} + ;; rootpw=*) rootpw=${i#rootpw=} ;; @@ -680,16 +689,20 @@ start_ovirt_early () { fi fi + if [ -n "$adminpw" ]; then + log "Setting temporary admin password: $adminpw" + unmount_config /etc/passwd /etc/shadow + /usr/sbin/usermod -p "$rootpw" admin + chage -d 0 admin + fi if [ -n "$rootpw" ]; then - log "Setting temporary root and admin password: $rootpw" + log "Setting temporary root password: $rootpw" unmount_config /etc/passwd /etc/shadow /usr/sbin/usermod -p "$rootpw" root - /usr/sbin/usermod -p "$rootpw" admin chage -d 0 root - chage -d 0 admin fi - # check if root password is expired, this might be upon reboot - # in case of automated installed with rootpw parameter! + # check if root or admin password is expired, this might be upon reboot + # in case of automated installed with rootpw or adminpw parameter! if LC_ALL=C chage -l root | grep -q "password must be changed" \ || LC_ALL=c chage -l admin | grep -q "password must be changed"; then unmount_config /etc/passwd /etc/shadow -- 1.7.4.4 From jboggs at redhat.com Fri Jul 15 18:44:46 2011 From: jboggs at redhat.com (Joey Boggs) Date: Fri, 15 Jul 2011 14:44:46 -0400 Subject: [Ovirt-devel] [PATCH] update kernel dump page title Message-ID: <1310755486-11090-1-git-send-email-jboggs@redhat.com> Signed-off-by: Joey Boggs --- scripts/ovirt-config-setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/ovirt-config-setup.py b/scripts/ovirt-config-setup.py index 49e53cc..d55ea36 100755 --- a/scripts/ovirt-config-setup.py +++ b/scripts/ovirt-config-setup.py @@ -995,7 +995,7 @@ class NodeConfigScreen(): grid] def kdump_configuration_page(self, screen): elements = Grid(2, 12) - elements.setField(Label("Kernel Configuration"), 0, 0, anchorLeft = 1) + elements.setField(Label("Kernel Dump"), 0, 0, anchorLeft = 1) if not network_up(): elements.setField(Label(" * Network Down, Configuration Disabled * "), 0, 1, anchorLeft = 1) else: -- 1.7.5.4 From jboggs at redhat.com Mon Jul 18 17:19:22 2011 From: jboggs at redhat.com (Joey Boggs) Date: Mon, 18 Jul 2011 13:19:22 -0400 Subject: [Ovirt-devel] [PATCH node] fix ipv6 support in dns/ntp callbacks Message-ID: <1311009562-10465-1-git-send-email-jboggs@redhat.com> Signed-off-by: Joey Boggs --- scripts/ovirt-config-setup.py | 42 +++++++++++++++++++++++++++++++++++----- 1 files changed, 36 insertions(+), 6 deletions(-) diff --git a/scripts/ovirt-config-setup.py b/scripts/ovirt-config-setup.py index d55ea36..753c80d 100755 --- a/scripts/ovirt-config-setup.py +++ b/scripts/ovirt-config-setup.py @@ -231,7 +231,8 @@ class NodeConfigScreen(): warn = 0 if not self.dns_host1.value() is None and not self.dns_host1.value() == "": if not is_valid_ipv4(self.dns_host1.value()): - warn = 1 + if not is_valid_ipv6(self.dns_host1.value()): + warn = 1 if warn == 1: self.screen.setColor("BUTTON", "black", "red") self.screen.setColor("ACTBUTTON", "blue", "white") @@ -244,7 +245,8 @@ class NodeConfigScreen(): warn = 0 if not self.dns_host2.value() is None and not self.dns_host2.value() == "": if not is_valid_ipv4(self.dns_host2.value()): - warn = 1 + if not is_valid_ipv6(self.dns_host1.value()): + warn = 1 if warn == 1: self.screen.setColor("BUTTON", "black", "red") self.screen.setColor("ACTBUTTON", "blue", "white") @@ -253,6 +255,34 @@ class NodeConfigScreen(): self.reset_screen_colors() return + def ntp_host1_callback(self): + warn = 0 + if not self.ntp_host1.value() is None and not self.ntp_host1.value() == "": + if not is_valid_ipv4(self.ntp_host1.value()): + if not is_valid_ipv6(self.ntp_host1.value()): + warn = 1 + if warn == 1: + self.screen.setColor("BUTTON", "black", "red") + self.screen.setColor("ACTBUTTON", "blue", "white") + ButtonChoiceWindow(self.screen, "Network", "Invalid IP Address", buttons = ['Ok']) + self.ntp_host1.set("") + self.reset_screen_colors() + return + + def ntp_host2_callback(self): + warn = 0 + if not self.ntp_host2.value() is None and not self.ntp_host2.value() == "": + if not is_valid_ipv4(self.ntp_host2.value()): + if not is_valid_ipv6(self.ntp_host1.value()): + warn = 1 + if warn == 1: + self.screen.setColor("BUTTON", "black", "red") + self.screen.setColor("ACTBUTTON", "blue", "white") + ButtonChoiceWindow(self.screen, "Network", "Invalid IP Address", buttons = ['Ok']) + self.ntp_host2.set("") + self.reset_screen_colors() + return + def ipv4_ip_callback(self): warn = 0 if not self.ipv4_netdevip.value() is None and not self.ipv4_netdevip.value() == "": @@ -708,16 +738,16 @@ class NodeConfigScreen(): dns_grid.setField(Label("DNS Server 2: "), 0, 1, anchorLeft = 1) dns_grid.setField(self.dns_host1, 1, 0, anchorLeft = 1) dns_grid.setField(self.dns_host2, 1, 1, anchorLeft = 1) - self.dns_host1.setCallback(self.valid_fqdn_or_ipv4) - self.dns_host2.setCallback(self.valid_fqdn_or_ipv4) grid.setField(Label(" "), 0, 4) grid.setField(dns_grid, 0, 6, anchorLeft =1) grid.setField(Label(" "), 0, 7) ntp_grid = Grid(2,2) self.ntp_host1 = Entry(25) - self.ntp_host1.setCallback(self.valid_fqdn_or_ipv4) + self.ntp_host1.setCallback(self.ntp_host1_callback) + self.ntp_host2 = Entry(25) - self.ntp_host2.setCallback(self.valid_fqdn_or_ipv4) + self.ntp_host2.setCallback(self.ntp_host2_callback) + self.current_ntp_host1 = augtool_get("/files/etc/ntp.conf/server[1]") if self.current_ntp_host1: self.ntp_host1.set(self.current_ntp_host1) -- 1.7.5.4 From jboggs at redhat.com Mon Jul 18 19:42:53 2011 From: jboggs at redhat.com (Joey Boggs) Date: Mon, 18 Jul 2011 15:42:53 -0400 Subject: [Ovirt-devel] [PATCH] fix ipv6 switch to disabled Message-ID: <1311018173-21709-1-git-send-email-jboggs@redhat.com> Signed-off-by: Joey Boggs --- scripts/network.py | 8 ++++++-- scripts/ovirt-config-setup.py | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/scripts/network.py b/scripts/network.py index fd78877..8159283 100644 --- a/scripts/network.py +++ b/scripts/network.py @@ -78,7 +78,6 @@ class Network: self.BR_CONFIG += "set %s/TYPE Bridge\n" % BR_ROOT self.BR_CONFIG += "set %s/PEERNTP yes\n" % BR_ROOT self.BR_CONFIG += "set %s/DELAY 0\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 @@ -89,11 +88,16 @@ class Network: 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: + elif OVIRT_VARS["OVIRT_IPV6"] == "static": self.BR_CONFIG += "set %s/IPV6INIT yes\n" % BR_ROOT self.BR_CONFIG += "set %s/IPV6ADDR %s\n" % (BR_ROOT, OVIRT_VARS["OVIRT_IPV6_ADDRESS"]) self.BR_CONFIG += "set %s/IPV6_AUTOCONF no\n" % BR_ROOT self.BR_CONFIG += "set %s/IPV6FORWARDING no\n" % BR_ROOT + else: + self.BR_CONFIG += "set %s/IPV6INIT no\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"] diff --git a/scripts/ovirt-config-setup.py b/scripts/ovirt-config-setup.py index 753c80d..6ac09dc 100755 --- a/scripts/ovirt-config-setup.py +++ b/scripts/ovirt-config-setup.py @@ -1144,6 +1144,11 @@ class NodeConfigScreen(): augtool("rm", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IP_ADDRESS", "") augtool("rm", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IP_NETMASK", "") augtool("rm", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IP_GATEWAY", "") + augtool("rm", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IPV6" ,"") + augtool("rm", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IPV6_ADDRESS", "") + augtool("rm", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IPV6_NETMASK", "") + augtool("rm", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IPV6_GATEWAY", "") + msg = "" if self.static_ipv4_nic_proto.value() == 1: if self.ipv4_netdevip.value() == "": @@ -1178,6 +1183,15 @@ class NodeConfigScreen(): del OVIRT_VARS["OVIRT_IP_NETMASK"] if OVIRT_VARS.has_key("OVIRT_IP_GATEWAY"): del OVIRT_VARS["OVIRT_IP_GATEWAY"] + if OVIRT_VARS.has_key("OVIRT_IPV6"): + del OVIRT_VARS["OVIRT_IPV6"] + if OVIRT_VARS.has_key("OVIRT_ADDRESS"): + del OVIRT_VARS["OVIRT_IPV6_ADDRESS"] + if OVIRT_VARS.has_key("OVIRT_IPV6_NETMASK"): + del OVIRT_VARS["OVIRT_IPV6_NETMASK"] + if OVIRT_VARS.has_key("OVIRT_IPV6_GATEWAY"): + del OVIRT_VARS["OVIRT_IPV6_GATEWAY"] + if self.netvlanid.value() != "": augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_VLAN", '"' + self.netvlanid.value() + '"') if self.dhcp_ipv6_nic_proto.value() == 1: @@ -1192,6 +1206,7 @@ class NodeConfigScreen(): augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IPV6_NETMASK", '"' + self.ipv6_netdevmask.value() + '"') if self.ipv6_netdevgateway.value(): augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IPV6_GATEWAY", '"' + self.ipv6_netdevgateway.value() + '"') + self.screen = SnackScreen() # apply any colorsets that were provided. for item in self.__colorset.keys(): -- 1.7.5.4 From halves at linux.vnet.ibm.com Mon Jul 18 20:44:36 2011 From: halves at linux.vnet.ibm.com (Higor Aparecido Vieira Alves) Date: Mon, 18 Jul 2011 17:44:36 -0300 Subject: [Ovirt-devel] Hook script to preserve one partition untouched during install In-Reply-To: <1306326542.3585.3.camel@halves.br.ibm.com> References: <1306326542.3585.3.camel@halves.br.ibm.com> Message-ID: <1311021876.7592.16.camel@halves.br.ibm.com> New version of hook script to preserve one partition untouched during install. Changelog: - Can ignore multiple partitions (up to 9) ignore_vol=sda:2;3;4 - New boot parameter, data2_size to set Data2 Size (in MB) data2_size=15000 - Will handle Data2 Logical Volume only instead Data2 and Backup LVs - Set partition type do LVM (partitions used in Data2 LV) #!/bin/bash #VERSION: 0.13 LOG_FILE="/var/log/partition.log" RETURN="" CMDLINE="/proc/cmdline" VG_NAME="AppVG" LV_DATA2="Data2" # Write log messages in /var/log/partition # Parameters: # - MSG: Log message log() { local MSG=$1 echo "$MSG" >> $LOG_FILE } # Scan a hard disk to find all available partitions to create # AppVG Volume Group. # Parameter: # - DISK: hard disk to be analized (example, sdb) # - PARTITION: partition number to be preserved (example, 1) # Return: # - ARRAY_PV: array with partitions available disk_scan() { local DISK=$1 local PART=$2 local DM='' local DM_NAME='' local PATTERN='' local ARRAY='' local REGEX='' local DIR='' local DEVICE='' local NEW_DEVICE='' RETURN='' if [ -z "$DISK" -o -z "$PART" ]; then log "ERROR: $FUNCTION missing parameter" return 1 fi if [ ! -e "/dev/$DISK" ]; then log "ERROR: $DISK not found" return 1 fi DEVICE=$(echo "$PART" | sed 's/;//g') REGEX=".*[a-z][^$DEVICE]$" log "Change the partition type for LVM (8e) in AppVG partitions" PATTERN="$DISK?" DIR="/dev/" ARRAY=( $(find "$DIR" -type b -name "$PATTERN" -regex "$REGEX") ) for DEVICE in ${ARRAY[*]}; do if $(fdisk -l /dev/$DISK | grep -q ".*$DEVICE.*83.*"); then parted /dev/$DISK set ${DEVICE:8} lvm on sleep 10 fi done DM=$(ls /sys/block/$DISK/holders/) if [ -n "$DM" ]; then log "Found a device mapper assigned to $DISK" if grep -q "0QEMU" /sys/block/${DM[0]}/dm/name; then # Remove extra white spaces from device holder name and # change it for "_" log "Using QEMU disks" log "Removing white spaces from device mapper name" DM_NAME=$(cat /sys/block/${DM[0]}/dm/name | sed -e 's/[ ]\ +/ /g' -e 's/ /_/g') OLD_IFS="$IFS" IFS=" " # Create symbolic links whithout white spaces for QEMU disks log "Creating symbolic links without white speaces to QEMU disks" for DEVICE in $(ls /dev/mapper/0QEMU*); do NEW_DEVICE=$(echo $DEVICE | sed -e 's/[ ]\+/ /g' -e 's/ /_/g') ls -s "${DEVICE}" $NEW_DEVICE done IFS="$OLD_IFS" else DM_NAME=$(cat /sys/block/${DM[0]}/dm/name) fi PATTERN="*${DM_NAME}p*" DIR="/dev/disk/by-id/" RETURN=( $(find $DIR -type l -name "$PATTERN" -regex "$REGEX") ) if [ ${#RETURN[*]} -ne 0 ]; then return 0 fi log "Error: Can not find $DISK partitions in /dev/disk/by-id" log "Looking in /dev/mapper" DIR="/dev/mapper" RETURN=( $(find $DIR -type l -name "$PATTERN" -regex "$REGEX") ) if [ ${#RETURN[*]} -eq 0 ]; then log "Error: Can not identify partitions available for $DISK" return 1 fi else PATTERN="$DISK?" DIR="/dev/" RETURN=( $(find "$DIR" -type b -name "$PATTERN" -regex "$REGEX") ) if [ $? -ne 0 ]; then log "ERROR: Can not identify partitions available in $DISK/$DM_NAME" return 1 fi fi return 0 } main() { local DEVICE='' local IGNORE_VOL='' local VG='' local PV='' local ARRAY_PV='' local OUTPUT='' local DISK'' local PART='' local DATA2_SIZE='' local LV_DATA2_SIZE='' if grep -q "firstboot" $CMDLINE && grep -q "ignore_vol" $CMDLINE; then IGNORE_VOL=$(cat $CMDLINE | sed 's/^.*ignore_vol=//' | awk '{print $1}') else log "Parameters firstboot or ignore_vol not found in $CMDLINE. Aborting" return 1 fi DISK=`echo $IGNORE_VOL | sed -e 's/^\/dev\///' -e 's/:.*$//'\ -e 's/[[:digit:]].*$//'` PART=$(echo $IGNORE_VOL | sed -e 's/^.*://' -e 's/^.*[[:lower:]]//') if grep -q "data2_size" $CMDLINE; then DATA2_SIZE=$(cat $CMDLINE | sed 's/^.*data2_size=//' | awk '{print $1}') LV_DATA2_SIZE="-L ${DATA2_SIZE}M" else LV_DATA2_SIZE="-L 290000M" fi if ! disk_scan $DISK $PART; then log "ERROR: Can not scan $DISK" return 1 fi ARRAY_PV=${RETURN[*]} if [ ${#ARRAY_PV[*]} -eq 0 ]; then log "ERROR: Partitions not found, verify your disk." return 1 fi for PV in ${ARRAY_PV[*]}; do # Looking if partition has a PV pvs --noheadings "$PV" if [ $? -eq 0 ]; then log "Physical Volume found in $PV" # Looking if PV has a Volume Group OUTPUT=( $(pvs --noheadings -o vg_name "$PV") ) if [ ${#OUTPUT[*]} -gt 0 ]; then log "PV $PV has a Volume Group" VG=${OUTPUT[0]} # Looking if Volume Group has Logical Volumes OUTPUT=( $(lvs --noheadings -o lv_name "$VG") ) if [ ${#OUTPUT[*]} -gt 0 ]; then log "$VG has Logical Volumes: ${OUTPUT[*]}" log "Removing Logical Volumes" lvremove -ff "$VG" if [ $? -ne 0 ]; then log "Error: Can not remove Logical Volumes" return 1 fi fi log "Removing Volume Group $VG" vgremove -ff "$VG" if [ $? -ne 0 ]; then log "Error: Can not remove Volume Group" return 1 fi fi else log "Creating Physical Volume on $PV" pvcreate "$PV" if [ $? -ne 0 ]; then log "Error: Can not create Physical Volume" return 1 fi fi done log "Creating $VG Volume Group using ${ARRAY_PV[*]}" vgcreate "$VG_NAME" ${ARRAY_PV[*]} if [ $? -ne 0 ]; then log "Error: Can not create Volume Group" return 1 fi log "Creating Logical Volume $LV_DATA2" lvcreate ${LV_DATA2_SIZE} -n ${LV_DATA2} ${VG_NAME} if [ $? -ne 0 ]; then log "Error: Can not create Logical Volume" return 1 fi log "Formating Logical Volume $LV_DATA2" DEVICE="/dev/${VG_NAME}/${LV_DATA2}" mkfs -t ext4 $DEVICE if [ $? -ne 0 ]; then log "Error: Can not format Logical Volume" return 1 fi if ! grep -q "$DEVICE" /etc/fstab; then log "Automounting $DEVICE..." echo "$DEVICE /data2 ext4 defaults,noatime 0 0" >> /etc/fstab fi } main exit $? From pmyers at redhat.com Tue Jul 19 02:04:52 2011 From: pmyers at redhat.com (Perry Myers) Date: Mon, 18 Jul 2011 22:04:52 -0400 Subject: [Ovirt-devel] Feature Backlog updated Message-ID: <4E24E644.3040708@redhat.com> Trying to capture some of the features we have in-flight for oVirt Node and stuff we'd like to work on in the near future. https://fedorahosted.org/ovirt/wiki/Backlog Comments, additions, questions (and patches!) welcome :) Perry From jboggs at redhat.com Wed Jul 20 20:20:47 2011 From: jboggs at redhat.com (Joey Boggs) Date: Wed, 20 Jul 2011 16:20:47 -0400 Subject: [Ovirt-devel] [PATCH] fix ipv4 static/dhcp/disabled networking changes Message-ID: <1311193247-3146-1-git-send-email-jboggs@redhat.com> This fixes networking changes when switching from dhcp/static to disabled. Before the ifcfg scripts would contain old values from the previous configuration. Support for disabled devices is now added and some useless remnant bash->python coding cleaned up --- scripts/network.py | 45 +++++++++++++++++++--------------------- scripts/ovirt-config-setup.py | 34 +++++++++++++++++------------- scripts/ovirtfunctions.py | 2 +- 3 files changed, 41 insertions(+), 40 deletions(-) diff --git a/scripts/network.py b/scripts/network.py index 8159283..8956d00 100644 --- a/scripts/network.py +++ b/scripts/network.py @@ -42,27 +42,21 @@ class Network: def configure_interface(self): log("Configuring Interface") + self.disabled_nic = 0 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"] - 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") - for file in os.listdir("/etc/sysconfig/network-scripts/"): - if "ifcfg-" in file: - remove_config("/etc/sysconfig/network-scripts/" + file) - os.system("rm -rf /etc/sysconfig/network-scripts/ifcfg-* &>/dev/null") - os.system("cp -a /etc/sysconfig/network-scripts/backup.lo /etc/sysconfig/network-scripts/ifcfg-lo") - else: + if self.CONFIGURED_NIC is None: log("\nAborting...\n") return False - for file in os.listdir(self.WORKDIR): - os.system("rm -rf %s/%s") % (self.WORKDIR, file) + if OVIRT_VARS.has_key("OVIRT_BOOTIF"): + if OVIRT_VARS["OVIRT_BOOTIF"].endswith("-DISABLED"): + self.disabled_nic = 1 + self.CONFIGURED_NIC = OVIRT_VARS["OVIRT_BOOTIF"].strip("-DISABLED") + n_address = open("/sys/class/net/" + self.CONFIGURED_NIC + "/address") nic_hwaddr = n_address.readline().strip("\n") n_address.close() @@ -112,10 +106,14 @@ class Network: 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_BOOTIF") and self.disabled_nic == 0: + 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 + elif self.disabled_nic == 1: + self.BR_CONFIG += "set %s/BOOTPROTO none\n" % BR_ROOT + + elif OVIRT_VARS.has_key("OVIRT_IP_ADDRESS"): if OVIRT_VARS.has_key("OVIRT_IP_ADDRESS") and OVIRT_VARS["OVIRT_IP_ADDRESS"] != "off": self.BR_CONFIG += "set %s/BOOTPROTO static\n" % (BR_ROOT) if self.VL_CONFIG == "": @@ -134,7 +132,6 @@ class Network: self.VL_CONFIG = self_VL_CONFIG.split("\n") except: pass - log("VL_CONFIG: " + self.VL_CONFIG) return True def configure_dns(self): @@ -194,13 +191,12 @@ class Network: # 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) + for script in os.listdir("/etc/sysconfig/network-scripts/"): + if self.CONFIGURED_NIC in script: + log("Removing Script: " + script) + ovirt_safe_delete_config("/etc/sysconfig/network-scripts/" + script) + augtool("rm", "/files/etc/sysconfig/network-scripts/ifcfg-br"+self.CONFIGURED_NIC, "") - config = self.WORKDIR + "/config-augtool" - for line in self.IF_CONFIG: log(line) try: @@ -209,6 +205,7 @@ class Network: except: oper, file = line.split() augtool(oper, line, "") + for line in self.BR_CONFIG: log(line) try: diff --git a/scripts/ovirt-config-setup.py b/scripts/ovirt-config-setup.py index 6ac09dc..582fad1 100755 --- a/scripts/ovirt-config-setup.py +++ b/scripts/ovirt-config-setup.py @@ -1140,7 +1140,10 @@ class NodeConfigScreen(): def process_nic_config(self): augtool("rm", "/files/" + OVIRT_DEFAULTS + "/OVIRT_BOOTIF", "") - augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_BOOTIF", '"' + self.nic_lb.current() + '"') + if self.disabled_ipv4_nic_proto.value() == 1: + augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_BOOTIF", '"' + self.nic_lb.current() + '-DISABLED"') + else: + augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_BOOTIF", '"' + self.nic_lb.current() + '"') augtool("rm", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IP_ADDRESS", "") augtool("rm", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IP_NETMASK", "") augtool("rm", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IP_GATEWAY", "") @@ -1155,26 +1158,27 @@ class NodeConfigScreen(): msg = " - IPv4 Address\n" if self.ipv4_netdevmask.value() == "": msg += " - IPv4 Netmask Address\n" - if self.ipv6_netdevip.value() == "": - msg = " - IPv6 Address\n" + if self.ipv4_netdevgateway.value() == "": + msg = " - IPv4 Gateway Address\n" + augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IP_ADDRESS", '"' + self.ipv4_netdevip.value() + '"') + augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IP_NETMASK", '"' + self.ipv4_netdevmask.value() + '"') + augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IP_GATEWAY", '"' + self.ipv4_netdevgateway.value() + '"') + if self.static_ipv6_nic_proto.value() == 1: if self.ipv6_netdevmask.value() == "": msg += " - IPv6 Netmask Address\n" if self.ipv6_netdevgateway.value() == "": msg += " - IPv6 Gateway Address\n" # left out gateway check to prevent multiple ones - if msg != "": - msg = "Please Input:\n" + msg - warn = ButtonChoiceWindow(self.screen, "Network Settings", msg, buttons = ['Ok']) - self.__nic_config_failed = 1 - self.ipv4_current_netdevip = self.ipv4_netdevip.value() - self.ipv4_current_netdevmask = self.ipv4_netdevmask.value() - self.ipv4_current_netdevgateway = self.ipv4_netdevgateway.value() - self.reset_screen_colors() - return - augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IP_ADDRESS", '"' + self.ipv4_netdevip.value() + '"') - augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IP_NETMASK", '"' + self.ipv4_netdevmask.value() + '"') - augtool("set", "/files/" + OVIRT_DEFAULTS + "/OVIRT_IP_GATEWAY", '"' + self.ipv4_netdevgateway.value() + '"') + if msg != "": + msg = "Please Input:\n" + msg + warn = ButtonChoiceWindow(self.screen, "Network Settings", msg, buttons = ['Ok']) + self.__nic_config_failed = 1 + self.ipv4_current_netdevip = self.ipv4_netdevip.value() + self.ipv4_current_netdevmask = self.ipv4_netdevmask.value() + self.ipv4_current_netdevgateway = self.ipv4_netdevgateway.value() + self.reset_screen_colors() + return else: # if exists remove static keys from dictionary if OVIRT_VARS.has_key("OVIRT_IP_ADDRESS"): diff --git a/scripts/ovirtfunctions.py b/scripts/ovirtfunctions.py index 37aabe7..cdf4b56 100644 --- a/scripts/ovirtfunctions.py +++ b/scripts/ovirtfunctions.py @@ -604,7 +604,7 @@ def remove_config(files): if os.path.exists("/config/files"): if os.path.getsize('/config/files') == 0: print "There are currently no persisted files." - return True + return True if os.path.ismount("/config"): if isinstance(files,STRING_TYPE): files_list = [] -- 1.7.5.4 From jboggs at redhat.com Wed Jul 20 20:25:24 2011 From: jboggs at redhat.com (Joey Boggs) Date: Wed, 20 Jul 2011 16:25:24 -0400 Subject: [Ovirt-devel] [PATCH] align title with left menu bar Message-ID: <1311193524-3569-1-git-send-email-jboggs@redhat.com> --- scripts/ovirt-config-setup.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ovirt-config-setup.py b/scripts/ovirt-config-setup.py index 582fad1..bb6146a 100755 --- a/scripts/ovirt-config-setup.py +++ b/scripts/ovirt-config-setup.py @@ -1378,8 +1378,8 @@ class NodeConfigScreen(): gridform = GridForm(screen, "", 2, 1) # 5,2 PRODUCT_TITLE = "%s %s-%s" % (PRODUCT_SHORT, PRODUCT_VERSION, PRODUCT_RELEASE) screen.drawRootText(1,0, "".ljust(78)) - screen.drawRootText(1,1, " %s" % PRODUCT_TITLE.ljust(75)) - screen.drawRootText(1,2, " %s" % os.uname()[1].ljust(75)) + screen.drawRootText(1,1, " %s" % PRODUCT_TITLE.ljust(75)) + screen.drawRootText(1,2, " %s" % os.uname()[1].ljust(75)) content = Grid(1, len(elements) + 3) self.menuo = 1 self.menu_list = Listbox(16, width = 20, returnExit = 1, border = 0, showCursor = 0) -- 1.7.5.4 From jboggs at redhat.com Wed Jul 20 21:07:36 2011 From: jboggs at redhat.com (Joey Boggs) Date: Wed, 20 Jul 2011 17:07:36 -0400 Subject: [Ovirt-devel] [PATCH] change restart button label to reboot Message-ID: <1311196056-7003-1-git-send-email-jboggs@redhat.com> Signed-off-by: Joey Boggs --- scripts/ovirt-config-installer.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/ovirt-config-installer.py b/scripts/ovirt-config-installer.py index 46b917b..1dba72a 100644 --- a/scripts/ovirt-config-installer.py +++ b/scripts/ovirt-config-installer.py @@ -35,7 +35,7 @@ BACK_BUTTON = "Back" NEXT_BUTTON = "Next" FINISH_BUTTON = "Finish" INSTALL_BUTTON = "Install" -RESTART_BUTTON = "Restart" +REBOOT_BUTTON = "Reboot" POWEROFF_BUTTON = "Power Off" CONTINUE_BUTTON = "Continue" SHELL_BUTTON = "Drop To Shell" @@ -700,7 +700,7 @@ class NodeInstallScreen: current_element += 1 buttons = [] if self.__current_page == FINISHED_PAGE: - buttons.append(["Restart", RESTART_BUTTON]) + buttons.append(["Reboot", REBOOT_BUTTON]) if self.__current_page != FINISHED_PAGE: buttons.append(["Quit", QUIT_BUTTON]) if self.__current_page != WELCOME_PAGE and self.__current_page != FAILED_PAGE and self.__current_page != FINISHED_PAGE: @@ -712,7 +712,7 @@ class NodeInstallScreen: if self.__current_page == PASSWORD_PAGE: buttons.append(["Install", INSTALL_BUTTON]) if self.__current_page == FAILED_PAGE: - buttons.append(["Restart", RESTART_BUTTON]) + buttons.append(["Reboot", REBOOT_BUTTON]) buttons.append(["Power Off", POWEROFF_BUTTON]) buttonbar = ButtonBar(screen, buttons, compact = 1) buttongrid = Grid(1,1) @@ -744,12 +744,12 @@ class NodeInstallScreen: os.system("/usr/bin/clear;/bin/bash") elif pressed == QUIT_BUTTON: abort = ButtonChoiceWindow(self.screen, "Abort Installation","The installation of %s is not complete." % - PRODUCT_SHORT, buttons = ['Back','Restart','Shutdown']) - if abort == "restart": + PRODUCT_SHORT, buttons = ['Back','Reboot','Shutdown']) + if abort == "reboot": os.system("/usr/bin/clear;reboot") elif abort == "shutdown": os.system("/usr/bin/clear;halt") - elif pressed == RESTART_BUTTON: + elif pressed == REBOOT_BUTTON: screen.finish() os.system("/usr/bin/clear;/sbin/reboot") elif pressed == POWEROFF_BUTTON: -- 1.7.5.4 From jboggs at redhat.com Thu Jul 21 13:47:01 2011 From: jboggs at redhat.com (Joey Boggs) Date: Thu, 21 Jul 2011 09:47:01 -0400 Subject: [Ovirt-devel] [PATCH] mount kernel debugfs on boot Message-ID: <1311256021-20907-1-git-send-email-jboggs@redhat.com> Signed-off-by: Joey Boggs --- recipe/common-post.ks | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/recipe/common-post.ks b/recipe/common-post.ks index 503fc9c..4665ae8 100644 --- a/recipe/common-post.ks +++ b/recipe/common-post.ks @@ -211,3 +211,6 @@ python -m compileall /usr/lib/python2.*/site-packages/sos sed -i "s/defaults,noatime/defaults,ro,noatime/g" /etc/fstab echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config + +#mount kernel debugfs +echo "debugfs /sys/kernel/debug debugfs 0 0" >> /etc/fstab -- 1.7.5.4 From jboggs at redhat.com Thu Jul 21 13:57:10 2011 From: jboggs at redhat.com (Joey Boggs) Date: Thu, 21 Jul 2011 09:57:10 -0400 Subject: [Ovirt-devel] [PATCH] persist resolv.conf after changing dns servers Message-ID: <1311256630-21714-1-git-send-email-jboggs@redhat.com> Signed-off-by: Joey Boggs --- scripts/network.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/network.py b/scripts/network.py index 8956d00..39c0b3a 100644 --- a/scripts/network.py +++ b/scripts/network.py @@ -144,6 +144,7 @@ class Network: augtool("set", "/files/etc/resolv.conf/nameserver[1]", DNS1) if not DNS2 is None: augtool("set", "/files/etc/resolv.conf/nameserver[2]", DNS2) + ovirt_store_config("/etc/resolv.conf") except: log("Failed to set DNS servers") -- 1.7.5.4 From jboggs at redhat.com Thu Jul 21 19:15:26 2011 From: jboggs at redhat.com (Joey Boggs) Date: Thu, 21 Jul 2011 15:15:26 -0400 Subject: [Ovirt-devel] [PATCH] add netconsole autoinstall parameter Message-ID: <1311275726-13745-1-git-send-email-jboggs@redhat.com> Signed-off-by: Joey Boggs --- scripts/ovirt-config-logging | 11 +++++++++++ scripts/ovirt-early | 6 +++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/scripts/ovirt-config-logging b/scripts/ovirt-config-logging index 233df67..e296ac4 100755 --- a/scripts/ovirt-config-logging +++ b/scripts/ovirt-config-logging @@ -174,6 +174,13 @@ function prompt_user { done } +function ovirt_netconsole { + augtool < Hello, I've created a draft for Ovirt Node validation matrix: https://fedoraproject.org/wiki/User:Athmane/Draft_Ovirt_Node_validation_matrix Tomorrow I'll create collectd test case, also I would ask if there's a pre-built iso for testing (I need it to ensure that nothing is wrong with test matrix) otherwise I'll try to compose it. Thanks. -- Athmane Madjoudj From apevec at gmail.com Fri Jul 22 08:23:09 2011 From: apevec at gmail.com (Alan Pevec) Date: Fri, 22 Jul 2011 10:23:09 +0200 Subject: [Ovirt-devel] Draft / Ovirt Node validation matrix In-Reply-To: <4E28CB93.8010500@fedoraproject.org> References: <4E28CB93.8010500@fedoraproject.org> Message-ID: On Fri, Jul 22, 2011 at 3:00 AM, Athmane Madjoudj wrote: > I've created a draft for Ovirt Node validation matrix: > > https://fedoraproject.org/wiki/User:Athmane/Draft_Ovirt_Node_validation_matrix Thanks! > Tomorrow I'll create collectd test case, also I would ask if there's a > pre-built iso for testing (I need it to ensure that nothing is wrong with > test matrix) otherwise I'll try to compose it. Current ISO has some issues, I plan to push ovirt-node update to Rawhide today, and we're also waiting for virt-manager-tui to land in Rawhide (current builds are --without-tui). Alan From jboggs at redhat.com Fri Jul 22 14:03:25 2011 From: jboggs at redhat.com (Joey Boggs) Date: Fri, 22 Jul 2011 10:03:25 -0400 Subject: [Ovirt-devel] Draft / Ovirt Node validation matrix In-Reply-To: References: <4E28CB93.8010500@fedoraproject.org> Message-ID: <4E29832D.7060500@redhat.com> On 07/22/2011 04:23 AM, Alan Pevec wrote: > On Fri, Jul 22, 2011 at 3:00 AM, Athmane Madjoudj > wrote: >> I've created a draft for Ovirt Node validation matrix: >> >> https://fedoraproject.org/wiki/User:Athmane/Draft_Ovirt_Node_validation_matrix > Thanks! > >> Tomorrow I'll create collectd test case, also I would ask if there's a >> pre-built iso for testing (I need it to ensure that nothing is wrong with >> test matrix) otherwise I'll try to compose it. > Current ISO has some issues, I plan to push ovirt-node update to > Rawhide today, and we're also waiting for virt-manager-tui to land in > Rawhide (current builds are --without-tui). > > Alan > > _______________________________________________ > Ovirt-devel mailing list > Ovirt-devel at redhat.com > https://www.redhat.com/mailman/listinfo/ovirt-devel Pushed a Fedora 15 based autobuild out to my fedorapeople page: http://fedorapeople.org/~jboggs/ovirt-node-image.iso for poking around for the matrix. Once booted up press f2 to reach a shell for anything you need to do manually. The test matrix looks good so far, there may need to be some minor tweaks to one or two that are specific to just ovirt-node. For instance the ssh test, openssh-server is not installed on the node. virt-manager-tui release should be out shortly. There are scratch builds in koji, but not in any repos just yet. From jboggs at redhat.com Fri Jul 22 14:13:08 2011 From: jboggs at redhat.com (Joey Boggs) Date: Fri, 22 Jul 2011 10:13:08 -0400 Subject: [Ovirt-devel] Draft / Ovirt Node validation matrix In-Reply-To: <4E29832D.7060500@redhat.com> References: <4E28CB93.8010500@fedoraproject.org> <4E29832D.7060500@redhat.com> Message-ID: <4E298574.6090209@redhat.com> On 07/22/2011 10:03 AM, Joey Boggs wrote: > On 07/22/2011 04:23 AM, Alan Pevec wrote: >> On Fri, Jul 22, 2011 at 3:00 AM, Athmane Madjoudj >> wrote: >>> I've created a draft for Ovirt Node validation matrix: >>> >>> https://fedoraproject.org/wiki/User:Athmane/Draft_Ovirt_Node_validation_matrix >>> >> Thanks! >> >>> Tomorrow I'll create collectd test case, also I would ask if there's a >>> pre-built iso for testing (I need it to ensure that nothing is wrong >>> with >>> test matrix) otherwise I'll try to compose it. >> Current ISO has some issues, I plan to push ovirt-node update to >> Rawhide today, and we're also waiting for virt-manager-tui to land in >> Rawhide (current builds are --without-tui). >> >> Alan >> >> _______________________________________________ >> Ovirt-devel mailing list >> Ovirt-devel at redhat.com >> https://www.redhat.com/mailman/listinfo/ovirt-devel > > > Pushed a Fedora 15 based autobuild out to my fedorapeople page: > http://fedorapeople.org/~jboggs/ovirt-node-image.iso for poking around > for the matrix. Once booted up press f2 to reach a shell for anything > you need to do manually. > > The test matrix looks good so far, there may need to be some minor > tweaks to one or two that are specific to just ovirt-node. For > instance the ssh test, openssh-server is not installed on the node. > virt-manager-tui release should be out shortly. There are scratch > builds in koji, but not in any repos just yet. Not a good morning I guess.... The ssh test matrix is correct, not sure what I was thinking when I wrote that openssh-server was not installed. From apevec at gmail.com Fri Jul 22 15:27:57 2011 From: apevec at gmail.com (Alan Pevec) Date: Fri, 22 Jul 2011 17:27:57 +0200 Subject: [Ovirt-devel] Hook script to preserve one partition untouched during install In-Reply-To: <1311021876.7592.16.camel@halves.br.ibm.com> References: <1306326542.3585.3.camel@halves.br.ibm.com> <1311021876.7592.16.camel@halves.br.ibm.com> Message-ID: On Mon, Jul 18, 2011 at 10:44 PM, Higor Aparecido Vieira Alves wrote: > New version of hook script to preserve one partition untouched during > install. Thanks for posting the hook script, this functionality looks interesting so let's see how we could integrate it into main ovirt installation. Let me try to summarize the use-case first: - machine is pre-provisioned in manufacturing and partition table is pre-created on the disk - there's a service partition with preloaded recovery image or some other partition with preloaded data which should not be touched by ovirt installer > - Can ignore multiple partitions (up to 9) > ignore_vol=sda:2;3;4 I would propose to explore extending the semantics of the current parameters before adding new. Current storage_init syntax is storage_init=HOSTVGDISK1[,HOSTVGDISK2...][;APPVGDISK1[,APPVGDISK2...]] where DISK=[ata|cciss|scsi|usb[:serial#]|/dev/...] We could reverse the logic of your "ignore_vol" and specify which partitions to _use_ for HostVG and AppVG, and allow specifying a list of partition where LVM physical volumes are to be created. Specified partition is assumed to exist i.e. it is pre-created somehow in manufacturing. For example, storage_init=/dev/sda1./dev/sdc1,/dev/sdc2;/dev/sdb1 would create HostVG spanning sda1, sdc1 and sdc2 and AppVG PV on sdb1. > - New boot parameter, data2_size to set Data2 Size (in MB) > ? ? ? ?data2_size=15000 After above storage_init change is implemented, this should be covered by the existing storage_vol parameter storage_vol=size[,{Swap|Data|Config|Logging|Data2|Swap2}][:size...] Alan From mburns at redhat.com Fri Jul 22 21:21:48 2011 From: mburns at redhat.com (Mike Burns) Date: Fri, 22 Jul 2011 17:21:48 -0400 Subject: [Ovirt-devel] [PATCH node 1/2] add firewall config to upstream recipe Message-ID: <1311369708-14957-1-git-send-email-mburns@redhat.com> Signed-off-by: Mike Burns --- recipe/ovirt15-post.ks | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/recipe/ovirt15-post.ks b/recipe/ovirt15-post.ks index 8da83dd..421a2cc 100644 --- a/recipe/ovirt15-post.ks +++ b/recipe/ovirt15-post.ks @@ -85,3 +85,57 @@ WantedBy=multi-user.target EOF_firstboot systemctl enable ovirt-firstboot.service >/dev/null 2>&1 + + +echo "Configuring IPTables" +# here, we need to punch the appropriate holes in the firewall +cat > /etc/sysconfig/iptables << \EOF +# oVirt automatically generated firewall configuration +*filter +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +-A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT +-A INPUT -p icmp -j ACCEPT +-A INPUT -i lo -j ACCEPT +# libvirt +-A INPUT -p tcp --dport 16509 -j ACCEPT +# SSH +-A INPUT -p tcp --dport 22 -j ACCEPT +# guest consoles +-A INPUT -p tcp -m multiport --dports 5634:6166 -j ACCEPT +# migration +-A INPUT -p tcp -m multiport --dports 49152:49216 -j ACCEPT +# snmp +-A INPUT -p udp --dport 161 -j ACCEPT +# +-A INPUT -j REJECT --reject-with icmp-host-prohibited +-A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp-host-prohibited +COMMIT +EOF +# configure IPv6 firewall, default is all ACCEPT +cat > /etc/sysconfig/ip6tables << \EOF +# oVirt automatically generated firewall configuration +*filter +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +-A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT +-A INPUT -p ipv6-icmp -j ACCEPT +-A INPUT -i lo -j ACCEPT +# libvirt +-A INPUT -p tcp --dport 16509 -j ACCEPT +# SSH +-A INPUT -p tcp --dport 22 -j ACCEPT +# guest consoles +-A INPUT -p tcp -m multiport --dports 5634:6166 -j ACCEPT +# migration +-A INPUT -p tcp -m multiport --dports 49152:49216 -j ACCEPT +# snmp +-A INPUT -p udp --dport 161 -j ACCEPT +# unblock ipv6 dhcp response +-A INPUT -p udp --dport 546 -j ACCEPT +-A INPUT -j REJECT --reject-with icmp6-adm-prohibited +-A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp6-adm-prohibited +COMMIT +EOF -- 1.7.4.4 From mburns at redhat.com Fri Jul 22 21:22:35 2011 From: mburns at redhat.com (Mike Burns) Date: Fri, 22 Jul 2011 17:22:35 -0400 Subject: [Ovirt-devel] [PATCH node 2/2] Open the libvirt-cim default port Message-ID: <1311369755-15070-1-git-send-email-mburns@redhat.com> rhbz#713718 Signed-off-by: Mike Burns --- recipe/ovirt15-post.ks | 4 ++++ recipe/rhevh6-post.ks | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/recipe/ovirt15-post.ks b/recipe/ovirt15-post.ks index 421a2cc..16e4131 100644 --- a/recipe/ovirt15-post.ks +++ b/recipe/ovirt15-post.ks @@ -100,6 +100,8 @@ cat > /etc/sysconfig/iptables << \EOF -A INPUT -i lo -j ACCEPT # libvirt -A INPUT -p tcp --dport 16509 -j ACCEPT +# libvirt-cim +-A INPUT -p tcp --dport 5989 -j ACCEPT # SSH -A INPUT -p tcp --dport 22 -j ACCEPT # guest consoles @@ -125,6 +127,8 @@ cat > /etc/sysconfig/ip6tables << \EOF -A INPUT -i lo -j ACCEPT # libvirt -A INPUT -p tcp --dport 16509 -j ACCEPT +# libvirt-cim +-A INPUT -p tcp --dport 5989 -j ACCEPT # SSH -A INPUT -p tcp --dport 22 -j ACCEPT # guest consoles diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks index 328fab6..062d351 100644 --- a/recipe/rhevh6-post.ks +++ b/recipe/rhevh6-post.ks @@ -168,6 +168,8 @@ cat > /etc/sysconfig/iptables << \EOF -A INPUT -p tcp --dport 54321 -j ACCEPT # libvirt -A INPUT -p tcp --dport 16509 -j ACCEPT +# libvirt-cim +-A INPUT -p tcp --dport 5989 -j ACCEPT # SSH -A INPUT -p tcp --dport 22 -j ACCEPT # guest consoles @@ -193,6 +195,8 @@ cat > /etc/sysconfig/ip6tables << \EOF -A INPUT -i lo -j ACCEPT # libvirt -A INPUT -p tcp --dport 16509 -j ACCEPT +# libvirt-cim +-A INPUT -p tcp --dport 5989 -j ACCEPT # SSH -A INPUT -p tcp --dport 22 -j ACCEPT # guest consoles -- 1.7.4.4 From athmane at fedoraproject.org Sat Jul 23 02:00:37 2011 From: athmane at fedoraproject.org (Athmane Madjoudj) Date: Sat, 23 Jul 2011 03:00:37 +0100 Subject: [Ovirt-devel] Draft / Ovirt Node validation matrix In-Reply-To: <4E298574.6090209@redhat.com> References: <4E28CB93.8010500@fedoraproject.org> <4E29832D.7060500@redhat.com> <4E298574.6090209@redhat.com> Message-ID: <4E2A2B45.5020004@fedoraproject.org> On 07/22/2011 03:13 PM, Joey Boggs wrote: > On 07/22/2011 10:03 AM, Joey Boggs wrote: >> On 07/22/2011 04:23 AM, Alan Pevec wrote: >>> On Fri, Jul 22, 2011 at 3:00 AM, Athmane Madjoudj >>> wrote: > > Not a good morning I guess.... The ssh test matrix is correct, not sure > what I was thinking when I wrote that openssh-server was not installed. After some pre-testing, I've added to the test matrix two ovirt specific test cases: https://fedoraproject.org/wiki/QA:Testcase_ovirt-firstboot https://fedoraproject.org/wiki/QA:Testcase_ovirt-admin-shell Feel free to improve them. Here's some issue I've found: - Networking is not available by default (I ran dhclient eth0) - admin password seems not set with the one given in the installer, I've forced it with : passwd admin - SSH login for admin is OK (I get ovirt tui admin shell) - SSH login for root worked but after I set the password with passwd - Firewall seems not configured (iptables -L => no rules) Other notes: - I'm wondering why there's anyterm shell on port 81 - I couldn't find oVirt web interface, is something changed ? - AFAIK ovirt-node-image.iso (146.0 MB) is the smallest bare metal hypervisor, good work. -- Athmane Madjoudj From jboggs at redhat.com Sat Jul 23 04:03:10 2011 From: jboggs at redhat.com (Joey Boggs) Date: Sat, 23 Jul 2011 00:03:10 -0400 Subject: [Ovirt-devel] [PATCH] block upgrades when entering invalid current password Message-ID: <1311393790-14150-1-git-send-email-jboggs@redhat.com> Signed-off-by: Joey Boggs --- scripts/ovirt-config-installer.py | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/scripts/ovirt-config-installer.py b/scripts/ovirt-config-installer.py index 1dba72a..2d87bd3 100644 --- a/scripts/ovirt-config-installer.py +++ b/scripts/ovirt-config-installer.py @@ -169,7 +169,8 @@ class NodeInstallScreen: def password_check_callback(self): self.valid_password, msg = password_check(self.root_password_1.value(), self.root_password_2.value()) - self.pw_msg.setText(msg) + if self.current_password_fail == 0: + self.pw_msg.setText(msg) return def current_password_callback(self): @@ -179,18 +180,21 @@ class NodeInstallScreen: global current_password current_password = self.current_password.value() auth.set_item(PAM.PAM_CONV, pam_conv) - try: - auth.authenticate() - except PAM.error, (resp, code): - log(resp) - self.current_password_fail == 1 - return False - except: - log("Internal error") - return False - else: - self.current_password_fail == 0 - return True + if self.current_password.value() != "": + try: + auth.authenticate() + except PAM.error, (resp, code): + log(resp) + self.current_password_fail = 1 + self.pw_msg.setText("Current Password Invalid") + return False + except: + log("Internal error") + return False + else: + self.current_password_fail = 0 + self.pw_msg.setText(" ") + return True def other_device_root_callback(self): ret = os.system("test -b " + self.root_device.value()) @@ -565,9 +569,9 @@ class NodeInstallScreen: pw_elements.setField(Label("Password: "), 0, 1, anchorLeft = 1) pw_elements.setField(Label("Confirm Password: "), 0, 2, anchorLeft = 1) self.root_password_1 = Entry(15,password = 1) - self.root_password_1.setCallback(self.password_check_callback) + self.root_password_1.setCallback(self.password1_check_callback) self.root_password_2 = Entry(15,password = 1) - self.root_password_2.setCallback(self.password_check_callback) + self.root_password_2.setCallback(self.password2_check_callback) pw_elements.setField(self.root_password_1, 1,1) pw_elements.setField(self.root_password_2, 1,2) elements.setField(pw_elements, 0, 5, anchorLeft = 1) @@ -597,7 +601,8 @@ class NodeInstallScreen: pw_elements.setField(self.root_password_1, 1,2) pw_elements.setField(self.root_password_2, 1,3) elements.setField(pw_elements, 0, 5, anchorLeft = 1) - elements.setField(Label(" "), 0, 6) + self.pw_msg = Textbox(60, 6, "", wrap=1) + elements.setField(self.pw_msg, 0, 6, padding = (0,1,0,3)) return [Label(""), elements] def get_elements_for_page(self, screen, page): -- 1.7.5.4 From apevec at gmail.com Sat Jul 23 10:27:50 2011 From: apevec at gmail.com (Alan Pevec) Date: Sat, 23 Jul 2011 12:27:50 +0200 Subject: [Ovirt-devel] Draft / Ovirt Node validation matrix In-Reply-To: <4E2A2B45.5020004@fedoraproject.org> References: <4E28CB93.8010500@fedoraproject.org> <4E29832D.7060500@redhat.com> <4E298574.6090209@redhat.com> <4E2A2B45.5020004@fedoraproject.org> Message-ID: On Sat, Jul 23, 2011 at 4:00 AM, Athmane Madjoudj wrote: > https://fedoraproject.org/wiki/QA:Testcase_ovirt-firstboot > https://fedoraproject.org/wiki/QA:Testcase_ovirt-admin-shell > > Feel free to improve them. > > Here's some issue I've found: ... Thanks for the testing, yeah there are issues we're trying to resolve with the 2.0.1 before freeze. I'll check your report and open BZs if there isn't one already. > Other notes: > > - I'm wondering why there's anyterm shell on port 81 that was used by ovirt-server to access VM consoles I think we can remove it now and get it back if some new management framework will use it > - I couldn't find oVirt web interface, is something changed ? Yeah, ovirt-server is not actively developed anymore, see https://www.redhat.com/archives/ovirt-devel/2011-June/msg00000.html We're focusing now on ovirt-node only, which is an upstream project for RHEV Hypervisor product and want to make it work stand-alone and with different management frameworks. For a test, we're now including libvirt-cim and condor-cloud. > - AFAIK ovirt-node-image.iso (146.0 MB) is the smallest bare metal > hypervisor, good work. I'm afraid this will grow, with CIM added and Condor-cloud adds >100MB of dependencies... That's why we're also working on a kind of plugin architecture where it will be possible to add a set of packages to the core node image, based on edit-livecd from livecd-tools. The core image will work stand-alone and each "plugin" (tarball with RPMs + kickstart recipe) will add support for one management framework. Alan From apevec at redhat.com Sat Jul 23 23:06:41 2011 From: apevec at redhat.com (Alan Pevec) Date: Sun, 24 Jul 2011 01:06:41 +0200 Subject: [Ovirt-devel] [node] remove cpuspeed Message-ID: <1311462401-7668-1-git-send-email-apevec@redhat.com> it is dropped from F16 https://fedorahosted.org/rel-eng/ticket/4806 --- recipe/common-pkgs.ks | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/recipe/common-pkgs.ks b/recipe/common-pkgs.ks index 46a61b5..fa57b9e 100644 --- a/recipe/common-pkgs.ks +++ b/recipe/common-pkgs.ks @@ -65,7 +65,6 @@ qemu-kvm-tools /usr/sbin/lokkit isomd5sum irqbalance -cpuspeed acpid device-mapper-multipath kpartx -- 1.7.3.4 From apevec at redhat.com Sat Jul 23 23:10:11 2011 From: apevec at redhat.com (Alan Pevec) Date: Sun, 24 Jul 2011 01:10:11 +0200 Subject: [Ovirt-devel] [PATCH] dracut dmsquash-live module requires eject Message-ID: <1311462611-7725-1-git-send-email-apevec@redhat.com> --- recipe/common-pkgs.ks | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/recipe/common-pkgs.ks b/recipe/common-pkgs.ks index fa57b9e..47b6c29 100644 --- a/recipe/common-pkgs.ks +++ b/recipe/common-pkgs.ks @@ -91,6 +91,9 @@ ql2500-firmware aic94xx-firmware bfa-firmware +# dracut dmsquash-live module requires eject +eject + # for building custom selinux module make checkpolicy -- 1.7.3.4 From apevec at redhat.com Sat Jul 23 23:10:34 2011 From: apevec at redhat.com (Alan Pevec) Date: Sun, 24 Jul 2011 01:10:34 +0200 Subject: [Ovirt-devel] [PATCH] move dracut config and patching to spec Message-ID: <1311462634-7766-1-git-send-email-apevec@redhat.com> this is cleaner and avoids rebuilding initramfs in the kickstart post it is built with correct configuration for the node image the first time, in kernel posttrans --- dracut/Makefile.am | 3 + ...-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch | 20 ++++++++ ...-93724aa28fc20c8b7f0167201d1759b7118ba890.patch | 37 +++++++++++++++ dracut/ovirt-dracut.conf | 1 + ovirt-node.spec.in | 26 ++++++++++- recipe/Makefile.am | 2 - recipe/common-initrd.ks | 48 -------------------- recipe/ovirt-node-image.ks.in | 2 - 8 files changed, 86 insertions(+), 53 deletions(-) create mode 100644 dracut/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch create mode 100644 dracut/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch create mode 100644 dracut/ovirt-dracut.conf delete mode 100644 recipe/common-initrd.ks diff --git a/dracut/Makefile.am b/dracut/Makefile.am index df51be1..937a3c1 100644 --- a/dracut/Makefile.am +++ b/dracut/Makefile.am @@ -16,6 +16,9 @@ # also available at http://www.gnu.org/copyleft/gpl.html. EXTRA_DIST = \ + dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch \ + dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch \ + ovirt-dracut.conf \ check \ install \ ovirt-cleanup.sh diff --git a/dracut/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch b/dracut/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch new file mode 100644 index 0000000..c012a6c --- /dev/null +++ b/dracut/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch @@ -0,0 +1,20 @@ +From 3d88d27810acc7782618d67a03ff5c0e41494ca4 Mon Sep 17 00:00:00 2001 +From: Will Woods +Date: Tue, 8 Mar 2011 18:35:11 -0500 +Subject: [PATCH] Fix bash logic typo/buglet ([ condition ] & expression) + +--- + modules.d/90dmsquash-live/dmsquash-live-root | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +--- modules.d/90dmsquash-live/dmsquash-live-root.orig 2011-07-22 02:16:51.013118899 +0200 ++++ modules.d/90dmsquash-live/dmsquash-live-root 2011-07-22 02:17:01.592391181 +0200 +@@ -24,7 +24,7 @@ + overlay=$(getarg overlay) + + # FIXME: we need to be able to hide the plymouth splash for the check really +-[ -e $livedev ] & fs=$(blkid -s TYPE -o value $livedev) ++[ -e $livedev ] && fs=$(blkid -s TYPE -o value $livedev) + if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then + check="yes" + fi diff --git a/dracut/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch b/dracut/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch new file mode 100644 index 0000000..2447cb9 --- /dev/null +++ b/dracut/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch @@ -0,0 +1,37 @@ +From 93724aa28fc20c8b7f0167201d1759b7118ba890 Mon Sep 17 00:00:00 2001 +From: Alan Pevec +Date: Thu, 7 Apr 2011 01:53:51 +0200 +Subject: [PATCH] dmsquash-live: hide plymouth while checking ISO + +Fixes long-standing FIXME +Latest isomd5sum added an option to abort media check with ESC key, +but that key is taken by plymouth for switching to the detailed log +messages, making it impossible to abort checkisomd5. +Tested in text mode. +--- + modules.d/90dmsquash-live/dmsquash-live-root | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +--- modules.d/90dmsquash-live/dmsquash-live-root.orig 2011-07-22 02:02:58.000000000 +0200 ++++ modules.d/90dmsquash-live/dmsquash-live-root 2011-07-22 02:07:20.873266232 +0200 +@@ -23,18 +23,19 @@ + getarg readonly_overlay && readonly_overlay="--readonly" || readonly_overlay="" + overlay=$(getarg overlay) + +-# FIXME: we need to be able to hide the plymouth splash for the check really + [ -e $livedev ] && fs=$(blkid -s TYPE -o value $livedev) + if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then + check="yes" + fi + getarg check || check="" + if [ -n "$check" ]; then ++ [ -x /bin/plymouth ] && /bin/plymouth --hide-splash + checkisomd5 --verbose $livedev || : + if [ $? -ne 0 ]; then + die "CD check failed!" + exit 1 + fi ++ [ -x /bin/plymouth ] && /bin/plymouth --show-splash + fi + + getarg ro && liverw=ro diff --git a/dracut/ovirt-dracut.conf b/dracut/ovirt-dracut.conf new file mode 100644 index 0000000..e2f8eec --- /dev/null +++ b/dracut/ovirt-dracut.conf @@ -0,0 +1 @@ +add_dracutmodules+="ovirtnode multipath" diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index 4bb7baf..33a903d 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -48,6 +48,11 @@ Requires: python-gudev Requires: PyPAM Requires: ethtool Requires: cracklib-python +Requires: dracut +%if 0%{?rhel} +# for applying patches in %post +Requires: patch +%endif BuildArch: noarch @@ -90,6 +95,7 @@ make install DESTDIR=%{buildroot} %{__install} -d -m0755 %{buildroot}%{mgmt_scripts_dir} %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/cron.d %{__install} -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d +%{__install} -d -m0755 %{buildroot}%{_sysconfdir}/dracut.conf.d %{__install} -p -m0755 scripts/node-config %{buildroot}%{_sysconfdir}/sysconfig @@ -108,6 +114,12 @@ make install DESTDIR=%{buildroot} %{__install} -p -m0755 dracut/install %{buildroot}%{_datadir}/dracut/modules.d/91ovirtnode %{__install} -p -m0755 scripts/ovirt-boot-functions %{buildroot}%{_datadir}/dracut/modules.d/91ovirtnode %{__install} -p -m0755 dracut/ovirt-cleanup.sh %{buildroot}%{_datadir}/dracut/modules.d/91ovirtnode +%{__install} -p -m0644 dracut/ovirt-dracut.conf %{buildroot}%{_sysconfdir}/dracut.conf.d +%if 0%{?rhel} +# dracut patches for rhel6 +%{__install} -p -m0644 dracut/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch %{buildroot}%{app_root} +%{__install} -p -m0644 dracut/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch %{buildroot}%{app_root} +%endif # resolv.conf augeas lens %{__install} -d -m0755 %{buildroot}/usr/share/augeas/lenses @@ -165,8 +177,15 @@ echo "# File where default configuration is kept" > %{buildroot}/%{_sysconfdir}/ /sbin/chkconfig --add ovirt-post # workaround for imgcreate/live.py __copy_efi_files if [ ! -e /boot/grub/splash.xpm.gz ]; then - cp /usr/share/ovirt-node/grub-splash.xpm.gz /boot/grub/splash.xpm.gz + cp %{app_root}/grub-splash.xpm.gz /boot/grub/splash.xpm.gz fi +%if 0%{?rhel} +# apply dracut fixes not in rhel6 +# rhbz#683330 +# dracut.git commits rediffed for dracut-004-53.el6 +patch -d /usr/share/dracut/ -p0 < %{app_root}/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch +patch -d /usr/share/dracut/ -p0 < %{app_root}/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch +%endif %preun if [ $1 = 0 ] ; then @@ -206,6 +225,10 @@ fi %{app_root}/grub-splash.xpm.gz # end i386 bits %{app_root}/syslinux-vesa-splash.jpg +%if 0%{?rhel} +%{app_root}/dracut-3d88d27810acc7782618d67a03ff5c0e41494ca4.patch +%{app_root}/dracut-93724aa28fc20c8b7f0167201d1759b7118ba890.patch +%endif %{_datadir}/augeas/lenses/build.aug %{_datadir}/augeas/lenses/resolv.aug @@ -214,6 +237,7 @@ fi %{_datadir}/dracut/modules.d/91ovirtnode/install %{_datadir}/dracut/modules.d/91ovirtnode/ovirt-boot-functions %{_datadir}/dracut/modules.d/91ovirtnode/ovirt-cleanup.sh +%{_sysconfdir}/dracut.conf.d/ovirt-dracut.conf %{_libexecdir}/ovirt-config-boot %{_libexecdir}/ovirt-config-boot-wrapper %{_libexecdir}/ovirt-config-hostname diff --git a/recipe/Makefile.am b/recipe/Makefile.am index 1de1646..87b0c68 100644 --- a/recipe/Makefile.am +++ b/recipe/Makefile.am @@ -37,7 +37,6 @@ OVIRT_NODE_TOOLS_DATA = \ *-post.ks \ *-minimizer.ks \ common-nochroot.ks \ - common-initrd.ks \ common-manifest.ks \ $(PACKAGE).ks @@ -47,7 +46,6 @@ EXTRA_DIST = \ *-post.ks \ *-minimizer.ks \ common-nochroot.ks \ - common-initrd.ks \ common-manifest.ks \ $(PACKAGE).ks.in \ $(PACKAGE).ks diff --git a/recipe/common-initrd.ks b/recipe/common-initrd.ks deleted file mode 100644 index 90fda3d..0000000 --- a/recipe/common-initrd.ks +++ /dev/null @@ -1,48 +0,0 @@ -%post - -# patch dmsquash-live dracut module -# rhbz#683330 -# http://article.gmane.org/gmane.linux.kernel.initramfs/1879 -patch -d /usr/share/dracut/ -p1 << \EOF_DMSQUASH ---- a/modules.d/90dmsquash-live/dmsquash-live-root -+++ b/modules.d/90dmsquash-live/dmsquash-live-root -@@ -23,18 +23,19 @@ - getarg readonly_overlay && readonly_overlay="--readonly" || readonly_overlay="" - overlay=$(getarg overlay) - --# FIXME: we need to be able to hide the plymouth splash for the check really --[ -e $livedev ] & fs=$(blkid -s TYPE -o value $livedev) -+[ -e $livedev ] && fs=$(blkid -s TYPE -o value $livedev) - if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then - check="yes" - fi - getarg check || check="" - if [ -n "$check" ]; then -+ [ -x /bin/plymouth ] && /bin/plymouth --hide-splash - checkisomd5 --verbose $livedev || : - if [ $? -ne 0 ]; then - die "CD check failed!" - exit 1 - fi -+ [ -x /bin/plymouth ] && /bin/plymouth --show-splash - fi - - getarg ro && liverw=ro -EOF_DMSQUASH - -# rebuild initramfs to include multipath rhbz#627647 -echo -n "Rebuilding initramfs for multipath and disk cleanup..." -kernel="$(rpm -q --qf '%{VERSION}-%{RELEASE}.%{ARCH}\n' kernel)" -/sbin/dracut -f -a "ovirtnode" -a "multipath" /initrd0.img "$kernel" -echo "done." - -%end - -%post --nochroot - -# replace initramfs if regenerated -if [ -f "$INSTALL_ROOT/initrd0.img" ]; then - mv -v "$INSTALL_ROOT/initrd0.img" "$LIVE_ROOT/isolinux/initrd0.img" -fi - -%end diff --git a/recipe/ovirt-node-image.ks.in b/recipe/ovirt-node-image.ks.in index 2c9fcf6..5eaa813 100644 --- a/recipe/ovirt-node-image.ks.in +++ b/recipe/ovirt-node-image.ks.in @@ -21,8 +21,6 @@ %end -%include common-initrd.ks - %post --nochroot --interpreter image-minimizer %include common-minimizer.ks %include @DISTRO at -minimizer.ks -- 1.7.3.4 From apevec at redhat.com Sat Jul 23 23:10:51 2011 From: apevec at redhat.com (Alan Pevec) Date: Sun, 24 Jul 2011 01:10:51 +0200 Subject: [Ovirt-devel] [PATCH] install selected Matahari agents and the broker Message-ID: <1311462651-7803-1-git-send-email-apevec@redhat.com> Note: f15 has matahari-net, f16 matahari-network --- recipe/ovirt15-pkgs.ks | 6 +++++- recipe/ovirt16-pkgs.ks | 23 ++++++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) mode change 120000 => 100644 recipe/ovirt16-pkgs.ks diff --git a/recipe/ovirt15-pkgs.ks b/recipe/ovirt15-pkgs.ks index 85bb29f..f3bae4e 100644 --- a/recipe/ovirt15-pkgs.ks +++ b/recipe/ovirt15-pkgs.ks @@ -7,7 +7,11 @@ generic-logos collectd collectd-rrdtool libvirt-qpid -matahari +# install selected Matahari agents and the broker +matahari-broker +matahari-host +matahari-net +# anyterm glusterfs-client # F15 dracut missing dep, bz# ??? diff --git a/recipe/ovirt16-pkgs.ks b/recipe/ovirt16-pkgs.ks deleted file mode 120000 index ea00c05..0000000 --- a/recipe/ovirt16-pkgs.ks +++ /dev/null @@ -1 +0,0 @@ -ovirt15-pkgs.ks \ No newline at end of file diff --git a/recipe/ovirt16-pkgs.ks b/recipe/ovirt16-pkgs.ks new file mode 100644 index 0000000..33c2f50 --- /dev/null +++ b/recipe/ovirt16-pkgs.ks @@ -0,0 +1,22 @@ +# remove +-fedora-release +-fedora-release-notes +-fedora-logos +generic-logos +# Fedora only packages +collectd +collectd-rrdtool +libvirt-qpid +# install selected Matahari agents and the broker +matahari-broker +matahari-host +matahari-network +# +anyterm +glusterfs-client +# F15 dracut missing dep, bz# ??? +less +# alternate management tools +libvirt-cim +tog-pegasus +openslp -- 1.7.3.4 From apevec at redhat.com Sat Jul 23 23:11:06 2011 From: apevec at redhat.com (Alan Pevec) Date: Sun, 24 Jul 2011 01:11:06 +0200 Subject: [Ovirt-devel] [PATCH] enable FIPS mode Message-ID: <1311462666-7840-1-git-send-email-apevec@redhat.com> --- dracut/ovirt-dracut.conf | 2 +- recipe/common-pkgs.ks | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dracut/ovirt-dracut.conf b/dracut/ovirt-dracut.conf index e2f8eec..277e1a2 100644 --- a/dracut/ovirt-dracut.conf +++ b/dracut/ovirt-dracut.conf @@ -1 +1 @@ -add_dracutmodules+="ovirtnode multipath" +add_dracutmodules+="ovirtnode multipath fips" diff --git a/recipe/common-pkgs.ks b/recipe/common-pkgs.ks index 47b6c29..f4e298a 100644 --- a/recipe/common-pkgs.ks +++ b/recipe/common-pkgs.ks @@ -69,6 +69,7 @@ acpid device-mapper-multipath kpartx dracut-network +dracut-fips patch e2fsprogs sysfsutils -- 1.7.3.4 From apevec at redhat.com Sat Jul 23 23:11:18 2011 From: apevec at redhat.com (Alan Pevec) Date: Sun, 24 Jul 2011 01:11:18 +0200 Subject: [Ovirt-devel] [PATCH] make image minimization optional Message-ID: <1311462678-7878-1-git-send-email-apevec@redhat.com> Default for builds from git is --with-image-minimizer and Fedora builds will have --without-image-minimizer Blacklisting (forceful removal of files and packages) is forbiden by Fedora Spin rules, so official oVirt Node Spin will not use it. --- configure.ac | 12 ++++++------ ovirt-node.spec.in | 2 +- recipe/Makefile.am | 1 + recipe/image-minimizer.ks.in | 11 +++++++++++ recipe/ovirt-node-image.ks.in | 12 +----------- 5 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 recipe/image-minimizer.ks.in diff --git a/configure.ac b/configure.ac index 057f968..495c880 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,5 @@ AC_INIT([ovirt-node], [2.0.1], [ovirt-devel at redhat.com]) AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability tar-pax]) -AC_PROG_CC AC_SUBST([FEDORA],[[`rpm --eval '%{fedora}'|sed 's/[^0-9]//g'`]]) AC_SUBST([RHEL], [[`rpm --eval '%{rhel}'|sed 's/[^0-9]//g'`]]) @@ -13,11 +12,11 @@ if test "$RHEL"; then DISTRO=rhevh$RHEL fi -AC_CONFIG_HEADERS([config.h]) - -# If using gcc and default CFLAGS, enable some warnings. -test x"$ac_ct_CC:$CFLAGS" = 'xgcc:-g -O2' \ - && CFLAGS="$CFLAGS -Wshadow -Wall -Werror" +AC_ARG_WITH([image-minimizer], [AC_HELP_STRING([--with-image-minimizer], + [enable aggresive reduction of the image size])], + [IMAGE_MINIMIZER="%include image-minimizer.ks"], + [IMAGE_MINIMIZER=""]) +AC_SUBST([IMAGE_MINIMIZER]) AC_CONFIG_FILES([Makefile augeas/Makefile @@ -28,6 +27,7 @@ AC_CONFIG_FILES([Makefile scripts/collectd.conf recipe/Makefile recipe/ovirt-node-image.ks + recipe/image-minimizer.ks ovirt-node.spec ]) AC_OUTPUT diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index 33a903d..76a5d77 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -80,7 +80,7 @@ however on a development machine to help to build the image. %build aclocal && autoheader && automake --add-missing && autoconf -%configure +%configure --with-image-minimizer make %install diff --git a/recipe/Makefile.am b/recipe/Makefile.am index 87b0c68..060fa19 100644 --- a/recipe/Makefile.am +++ b/recipe/Makefile.am @@ -47,6 +47,7 @@ EXTRA_DIST = \ *-minimizer.ks \ common-nochroot.ks \ common-manifest.ks \ + image-minimizer.ks.in \ $(PACKAGE).ks.in \ $(PACKAGE).ks diff --git a/recipe/image-minimizer.ks.in b/recipe/image-minimizer.ks.in new file mode 100644 index 0000000..2518c5c --- /dev/null +++ b/recipe/image-minimizer.ks.in @@ -0,0 +1,11 @@ +%post --nochroot --interpreter image-minimizer +%include common-minimizer.ks +%include @DISTRO at -minimizer.ks +%end + +%post +echo "Removing python source files" +find / -name '*.py' -exec rm -f {} \; +find / -name '*.pyo' -exec rm -f {} \; + +%end diff --git a/recipe/ovirt-node-image.ks.in b/recipe/ovirt-node-image.ks.in index 5eaa813..a24275c 100644 --- a/recipe/ovirt-node-image.ks.in +++ b/recipe/ovirt-node-image.ks.in @@ -21,17 +21,7 @@ %end -%post --nochroot --interpreter image-minimizer -%include common-minimizer.ks -%include @DISTRO at -minimizer.ks -%end - -%post -echo "Removing python source files" -find / -name '*.py' -exec rm -f {} \; -find / -name '*.pyo' -exec rm -f {} \; - -%end + at IMAGE_MINIMIZER@ %include common-manifest.ks -- 1.7.3.4 From geoffocallaghan at gmail.com Mon Jul 25 09:36:43 2011 From: geoffocallaghan at gmail.com (Geoff O'Callaghan) Date: Mon, 25 Jul 2011 19:36:43 +1000 Subject: [Ovirt-devel] ovirt (git) build removes ovirtnode.password Message-ID: Hi There, I may be doing something wrong. I built ovirt-node-image from git using instructions at https://fedorahosted.org/ovirt/wiki/Build (note: the -b next should be removed from the wiki) Anyway, moving on. I successfully created an ovirt-node-image.iso, but when I boot off it, the first boot fails with ovirtnode.password being missing. I can see in recipe/ovirt-node-image.ks that it recursively removes *.py etc files but I couldn't find anywhere where it was actually meant to compile the ovirtnode python code - ie. All of /usr/lib/python2.7/site-packages/ovirtnode/*.py are removed as part of the iso image create. I can see the python source in the generated ovirt-node-2.0.1-999-fc15.noarch.rpm As you can tell i'm doing this on F15 - anything i'm doing wrong here ? Tks Geoff -------------- next part -------------- An HTML attachment was scrubbed... URL: From mburns at redhat.com Mon Jul 25 13:48:14 2011 From: mburns at redhat.com (Mike Burns) Date: Mon, 25 Jul 2011 09:48:14 -0400 Subject: [Ovirt-devel] ovirt (git) build removes ovirtnode.password In-Reply-To: References: Message-ID: <1311601694.3663.3972.camel@beelzebub.mburnsfire.net> On Mon, 2011-07-25 at 19:36 +1000, Geoff O'Callaghan wrote: > Hi There, > > I may be doing something wrong. I built ovirt-node-image from git > using instructions at https://fedorahosted.org/ovirt/wiki/Build > (note: the -b next should be removed from the wiki) Thanks, I'll fix that. > > Anyway, moving on. I successfully created an ovirt-node-image.iso, > but when I boot off it, the first boot fails with ovirtnode.password > being missing. I can see in recipe/ovirt-node-image.ks that it > recursively removes *.py etc files but I couldn't find anywhere where > it was actually meant to compile the ovirtnode python code - ie. All > of /usr/lib/python2.7/site-packages/ovirtnode/*.py are removed as part > of the iso image create. I can see the python source in the > generated ovirt-node-2.0.1-999-fc15.noarch.rpm The byte compile should be handled automatically in the rpm build step. Does your ovirt-node.rpm contain the .pyc and .pyo files? Can you send your build log? Just some quick thoughts: We do assume that you've already got the packages listed here installed on your build machine: http://fedoraproject.org/wiki/Packaging/Guidelines#Exceptions_2 More info on python byte compiling (as much for me and the rest of the list as you :-) ): http://fedoraproject.org/wiki/Packaging:Python#Byte_compiling > As you can tell i'm doing this on F15 - anything i'm doing wrong > here ? We're going to be dropping F15 support completely. There is a bug in dracut that isn't going to be fixed in F15 that will be done in F16. I'll be posting patches to drop the F15 ks files from the repo later today. You can still use F15 as a build host, you just need to tell it what you're building by editing your .rpmmacros file with these entries: %fedora 16 %dist .fc16 Thanks Mike > > Tks > Geoff > > _______________________________________________ > Ovirt-devel mailing list > Ovirt-devel at redhat.com > https://www.redhat.com/mailman/listinfo/ovirt-devel -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/x-pkcs7-signature Size: 6117 bytes Desc: not available URL: From mburns at redhat.com Mon Jul 25 14:32:27 2011 From: mburns at redhat.com (Mike Burns) Date: Mon, 25 Jul 2011 10:32:27 -0400 Subject: [Ovirt-devel] [PATCH node] Drop F15 build recipes Message-ID: <1311604347-24180-1-git-send-email-mburns@redhat.com> Due to a critical dracut bug, and a strong dev focus on F16, we're dropping all F15 recipes. Signed-off-by: Mike Burns --- recipe/ovirt15-install.ks | 1 - recipe/ovirt15-minimizer.ks | 1 - recipe/ovirt15-pkgs.ks | 2 - recipe/ovirt15-post.ks | 145 ------------------------------------------ recipe/ovirt16-install.ks | 2 +- recipe/ovirt16-minimizer.ks | 2 +- recipe/ovirt16-post.ks | 146 ++++++++++++++++++++++++++++++++++++++++++- 7 files changed, 147 insertions(+), 152 deletions(-) delete mode 100644 recipe/ovirt15-install.ks delete mode 100644 recipe/ovirt15-minimizer.ks delete mode 100644 recipe/ovirt15-pkgs.ks delete mode 100644 recipe/ovirt15-post.ks mode change 120000 => 100644 recipe/ovirt16-install.ks mode change 120000 => 100644 recipe/ovirt16-minimizer.ks mode change 120000 => 100644 recipe/ovirt16-post.ks diff --git a/recipe/ovirt15-install.ks b/recipe/ovirt15-install.ks deleted file mode 100644 index 2265550..0000000 --- a/recipe/ovirt15-install.ks +++ /dev/null @@ -1 +0,0 @@ -services --enabled=auditd,ntpd,ntpdate,iptables,network,rsyslog,multipathd,snmpd,ovirt-early,ovirt,ovirt-post,anyterm,collectd,libvirt-qpid,matahari-host diff --git a/recipe/ovirt15-minimizer.ks b/recipe/ovirt15-minimizer.ks deleted file mode 100644 index 413c646..0000000 --- a/recipe/ovirt15-minimizer.ks +++ /dev/null @@ -1 +0,0 @@ -# Fedora specific image minimization diff --git a/recipe/ovirt15-pkgs.ks b/recipe/ovirt15-pkgs.ks deleted file mode 100644 index d9c609f..0000000 --- a/recipe/ovirt15-pkgs.ks +++ /dev/null @@ -1,2 +0,0 @@ -%include fedora-pkgs.ks -matahari-net diff --git a/recipe/ovirt15-post.ks b/recipe/ovirt15-post.ks deleted file mode 100644 index 16e4131..0000000 --- a/recipe/ovirt15-post.ks +++ /dev/null @@ -1,145 +0,0 @@ -# ovirt-install-node-stateless -# ovirt_setup_libvirtd() - # just to get a boot warning to shut up - touch /etc/resolv.conf - - # make libvirtd listen on the external interfaces - sed -i -e 's/^#\(LIBVIRTD_ARGS="--listen"\).*/\1/' \ - /etc/sysconfig/libvirtd - - # set up qemu daemon to allow outside VNC connections - 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) - 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 - if ! grep -qE "^mech_list: gssapi" $sasl_conf ; then - sed -i -e "s/^\([[:space:]]*mech_list.*\)/#\1/" $sasl_conf - echo "mech_list: gssapi" >> $sasl_conf - fi - -#ovirt_setup_anyterm() - # configure anyterm - cat >> /etc/sysconfig/anyterm << \EOF_anyterm -ANYTERM_CMD="sudo /usr/bin/virsh console %p" -ANYTERM_LOCAL_ONLY=false -EOF_anyterm - - # permit it to run the virsh console - echo "anyterm ALL=NOPASSWD: /usr/bin/virsh console *" >> /etc/sudoers - -# rwtab changes from upstream -patch -d /etc/ -p1 << \EOF_PATCH -diff --git a/rwtab b/rwtab -index cfcb814..7dcb846 100644 ---- a/rwtab -+++ b/rwtab -@@ -1,9 +1,7 @@ - dirs /var/cache/man - dirs /var/gdm - dirs /var/lib/xkb --dirs /var/lock - dirs /var/log --dirs /var/run - dirs /var/puppet - dirs /var/lib/dbus - dirs /var/lib/nfs -@@ -25,7 +23,6 @@ empty /var/lib/pulse - empty /var/lib/ups - empty /var/tmp - empty /var/tux --empty /media - - files /etc/adjtime - files /etc/ntp.conf -EOF_PATCH - -# systemd configuration -# set default runlevel to multi-user(3) - -rm -rf /etc/systemd/system/default.target -ln -sf /lib/systemd/system/multi-user.target /etc/systemd/system/default.target - -# setup ovirt-firstboot multi-user dependency -cat >> /lib/systemd/system/ovirt-firstboot.service << \EOF_firstboot -[Unit] -Description=firstboot configuration program (text mode) -After=livesys.service plymouth-quit.service -Before=systemd-user-sessions.service - -[Service] -Environment=RUNLEVEL=3 -ExecStart=/etc/init.d/ovirt-firstboot start -TimeoutSec=0 -RemainAfterExit=yes -Type=oneshot -SysVStartPriority=99 -StandardInput=tty - -[Install] -WantedBy=multi-user.target -EOF_firstboot - -systemctl enable ovirt-firstboot.service >/dev/null 2>&1 - - -echo "Configuring IPTables" -# here, we need to punch the appropriate holes in the firewall -cat > /etc/sysconfig/iptables << \EOF -# oVirt automatically generated firewall configuration -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] --A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT --A INPUT -p icmp -j ACCEPT --A INPUT -i lo -j ACCEPT -# libvirt --A INPUT -p tcp --dport 16509 -j ACCEPT -# libvirt-cim --A INPUT -p tcp --dport 5989 -j ACCEPT -# SSH --A INPUT -p tcp --dport 22 -j ACCEPT -# guest consoles --A INPUT -p tcp -m multiport --dports 5634:6166 -j ACCEPT -# migration --A INPUT -p tcp -m multiport --dports 49152:49216 -j ACCEPT -# snmp --A INPUT -p udp --dport 161 -j ACCEPT -# --A INPUT -j REJECT --reject-with icmp-host-prohibited --A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp-host-prohibited -COMMIT -EOF -# configure IPv6 firewall, default is all ACCEPT -cat > /etc/sysconfig/ip6tables << \EOF -# oVirt automatically generated firewall configuration -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] --A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT --A INPUT -p ipv6-icmp -j ACCEPT --A INPUT -i lo -j ACCEPT -# libvirt --A INPUT -p tcp --dport 16509 -j ACCEPT -# libvirt-cim --A INPUT -p tcp --dport 5989 -j ACCEPT -# SSH --A INPUT -p tcp --dport 22 -j ACCEPT -# guest consoles --A INPUT -p tcp -m multiport --dports 5634:6166 -j ACCEPT -# migration --A INPUT -p tcp -m multiport --dports 49152:49216 -j ACCEPT -# snmp --A INPUT -p udp --dport 161 -j ACCEPT -# unblock ipv6 dhcp response --A INPUT -p udp --dport 546 -j ACCEPT --A INPUT -j REJECT --reject-with icmp6-adm-prohibited --A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp6-adm-prohibited -COMMIT -EOF diff --git a/recipe/ovirt16-install.ks b/recipe/ovirt16-install.ks deleted file mode 120000 index beae07f..0000000 --- a/recipe/ovirt16-install.ks +++ /dev/null @@ -1 +0,0 @@ -ovirt15-install.ks \ No newline at end of file diff --git a/recipe/ovirt16-install.ks b/recipe/ovirt16-install.ks new file mode 100644 index 0000000..2265550 --- /dev/null +++ b/recipe/ovirt16-install.ks @@ -0,0 +1 @@ +services --enabled=auditd,ntpd,ntpdate,iptables,network,rsyslog,multipathd,snmpd,ovirt-early,ovirt,ovirt-post,anyterm,collectd,libvirt-qpid,matahari-host diff --git a/recipe/ovirt16-minimizer.ks b/recipe/ovirt16-minimizer.ks deleted file mode 120000 index fab6e8b..0000000 --- a/recipe/ovirt16-minimizer.ks +++ /dev/null @@ -1 +0,0 @@ -ovirt15-minimizer.ks \ No newline at end of file diff --git a/recipe/ovirt16-minimizer.ks b/recipe/ovirt16-minimizer.ks new file mode 100644 index 0000000..413c646 --- /dev/null +++ b/recipe/ovirt16-minimizer.ks @@ -0,0 +1 @@ +# Fedora specific image minimization diff --git a/recipe/ovirt16-post.ks b/recipe/ovirt16-post.ks deleted file mode 120000 index 624a987..0000000 --- a/recipe/ovirt16-post.ks +++ /dev/null @@ -1 +0,0 @@ -ovirt15-post.ks \ No newline at end of file diff --git a/recipe/ovirt16-post.ks b/recipe/ovirt16-post.ks new file mode 100644 index 0000000..16e4131 --- /dev/null +++ b/recipe/ovirt16-post.ks @@ -0,0 +1,145 @@ +# ovirt-install-node-stateless +# ovirt_setup_libvirtd() + # just to get a boot warning to shut up + touch /etc/resolv.conf + + # make libvirtd listen on the external interfaces + sed -i -e 's/^#\(LIBVIRTD_ARGS="--listen"\).*/\1/' \ + /etc/sysconfig/libvirtd + + # set up qemu daemon to allow outside VNC connections + 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) + 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 + if ! grep -qE "^mech_list: gssapi" $sasl_conf ; then + sed -i -e "s/^\([[:space:]]*mech_list.*\)/#\1/" $sasl_conf + echo "mech_list: gssapi" >> $sasl_conf + fi + +#ovirt_setup_anyterm() + # configure anyterm + cat >> /etc/sysconfig/anyterm << \EOF_anyterm +ANYTERM_CMD="sudo /usr/bin/virsh console %p" +ANYTERM_LOCAL_ONLY=false +EOF_anyterm + + # permit it to run the virsh console + echo "anyterm ALL=NOPASSWD: /usr/bin/virsh console *" >> /etc/sudoers + +# rwtab changes from upstream +patch -d /etc/ -p1 << \EOF_PATCH +diff --git a/rwtab b/rwtab +index cfcb814..7dcb846 100644 +--- a/rwtab ++++ b/rwtab +@@ -1,9 +1,7 @@ + dirs /var/cache/man + dirs /var/gdm + dirs /var/lib/xkb +-dirs /var/lock + dirs /var/log +-dirs /var/run + dirs /var/puppet + dirs /var/lib/dbus + dirs /var/lib/nfs +@@ -25,7 +23,6 @@ empty /var/lib/pulse + empty /var/lib/ups + empty /var/tmp + empty /var/tux +-empty /media + + files /etc/adjtime + files /etc/ntp.conf +EOF_PATCH + +# systemd configuration +# set default runlevel to multi-user(3) + +rm -rf /etc/systemd/system/default.target +ln -sf /lib/systemd/system/multi-user.target /etc/systemd/system/default.target + +# setup ovirt-firstboot multi-user dependency +cat >> /lib/systemd/system/ovirt-firstboot.service << \EOF_firstboot +[Unit] +Description=firstboot configuration program (text mode) +After=livesys.service plymouth-quit.service +Before=systemd-user-sessions.service + +[Service] +Environment=RUNLEVEL=3 +ExecStart=/etc/init.d/ovirt-firstboot start +TimeoutSec=0 +RemainAfterExit=yes +Type=oneshot +SysVStartPriority=99 +StandardInput=tty + +[Install] +WantedBy=multi-user.target +EOF_firstboot + +systemctl enable ovirt-firstboot.service >/dev/null 2>&1 + + +echo "Configuring IPTables" +# here, we need to punch the appropriate holes in the firewall +cat > /etc/sysconfig/iptables << \EOF +# oVirt automatically generated firewall configuration +*filter +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +-A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT +-A INPUT -p icmp -j ACCEPT +-A INPUT -i lo -j ACCEPT +# libvirt +-A INPUT -p tcp --dport 16509 -j ACCEPT +# libvirt-cim +-A INPUT -p tcp --dport 5989 -j ACCEPT +# SSH +-A INPUT -p tcp --dport 22 -j ACCEPT +# guest consoles +-A INPUT -p tcp -m multiport --dports 5634:6166 -j ACCEPT +# migration +-A INPUT -p tcp -m multiport --dports 49152:49216 -j ACCEPT +# snmp +-A INPUT -p udp --dport 161 -j ACCEPT +# +-A INPUT -j REJECT --reject-with icmp-host-prohibited +-A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp-host-prohibited +COMMIT +EOF +# configure IPv6 firewall, default is all ACCEPT +cat > /etc/sysconfig/ip6tables << \EOF +# oVirt automatically generated firewall configuration +*filter +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +-A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT +-A INPUT -p ipv6-icmp -j ACCEPT +-A INPUT -i lo -j ACCEPT +# libvirt +-A INPUT -p tcp --dport 16509 -j ACCEPT +# libvirt-cim +-A INPUT -p tcp --dport 5989 -j ACCEPT +# SSH +-A INPUT -p tcp --dport 22 -j ACCEPT +# guest consoles +-A INPUT -p tcp -m multiport --dports 5634:6166 -j ACCEPT +# migration +-A INPUT -p tcp -m multiport --dports 49152:49216 -j ACCEPT +# snmp +-A INPUT -p udp --dport 161 -j ACCEPT +# unblock ipv6 dhcp response +-A INPUT -p udp --dport 546 -j ACCEPT +-A INPUT -j REJECT --reject-with icmp6-adm-prohibited +-A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp6-adm-prohibited +COMMIT +EOF -- 1.7.4.4 From jboggs at redhat.com Mon Jul 25 19:42:45 2011 From: jboggs at redhat.com (Joey Boggs) Date: Mon, 25 Jul 2011 15:42:45 -0400 Subject: [Ovirt-devel] [PATCH] fix password screen traceback during install Message-ID: <1311622965-13277-1-git-send-email-jboggs@redhat.com> Signed-off-by: Joey Boggs --- scripts/ovirt-config-installer.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ovirt-config-installer.py b/scripts/ovirt-config-installer.py index 6064c77..30f8aa9 100644 --- a/scripts/ovirt-config-installer.py +++ b/scripts/ovirt-config-installer.py @@ -573,9 +573,9 @@ class NodeInstallScreen: pw_elements.setField(Label("Password: "), 0, 1, anchorLeft = 1) pw_elements.setField(Label("Confirm Password: "), 0, 2, anchorLeft = 1) self.root_password_1 = Entry(15,password = 1) - self.root_password_1.setCallback(self.password1_check_callback) + self.root_password_1.setCallback(self.password_check_callback) self.root_password_2 = Entry(15,password = 1) - self.root_password_2.setCallback(self.password2_check_callback) + self.root_password_2.setCallback(self.password_check_callback) pw_elements.setField(self.root_password_1, 1,1) pw_elements.setField(self.root_password_2, 1,2) elements.setField(pw_elements, 0, 5, anchorLeft = 1) -- 1.7.5.4 From apevec at redhat.com Tue Jul 26 14:45:19 2011 From: apevec at redhat.com (Alan Pevec) Date: Tue, 26 Jul 2011 16:45:19 +0200 Subject: [Ovirt-devel] [PATCH] libvirt-qpid was renamed to libvirt-qmf Message-ID: <1311691519-9993-1-git-send-email-apevec@redhat.com> --- ovirt-node.spec.in | 1 - recipe/fedora-pkgs.ks | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index 76a5d77..7b0514a 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -20,7 +20,6 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig %if 0%{?fedora} Requires: python-augeas -Requires: libvirt-qpid >= 0.2.14-3 Requires: glusterfs-client >= 2.0.1 Requires: anyterm Requires: python-IPy diff --git a/recipe/fedora-pkgs.ks b/recipe/fedora-pkgs.ks index b3b991c..4907fda 100644 --- a/recipe/fedora-pkgs.ks +++ b/recipe/fedora-pkgs.ks @@ -5,7 +5,7 @@ generic-logos # Fedora only packages collectd-virt -libvirt-qpid +libvirt-qmf # install selected Matahari agents and the broker matahari-broker matahari-host -- 1.7.3.4 From mburns at redhat.com Tue Jul 26 14:54:11 2011 From: mburns at redhat.com (Mike Burns) Date: Tue, 26 Jul 2011 10:54:11 -0400 Subject: [Ovirt-devel] [PATCH] libvirt-qpid was renamed to libvirt-qmf In-Reply-To: <1311691519-9993-1-git-send-email-apevec@redhat.com> References: <1311691519-9993-1-git-send-email-apevec@redhat.com> Message-ID: <1311692051.3663.4005.camel@beelzebub.mburnsfire.net> ACK On Tue, 2011-07-26 at 16:45 +0200, Alan Pevec wrote: > --- > ovirt-node.spec.in | 1 - > recipe/fedora-pkgs.ks | 2 +- > 2 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in > index 76a5d77..7b0514a 100644 > --- a/ovirt-node.spec.in > +++ b/ovirt-node.spec.in > @@ -20,7 +20,6 @@ Requires(post): /sbin/chkconfig > Requires(preun): /sbin/chkconfig > %if 0%{?fedora} > Requires: python-augeas > -Requires: libvirt-qpid >= 0.2.14-3 > Requires: glusterfs-client >= 2.0.1 > Requires: anyterm > Requires: python-IPy > diff --git a/recipe/fedora-pkgs.ks b/recipe/fedora-pkgs.ks > index b3b991c..4907fda 100644 > --- a/recipe/fedora-pkgs.ks > +++ b/recipe/fedora-pkgs.ks > @@ -5,7 +5,7 @@ > generic-logos > # Fedora only packages > collectd-virt > -libvirt-qpid > +libvirt-qmf > # install selected Matahari agents and the broker > matahari-broker > matahari-host -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/x-pkcs7-signature Size: 6117 bytes Desc: not available URL: From mburns at redhat.com Tue Jul 26 16:13:54 2011 From: mburns at redhat.com (Mike Burns) Date: Tue, 26 Jul 2011 12:13:54 -0400 Subject: [Ovirt-devel] [PATCH node] remove 999 from RELEASE in spec Message-ID: <1311696834-20551-1-git-send-email-mburns@redhat.com> Signed-off-by: Mike Burns --- ovirt-node.spec.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index 7b0514a..313a071 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -6,7 +6,7 @@ Summary: The %{product_family} daemons/scripts Name: ovirt-node Version: @VERSION@ -Release: 999%{?dist}%{?extra_release} +Release: 0%{?dist}%{?extra_release} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System -- 1.7.4.4 From mburns at redhat.com Wed Jul 27 18:48:44 2011 From: mburns at redhat.com (Mike Burns) Date: Wed, 27 Jul 2011 14:48:44 -0400 Subject: [Ovirt-devel] [PATCH node] remove libvirt port from default iptables configuration Message-ID: <1311792524-10892-1-git-send-email-mburns@redhat.com> rhbz#715296 Signed-off-by: Mike Burns --- recipe/ovirt16-post.ks | 4 ---- recipe/rhevh6-post.ks | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/recipe/ovirt16-post.ks b/recipe/ovirt16-post.ks index 4c9ffd0..0229201 100644 --- a/recipe/ovirt16-post.ks +++ b/recipe/ovirt16-post.ks @@ -98,8 +98,6 @@ cat > /etc/sysconfig/iptables << \EOF -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT -A INPUT -p icmp -j ACCEPT -A INPUT -i lo -j ACCEPT -# libvirt --A INPUT -p tcp --dport 16509 -j ACCEPT # libvirt-cim -A INPUT -p tcp --dport 5989 -j ACCEPT # SSH @@ -125,8 +123,6 @@ cat > /etc/sysconfig/ip6tables << \EOF -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT -A INPUT -p ipv6-icmp -j ACCEPT -A INPUT -i lo -j ACCEPT -# libvirt --A INPUT -p tcp --dport 16509 -j ACCEPT # libvirt-cim -A INPUT -p tcp --dport 5989 -j ACCEPT # SSH diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks index 95880f8..91db02f 100644 --- a/recipe/rhevh6-post.ks +++ b/recipe/rhevh6-post.ks @@ -166,8 +166,6 @@ cat > /etc/sysconfig/iptables << \EOF -A INPUT -i lo -j ACCEPT # vdsm -A INPUT -p tcp --dport 54321 -j ACCEPT -# libvirt --A INPUT -p tcp --dport 16509 -j ACCEPT # libvirt-cim -A INPUT -p tcp --dport 5989 -j ACCEPT # SSH @@ -193,8 +191,6 @@ cat > /etc/sysconfig/ip6tables << \EOF -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT -A INPUT -p ipv6-icmp -j ACCEPT -A INPUT -i lo -j ACCEPT -# libvirt --A INPUT -p tcp --dport 16509 -j ACCEPT # libvirt-cim -A INPUT -p tcp --dport 5989 -j ACCEPT # SSH -- 1.7.6 From mburns at redhat.com Fri Jul 29 12:46:05 2011 From: mburns at redhat.com (Mike Burns) Date: Fri, 29 Jul 2011 08:46:05 -0400 Subject: [Ovirt-devel] [PATCH node] Revert "remove libvirt port from default iptables configuration" Message-ID: <1311943565-4015-1-git-send-email-mburns@redhat.com> This reverts commit 4846dac6be0fe18937b94ced5f4f692970b6d95c. It turns out that vdsm does use the libvirt external port for vm migration, so revert this patch rhbz#715296 Signed-off-by: Mike Burns --- recipe/ovirt16-post.ks | 4 ++++ recipe/rhevh6-post.ks | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/recipe/ovirt16-post.ks b/recipe/ovirt16-post.ks index 0229201..4c9ffd0 100644 --- a/recipe/ovirt16-post.ks +++ b/recipe/ovirt16-post.ks @@ -98,6 +98,8 @@ cat > /etc/sysconfig/iptables << \EOF -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT -A INPUT -p icmp -j ACCEPT -A INPUT -i lo -j ACCEPT +# libvirt +-A INPUT -p tcp --dport 16509 -j ACCEPT # libvirt-cim -A INPUT -p tcp --dport 5989 -j ACCEPT # SSH @@ -123,6 +125,8 @@ cat > /etc/sysconfig/ip6tables << \EOF -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT -A INPUT -p ipv6-icmp -j ACCEPT -A INPUT -i lo -j ACCEPT +# libvirt +-A INPUT -p tcp --dport 16509 -j ACCEPT # libvirt-cim -A INPUT -p tcp --dport 5989 -j ACCEPT # SSH diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks index 8ca69cc..4ffb457 100644 --- a/recipe/rhevh6-post.ks +++ b/recipe/rhevh6-post.ks @@ -166,6 +166,8 @@ cat > /etc/sysconfig/iptables << \EOF -A INPUT -i lo -j ACCEPT # vdsm -A INPUT -p tcp --dport 54321 -j ACCEPT +# libvirt +-A INPUT -p tcp --dport 16509 -j ACCEPT # libvirt-cim -A INPUT -p tcp --dport 5989 -j ACCEPT # SSH @@ -191,6 +193,8 @@ cat > /etc/sysconfig/ip6tables << \EOF -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT -A INPUT -p ipv6-icmp -j ACCEPT -A INPUT -i lo -j ACCEPT +# libvirt +-A INPUT -p tcp --dport 16509 -j ACCEPT # libvirt-cim -A INPUT -p tcp --dport 5989 -j ACCEPT # SSH -- 1.7.4.4 From mburns at redhat.com Fri Jul 29 18:32:58 2011 From: mburns at redhat.com (Mike Burns) Date: Fri, 29 Jul 2011 14:32:58 -0400 Subject: [Ovirt-devel] [PATCH node] fix dracut plugin wildcard handling Message-ID: <1311964378-32686-1-git-send-email-mburns@redhat.com> The plugin was breaking when a device with a wildcard was passed. rhbz#725964 Signed-off-by: Mike Burns --- dracut/install | 1 + dracut/ovirt-cleanup.sh | 8 ++++---- scripts/ovirt-boot-functions | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dracut/install b/dracut/install index f3f2f07..1832b89 100755 --- a/dracut/install +++ b/dracut/install @@ -1,6 +1,7 @@ #!/bin/bash inst yes +inst head inst_hook pre-pivot 01 "$moddir/ovirt-cleanup.sh" inst_simple "$moddir/ovirt-boot-functions" /sbin/ovirt-boot-functions diff --git a/dracut/ovirt-cleanup.sh b/dracut/ovirt-cleanup.sh index 775bcf8..a6762cf 100755 --- a/dracut/ovirt-cleanup.sh +++ b/dracut/ovirt-cleanup.sh @@ -34,9 +34,9 @@ fi # Blank entry will result in getting first disk if getarg storage_init; then - storage_init=$(getarg storage_init) + storage_init="$(sed -r 's/^.*storage_init=([^ ]*) .*$/\1/' /proc/cmdline)" elif getarg ovirt_init; then - storage_init=$(getarg ovirt_init) + storage_init="$(sed -r 's/^.*ovirt_init=([^ ]*) .*$/\1/' /proc/cmdline)" else return 0 fi @@ -49,13 +49,13 @@ fi # would partition sda and sdb as part of HostVG and # sdc and sdd as part of AppVG # Since we only care which disks are being used, change to a single list -storage_init=$(echo $storage_init | sed 's/;/,/') +storage_init="$(echo "$storage_init" | sed 's/;/,/')" oldIFS=$IFS lvm pvscan 2>/dev/null IFS="," -for dev in $storage_init; do +for dev in "$storage_init"; do device=$(IFS=$oldIFS parse_disk_id "$dev") echo "Wiping LVM from device: ${device}" IFS=$oldIFS diff --git a/scripts/ovirt-boot-functions b/scripts/ovirt-boot-functions index 8d9cda6..c7e54af 100644 --- a/scripts/ovirt-boot-functions +++ b/scripts/ovirt-boot-functions @@ -128,7 +128,7 @@ parse_disk_id() { serial=${i#:} ;; /dev/*) - disk="$(ls -1 "$i" 2>/dev/null | grep -m 1 "$dev")" + disk="$(ls -1 "$i" 2>/dev/null | head -n1)" ;; esac if [ -n "$bus" ]; then -- 1.7.4.4 From mburns at redhat.com Fri Jul 29 18:33:58 2011 From: mburns at redhat.com (Mike Burns) Date: Fri, 29 Jul 2011 14:33:58 -0400 Subject: [Ovirt-devel] [PATCH node] Revert "remove libvirt port from default iptables configuration" In-Reply-To: <1311943565-4015-1-git-send-email-mburns@redhat.com> References: <1311943565-4015-1-git-send-email-mburns@redhat.com> Message-ID: <1311964438.3663.4124.camel@beelzebub.mburnsfire.net> NACK Need the libvirt tls port open, not the 16509 Followup patch coming soon. On Fri, 2011-07-29 at 08:46 -0400, Mike Burns wrote: > This reverts commit 4846dac6be0fe18937b94ced5f4f692970b6d95c. > > It turns out that vdsm does use the libvirt external port for > vm migration, so revert this patch > > rhbz#715296 > > Signed-off-by: Mike Burns > --- > recipe/ovirt16-post.ks | 4 ++++ > recipe/rhevh6-post.ks | 4 ++++ > 2 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/recipe/ovirt16-post.ks b/recipe/ovirt16-post.ks > index 0229201..4c9ffd0 100644 > --- a/recipe/ovirt16-post.ks > +++ b/recipe/ovirt16-post.ks > @@ -98,6 +98,8 @@ cat > /etc/sysconfig/iptables << \EOF > -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT > -A INPUT -p icmp -j ACCEPT > -A INPUT -i lo -j ACCEPT > +# libvirt > +-A INPUT -p tcp --dport 16509 -j ACCEPT > # libvirt-cim > -A INPUT -p tcp --dport 5989 -j ACCEPT > # SSH > @@ -123,6 +125,8 @@ cat > /etc/sysconfig/ip6tables << \EOF > -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT > -A INPUT -p ipv6-icmp -j ACCEPT > -A INPUT -i lo -j ACCEPT > +# libvirt > +-A INPUT -p tcp --dport 16509 -j ACCEPT > # libvirt-cim > -A INPUT -p tcp --dport 5989 -j ACCEPT > # SSH > diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks > index 8ca69cc..4ffb457 100644 > --- a/recipe/rhevh6-post.ks > +++ b/recipe/rhevh6-post.ks > @@ -166,6 +166,8 @@ cat > /etc/sysconfig/iptables << \EOF > -A INPUT -i lo -j ACCEPT > # vdsm > -A INPUT -p tcp --dport 54321 -j ACCEPT > +# libvirt > +-A INPUT -p tcp --dport 16509 -j ACCEPT > # libvirt-cim > -A INPUT -p tcp --dport 5989 -j ACCEPT > # SSH > @@ -191,6 +193,8 @@ cat > /etc/sysconfig/ip6tables << \EOF > -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT > -A INPUT -p ipv6-icmp -j ACCEPT > -A INPUT -i lo -j ACCEPT > +# libvirt > +-A INPUT -p tcp --dport 16509 -j ACCEPT > # libvirt-cim > -A INPUT -p tcp --dport 5989 -j ACCEPT > # SSH -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/x-pkcs7-signature Size: 6117 bytes Desc: not available URL: From mburns at redhat.com Fri Jul 29 18:58:06 2011 From: mburns at redhat.com (Mike Burns) Date: Fri, 29 Jul 2011 14:58:06 -0400 Subject: [Ovirt-devel] [PATCH node] Open libvirt tls port in rhevh firewall In-Reply-To: <1311964438.3663.4124.camel@beelzebub.mburnsfire.net> References: <1311964438.3663.4124.camel@beelzebub.mburnsfire.net> Message-ID: <1311965886-3325-1-git-send-email-mburns@redhat.com> rhbz#715296 Signed-off-by: Mike Burns --- recipe/rhevh6-post.ks | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks index 8ca69cc..3329e19 100644 --- a/recipe/rhevh6-post.ks +++ b/recipe/rhevh6-post.ks @@ -166,6 +166,8 @@ cat > /etc/sysconfig/iptables << \EOF -A INPUT -i lo -j ACCEPT # vdsm -A INPUT -p tcp --dport 54321 -j ACCEPT +# libvirt tls +-A INPUT -p tcp --dport 16514 -j ACCEPT # libvirt-cim -A INPUT -p tcp --dport 5989 -j ACCEPT # SSH @@ -191,6 +193,8 @@ cat > /etc/sysconfig/ip6tables << \EOF -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT -A INPUT -p ipv6-icmp -j ACCEPT -A INPUT -i lo -j ACCEPT +# libvirt tls +-A INPUT -p tcp --dport 16514 -j ACCEPT # libvirt-cim -A INPUT -p tcp --dport 5989 -j ACCEPT # SSH -- 1.7.4.4 From mburns at redhat.com Fri Jul 29 19:23:45 2011 From: mburns at redhat.com (Mike Burns) Date: Fri, 29 Jul 2011 15:23:45 -0400 Subject: [Ovirt-devel] [PATCH node] Add debugging info to dracut plugin Message-ID: <1311967425-5751-1-git-send-email-mburns@redhat.com> Signed-off-by: Mike Burns --- dracut/ovirt-cleanup.sh | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dracut/ovirt-cleanup.sh b/dracut/ovirt-cleanup.sh index a6762cf..f800bf2 100755 --- a/dracut/ovirt-cleanup.sh +++ b/dracut/ovirt-cleanup.sh @@ -20,24 +20,29 @@ elif getarg reinstall >/dev/null; then elif getarg uninstall >/dev/null; then fb=$(getarg uninstall) else + info "No firstboot, reinstall or uninstall parameter found" return 0 fi if [ "$fb" = "no" -o "$fb" = 0 ]; then + info "firtboot reinstall or uninstall parameter set to 0 or no, exitting" return 0 fi - +info "Found valid firstboot reinstall or uninstall parameter" # Check storage_init argument # Accept either storage_init or ovirt_init # Prefer storage_init # Blank entry will result in getting first disk -if getarg storage_init; then +if getarg storage_init >/dev/null; then storage_init="$(sed -r 's/^.*storage_init=([^ ]*) .*$/\1/' /proc/cmdline)" -elif getarg ovirt_init; then + info "Found storage_init: $storage_init" +elif getarg ovirt_init >/dev/null; then storage_init="$(sed -r 's/^.*ovirt_init=([^ ]*) .*$/\1/' /proc/cmdline)" + info "Found ovirt_init: $storage_init" else + info "storage_init or ovirt_init arguments not found" return 0 fi @@ -50,6 +55,7 @@ fi # sdc and sdd as part of AppVG # Since we only care which disks are being used, change to a single list storage_init="$(echo "$storage_init" | sed 's/;/,/')" +info "Replaced all ';' with ',' : $storage_init" oldIFS=$IFS @@ -57,14 +63,17 @@ lvm pvscan 2>/dev/null IFS="," for dev in "$storage_init"; do device=$(IFS=$oldIFS parse_disk_id "$dev") + info "After parsing \"$dev\", we got \"$device\"" echo "Wiping LVM from device: ${device}" IFS=$oldIFS for i in $(lvm pvs --noheadings -o pv_name,vg_name --separator=, $device* 2>/dev/null); do pv="${i%%,*}" vg="${i##*,}" if [ -n "$vg" ]; then + info "Found and removing vg: $vg" yes | lvm vgremove -ff "$vg" fi + info "Found and removing pv: $pv" yes | lvm pvremove -ff "$pv" done IFS=, -- 1.7.4.4 From pmyers at redhat.com Sat Jul 30 14:16:20 2011 From: pmyers at redhat.com (Perry Myers) Date: Sat, 30 Jul 2011 10:16:20 -0400 Subject: [Ovirt-devel] oVirt Node Fedora Feature Status Message-ID: <4E341234.1010605@redhat.com> https://fedoraproject.org/wiki/Ovirt_Node_Spin I noticed that virt-manager-tui is in rawhide finally, but the package name implies that it's not going to be in f16? virt-manager-tui.noarch 0.9.0-4.fc17 rawhide Cole, is this intentional or just smth that we need to follow up on? Also, I've noticed that ovirt-node needs refreshing... iirc apevec did tag/release of 2.0.1 from ovirt-node git (as an aside 'News' section of website still says 2.0.0 is latest in git) ovirt-node.noarch 2.0.0-1.fc16 rawhide Alan, what are the current blockers preventing us from getting a 2.0.1 ISO hosted on ovirt.org download page? Lastly... We've gotten approvals from the Design and QE leads for the oVirt Node Spin Feature on their respective mailing lists. But Spin SIG seems to have disbanded. I'm following up with Fedora program manager (cc'd) to see what our next steps can be here. Cheers, Perry From athmane at fedoraproject.org Sat Jul 30 14:24:33 2011 From: athmane at fedoraproject.org (Athmane Madjoudj) Date: Sat, 30 Jul 2011 15:24:33 +0100 Subject: [Ovirt-devel] oVirt Node Fedora Feature Status In-Reply-To: <4E341234.1010605@redhat.com> References: <4E341234.1010605@redhat.com> Message-ID: <4E341421.10102@fedoraproject.org> On 07/30/2011 03:16 PM, Perry Myers wrote: > https://fedoraproject.org/wiki/Ovirt_Node_Spin > > I noticed that virt-manager-tui is in rawhide finally, but the package > name implies that it's not going to be in f16? > virt-manager-tui.noarch 0.9.0-4.fc17 rawhide > > Cole, is this intentional or just smth that we need to follow up on? > > Also, I've noticed that ovirt-node needs refreshing... iirc apevec did > tag/release of 2.0.1 from ovirt-node git (as an aside 'News' section of > website still says 2.0.0 is latest in git) > ovirt-node.noarch 2.0.0-1.fc16 rawhide > > Alan, what are the current blockers preventing us from getting a 2.0.1 > ISO hosted on ovirt.org download page? > > Lastly... We've gotten approvals from the Design and QE leads for the > oVirt Node Spin Feature on their respective mailing lists. But Spin SIG > seems to have disbanded. I'm following up with Fedora program manager > (cc'd) to see what our next steps can be here. > > Cheers, > AFAIK Jared Smith is taking SPIN SIG issue IRC Log: 19:36:00 is ovirt node cloud-sig business ? 19:36:43 athmane: it's more spins-sig business, at the moment, or "what to do in lieu of lack of spins-sig movement" business 19:36:56 i know jsmith is looking into it at the moment. 19:36:57 ok 19:37:22 if it's not getting traction, we could perhaps take a look at it, but let's hold off and see where it gets in the next few days. 19:37:37 but technically it's spins-sig stuffs. 19:37:41 Gimme until early next week to try to get some consensus on what to do to move forward 19:38:12 jsmith: ok -- Athmane Madjoudj From mburns at redhat.com Sat Jul 30 14:30:49 2011 From: mburns at redhat.com (Mike Burns) Date: Sat, 30 Jul 2011 10:30:49 -0400 Subject: [Ovirt-devel] oVirt Node Fedora Feature Status In-Reply-To: <4E341234.1010605@redhat.com> References: <4E341234.1010605@redhat.com> Message-ID: <1312036250.2283.23.camel@mburns-laptop.usersys.redhat.com> On Sat, 2011-07-30 at 10:16 -0400, Perry Myers wrote: > https://fedoraproject.org/wiki/Ovirt_Node_Spin > > I noticed that virt-manager-tui is in rawhide finally, but the package > name implies that it's not going to be in f16? > virt-manager-tui.noarch 0.9.0-4.fc17 rawhide > > Cole, is this intentional or just smth that we need to follow up on? The split for F16 alpha happened this past week which is why rawhide packages are now F17. AFAICT, there aren't F16 repos available yet, but there packages for virt-manager-tui for F16. It just needs karma to be pushed: https://admin.fedoraproject.org/updates/virt-manager-0.9.0-3.fc16 > > Also, I've noticed that ovirt-node needs refreshing... iirc apevec did > tag/release of 2.0.1 from ovirt-node git (as an aside 'News' section of > website still says 2.0.0 is latest in git) > ovirt-node.noarch 2.0.0-1.fc16 rawhide AFAIK, this corresponds to the 2.0.0 tag in master. > > Alan, what are the current blockers preventing us from getting a 2.0.1 > ISO hosted on ovirt.org download page? We just finished the changes for 2.0.1 yesterday, they should be pushed up to master this weekend or Monday at the latest. Then we just need F16 repos to build the ISO and get it hosted. > > Lastly... We've gotten approvals from the Design and QE leads for the > oVirt Node Spin Feature on their respective mailing lists. But Spin SIG > seems to have disbanded. I'm following up with Fedora program manager > (cc'd) to see what our next steps can be here. > > Cheers, > > Perry > > _______________________________________________ > Ovirt-devel mailing list > Ovirt-devel at redhat.com > https://www.redhat.com/mailman/listinfo/ovirt-devel From pmyers at redhat.com Sat Jul 30 14:31:46 2011 From: pmyers at redhat.com (Perry Myers) Date: Sat, 30 Jul 2011 10:31:46 -0400 Subject: [Ovirt-devel] oVirt Node Fedora Feature Status In-Reply-To: <4E341421.10102@fedoraproject.org> References: <4E341234.1010605@redhat.com> <4E341421.10102@fedoraproject.org> Message-ID: <4E3415D2.1000701@redhat.com> >> Lastly... We've gotten approvals from the Design and QE leads for the >> oVirt Node Spin Feature on their respective mailing lists. But Spin SIG >> seems to have disbanded. I'm following up with Fedora program manager >> (cc'd) to see what our next steps can be here. ... > AFAIK Jared Smith is taking SPIN SIG issue > > IRC Log: > > 19:36:00 is ovirt node cloud-sig business ? > 19:36:43 athmane: it's more spins-sig business, at the > moment, or "what to do in lieu of lack of spins-sig movement" business > 19:36:56 i know jsmith is looking into it at the moment. > 19:36:57 ok > 19:37:22 if it's not getting traction, we could perhaps take > a look at it, but let's hold off and see where it gets in the next few > days. > 19:37:37 but technically it's spins-sig stuffs. > 19:37:41 Gimme until early next week to try to get some > consensus on what to do to move forward > 19:38:12 jsmith: ok Thanks for the context here. Based on Bruno's last comment on the spin sig list, the sig is basically saying that oVirt Node doesn't qualify as a spin and therefore is not in their jurisdiction to make a decision on: http://lists.fedoraproject.org/pipermail/fedora-spins/2011-July/002036.html http://lists.fedoraproject.org/pipermail/fedora-spins/2011-July/002037.html From pmyers at redhat.com Sat Jul 30 14:38:35 2011 From: pmyers at redhat.com (Perry Myers) Date: Sat, 30 Jul 2011 10:38:35 -0400 Subject: [Ovirt-devel] oVirt Node Fedora Feature Status In-Reply-To: <1312036250.2283.23.camel@mburns-laptop.usersys.redhat.com> References: <4E341234.1010605@redhat.com> <1312036250.2283.23.camel@mburns-laptop.usersys.redhat.com> Message-ID: <4E34176B.1070507@redhat.com> > The split for F16 alpha happened this past week which is why rawhide > packages are now F17. AFAICT, there aren't F16 repos available yet, but > there packages for virt-manager-tui for F16. It just needs karma to be > pushed: > > https://admin.fedoraproject.org/updates/virt-manager-0.9.0-3.fc16 Ah, thx, that explains it. Obviously we'll need to get that karma'd up so we can do official F16 oVirt Node builds >> Also, I've noticed that ovirt-node needs refreshing... iirc apevec did >> tag/release of 2.0.1 from ovirt-node git (as an aside 'News' section of >> website still says 2.0.0 is latest in git) >> ovirt-node.noarch 2.0.0-1.fc16 rawhide > > AFAIK, this corresponds to the 2.0.0 tag in master. >> >> Alan, what are the current blockers preventing us from getting a 2.0.1 >> ISO hosted on ovirt.org download page? > > We just finished the changes for 2.0.1 yesterday, they should be pushed > up to master this weekend or Monday at the latest. Then we just need > F16 repos to build the ISO and get it hosted. We should probably have hosted on ovirt.org site both F and rawhide anyhow. So we can do rawhide build next week as soon as 2.0.1 is tagged in master and ovirt-node is updated to 2.0.1 in rawhide. I'd expect the rawhide oVirt Node to be broken frequently, but hey, it's rawhide :) Once F16 repos are open, we can update ovirt-node there to 2.0.1 as well and then build F16 Node from those repos. Cheers, Perry From mburns at redhat.com Sat Jul 30 15:56:22 2011 From: mburns at redhat.com (Mike Burns) Date: Sat, 30 Jul 2011 11:56:22 -0400 Subject: [Ovirt-devel] [PATCH node] Update rawhide to F17 Message-ID: <1312041382-13136-1-git-send-email-mburns@redhat.com> Also add kickstarts for F17 Signed-off-by: Mike Burns --- recipe/Makefile.am | 2 +- recipe/ovirt17-install.ks | 1 + recipe/ovirt17-minimizer.ks | 1 + recipe/ovirt17-pkgs.ks | 1 + recipe/ovirt17-post.ks | 1 + 5 files changed, 5 insertions(+), 1 deletions(-) create mode 120000 recipe/ovirt17-install.ks create mode 120000 recipe/ovirt17-minimizer.ks create mode 120000 recipe/ovirt17-pkgs.ks create mode 120000 recipe/ovirt17-post.ks diff --git a/recipe/Makefile.am b/recipe/Makefile.am index 060fa19..b28203c 100644 --- a/recipe/Makefile.am +++ b/recipe/Makefile.am @@ -26,7 +26,7 @@ DISTRO = @DISTRO@ ARCH = $(shell rpm --eval '%{_arch}') FEDORA_MIRROR = http://mirrors.fedoraproject.org/mirrorlist -CUR_RAWHIDE = 16 +CUR_RAWHIDE = 17 CUR_DEVEL = 16 OVIRT_NODE_TOOLSdir = $(datadir)/ovirt-node-tools diff --git a/recipe/ovirt17-install.ks b/recipe/ovirt17-install.ks new file mode 120000 index 0000000..e4c5c3c --- /dev/null +++ b/recipe/ovirt17-install.ks @@ -0,0 +1 @@ +ovirt16-install.ks \ No newline at end of file diff --git a/recipe/ovirt17-minimizer.ks b/recipe/ovirt17-minimizer.ks new file mode 120000 index 0000000..df499c3 --- /dev/null +++ b/recipe/ovirt17-minimizer.ks @@ -0,0 +1 @@ +ovirt16-minimizer.ks \ No newline at end of file diff --git a/recipe/ovirt17-pkgs.ks b/recipe/ovirt17-pkgs.ks new file mode 120000 index 0000000..4259f04 --- /dev/null +++ b/recipe/ovirt17-pkgs.ks @@ -0,0 +1 @@ +ovirt16-pkgs.ks \ No newline at end of file diff --git a/recipe/ovirt17-post.ks b/recipe/ovirt17-post.ks new file mode 120000 index 0000000..8d669fa --- /dev/null +++ b/recipe/ovirt17-post.ks @@ -0,0 +1 @@ +ovirt16-post.ks \ No newline at end of file -- 1.7.4.4 From apevec at gmail.com Sat Jul 30 21:57:19 2011 From: apevec at gmail.com (Alan Pevec) Date: Sat, 30 Jul 2011 23:57:19 +0200 Subject: [Ovirt-devel] [PATCH node] Update rawhide to F17 In-Reply-To: <1312041382-13136-1-git-send-email-mburns@redhat.com> References: <1312041382-13136-1-git-send-email-mburns@redhat.com> Message-ID: ACK - I pushed this and previous patches and tagged v2.0.1 As Mike noted, F16 repos are not there yet and rawhide ISO with kernel-3.1.0-0.rc0.git9.1.fc17 doesn't boot. We should have a working image ready in few days when F16 repos are available. Alan