Ovirt devel - Aug 2009 - [PATCH server] remove appliance bits

This removes the appliance configuration bits from the installer and associated
files since it has been deprecated

---
 installer/modules/ovirt/files/cobbler-import       |    6 -
 .../modules/ovirt/files/ovirt-appliance-setup      |    4 -
 installer/modules/ovirt/files/ovirt-storage        |   73 ----------
 installer/modules/ovirt/manifests/appliance.pp     |  152 --------------------
 4 files changed, 0 insertions(+), 235 deletions(-)
 delete mode 100755 installer/modules/ovirt/files/ovirt-appliance-setup
 delete mode 100755 installer/modules/ovirt/files/ovirt-storage
 delete mode 100644 installer/modules/ovirt/manifests/appliance.pp

diff --git a/installer/modules/ovirt/files/cobbler-import
b/installer/modules/ovirt/files/cobbler-import
index 126cfaf..fd0f0ec 100755
--- a/installer/modules/ovirt/files/cobbler-import
+++ b/installer/modules/ovirt/files/cobbler-import
@@ -49,12 +49,6 @@ cobbler distro add --name="oVirt-Node-$node_arch"
--arch=$node_arch \
     --kopts="rootflags=loop root=/ovirt-node-image.iso rootfstype=iso9660
ro console=tty0 console=ttyS0,115200n8"
 
 cobbler profile add --name=oVirt-Node-$node_arch --distro=oVirt-Node-$node_arch
-cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$node_arch \
-    --name=node3 --mac=00:16:3e:12:34:57
-cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$node_arch \
-    --name=node4 --mac=00:16:3e:12:34:58 --kopts="ovirt_init=scsi
ovirt_local_boot"
-cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$node_arch \
-    --name=node5 --mac=00:16:3e:12:34:59 --kopts="ovirt_init=scsi"
 
 sed -i -e '/kernel /a \\tIPAPPEND 2'
/etc/cobbler/pxe/pxesystem.template
 sed -i -e "s/^ONTIMEOUT.*/ONTIMEOUT oVirt-Node-$node_arch/" \
diff --git a/installer/modules/ovirt/files/ovirt-appliance-setup
b/installer/modules/ovirt/files/ovirt-appliance-setup
deleted file mode 100755
index 98263c4..0000000
--- a/installer/modules/ovirt/files/ovirt-appliance-setup
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-for i in `seq 1 5`; do /bin/dd if=/dev/null of=/ovirtiscsi/iSCSI$i bs=1 count=1
seek=5G; done
-for i in `seq 1 5`; do /bin/dd if=/dev/zero of=/ovirtnfs/disk$i.dsk bs=1
count=1 seek=5G; done
-
diff --git a/installer/modules/ovirt/files/ovirt-storage
b/installer/modules/ovirt/files/ovirt-storage
deleted file mode 100755
index e923500..0000000
--- a/installer/modules/ovirt/files/ovirt-storage
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-#
-# ovirt-storage Set up storage for oVirt Server Appliance
-#
-# chkconfig: 3 96 4
-# description: oVirt Appliance Storage Services
-#
-
-# Source functions library
-. /etc/init.d/functions
-TARGET_ID=32101
-
-prog="ovirt-storage"
-num_iscsi_luns=5
-
-start() {
-    echo -n "Starting $prog: "
-
-    # Set up the fake iscsi target
-    tgtadm --lld iscsi --op new --mode target --tid $TARGET_ID \
-        -T ovirtpriv:storage
-
-    #
-    # Now associate them to the LVs
-    #
-    for i in `seq 1 $num_iscsi_luns` ; do
-        tgtadm --lld iscsi --op new --mode logicalunit --tid $TARGET_ID \
-            --lun $i -b /ovirtiscsi/iSCSI$i
-    done
-
-    #
-    # Now make them available
-    #
-    tgtadm --lld iscsi --op bind --mode target --tid $TARGET_ID -I ALL
-
-    echo_success
-    echo
-}
-
-stop() {
-    echo -n "Stopping $prog: "
-
-    # stop access to the iscsi target
-    tgtadm --lld iscsi --op unbind --mode target --tid $TARGET_ID -I ALL
-
-    # unbind the LUNs
-    for i in `seq 1 $num_iscsi_luns` ; do
-        tgtadm --lld iscsi --op delete --mode logicalunit --tid $TARGET_ID
--lun $i
-    done
-
-    # shutdown the target
-    tgtadm --lld iscsi --op delete --mode target --tid $TARGET_ID
-
-    echo_success
-    echo
-}
-
-case "$1" in
-    start)
-        start
-        ;;
-    stop)
-        stop
-        ;;
-    restart)
-        stop
-        start
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|restart}"
-        exit 2
-esac
-
diff --git a/installer/modules/ovirt/manifests/appliance.pp
b/installer/modules/ovirt/manifests/appliance.pp
deleted file mode 100644
index 474d1df..0000000
--- a/installer/modules/ovirt/manifests/appliance.pp
+++ /dev/null
@@ -1,152 +0,0 @@
-#--
-#  Copyright (C) 2008 Red Hat Inc.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
-#
-# Author: Joey Boggs <jboggs at redhat.com>
-#--
-
-class appliance::bundled {
-
-$nfs_changes = [
-    "set /files/etc/sysconfig/nfs/MOUNTD_PORT 892"
-]
-
-augeas {"nfs_config":
-    changes => $nfs_changes,
-    notify => Service["nfs"]
-}
-
-$nfslock_changes = [
-    "set /files/etc/sysconfig/nfs/LOCKD_TCPPORT 32803",
-    "set /files/etc/sysconfig/nfs/LOCKD_UDPPORT 32769",
-    "set /files/etc/sysconfig/nfs/STATD_PORT 662"
-]
-
-augeas {"nfslock_config":
-    changes => $nfslock_changes,
-    notify => Service["nfslock"]
-}
-
-firewall_rule {"tgtd": destination_port => '3260'}
-firewall_rule {"nfsd": destination_port => '2049'}
-firewall_rule {"rpcbind": destination_port => '111'}
-firewall_rule {"rpcbind-udp": destination_port => '111',
protocol => 'udp'}
-firewall_rule {"rpc.mountd": destination_port => '892'}
-firewall_rule {"rpc.mountd-udp": destination_port =>
'892', protocol => 'udp'}
-firewall_rule {"rpc.statd": destination_port => '662'}
-firewall_rule {"rpc.statd-udp": destination_port => '662',
protocol => 'udp'}
-
-service {"nfs":
-    ensure => "running",
-    enable => true,
-    require => Service["network"]
-}
-
-service {"nfslock":
-    ensure => "running",
-    enable => true
-}
-
-service {"network":
-    ensure => "running",
-    enable => true
-}
-
-file{"/mnt/data/ovirtiscsi":
-    ensure => directory
-}
-
-file{"/ovirtiscsi":
-    ensure => directory
-}
-
-file{"/ovirtnfs":
-    ensure => directory
-}
-
-file{"/mnt/data/ovirtnfs":
-    ensure => directory
-}
-
-mount{"/ovirtiscsi":
-    atboot => true,
-    ensure => mounted,
-    fstype => bind,
-    options => bind,
-    device => "/mnt/data/ovirtiscsi",
-    require =>
[File["/mnt/data/ovirtiscsi"],File["/ovirtiscsi"]]
-}
-
-mount{"/ovirtnfs":
-    atboot => true,
-    ensure => mounted,
-    fstype => bind,
-    options => bind,
-    device => "/mnt/data/ovirtnfs",
-    require =>
[File["/mnt/data/ovirtnfs"],File["/ovirtnfs"]]
-}
-
-file {"/usr/sbin/ovirt-appliance-setup":
-    source => "puppet:///ovirt/ovirt-appliance-setup",
-    mode => 755
-}
-
-single_exec{"ovirtnfs_export":
-    command => '/bin/echo "/ovirtnfs
192.168.50.0/24(rw,no_root_squash)" >> /etc/exports',
-    notify => Service[nfs]
-}
-
-file{"/mnt/data/cobblernfs":
-    ensure => directory
-}
-
-file{"/cobblernfs":
-    ensure => directory
-}
-
-mount{"/cobblernfs":
-    atboot => true,
-    ensure => mounted,
-    fstype => bind,
-    options => bind,
-    device => "/mnt/data/ovirtnfs",
-    require =>
[File["/mnt/data/ovirtnfs"],File["/cobblernfs"]]
-}
-
-single_exec{"cobbler_nfs_export":
-    command => '/bin/echo "/cobblernfs
192.168.50.0/24(rw,no_root_squash)" >> /etc/exports',
-    notify => Service[nfs],
-    require => Mount["/cobblernfs"]
-}
-
-
-file {"/etc/init.d/ovirt-storage":
-	source => "puppet:///ovirt/ovirt-storage",
-	mode => 755
-}
-
-single_exec{"ovirt-appliance-setup":
-    command => "/usr/sbin/ovirt-appliance-setup",
-    require => File["/usr/sbin/ovirt-appliance-setup"]
-    }
-
-service {"ovirt-storage":
-    ensure => "running",
-    enable => true,
-    require =>
[File["/etc/init.d/ovirt-storage"],Single_exec["ovirt-appliance-setup"]]
-}
-
-}
-- 
1.6.2.5

Joey Boggs wrote:
> This removes the appliance configuration bits from the installer and
associated files since it has been deprecated
>
> ---
>  installer/modules/ovirt/files/cobbler-import       |    6 -
>  .../modules/ovirt/files/ovirt-appliance-setup      |    4 -
>  installer/modules/ovirt/files/ovirt-storage        |   73 ----------
>  installer/modules/ovirt/manifests/appliance.pp     |  152
--------------------
>  4 files changed, 0 insertions(+), 235 deletions(-)
>  delete mode 100755 installer/modules/ovirt/files/ovirt-appliance-setup
>  delete mode 100755 installer/modules/ovirt/files/ovirt-storage
>  delete mode 100644 installer/modules/ovirt/manifests/appliance.pp
>
> diff --git a/installer/modules/ovirt/files/cobbler-import
b/installer/modules/ovirt/files/cobbler-import
> index 126cfaf..fd0f0ec 100755
> --- a/installer/modules/ovirt/files/cobbler-import
> +++ b/installer/modules/ovirt/files/cobbler-import
> @@ -49,12 +49,6 @@ cobbler distro add
--name="oVirt-Node-$node_arch" --arch=$node_arch \
>      --kopts="rootflags=loop root=/ovirt-node-image.iso
rootfstype=iso9660 ro console=tty0 console=ttyS0,115200n8"
>  
>  cobbler profile add --name=oVirt-Node-$node_arch
--distro=oVirt-Node-$node_arch
> -cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$node_arch \
> -    --name=node3 --mac=00:16:3e:12:34:57
> -cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$node_arch \
> -    --name=node4 --mac=00:16:3e:12:34:58 --kopts="ovirt_init=scsi
ovirt_local_boot"
> -cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$node_arch \
> -    --name=node5 --mac=00:16:3e:12:34:59
--kopts="ovirt_init=scsi"
>  
>  sed -i -e '/kernel /a \\tIPAPPEND 2'
/etc/cobbler/pxe/pxesystem.template
>  sed -i -e "s/^ONTIMEOUT.*/ONTIMEOUT oVirt-Node-$node_arch/" \
> diff --git a/installer/modules/ovirt/files/ovirt-appliance-setup
b/installer/modules/ovirt/files/ovirt-appliance-setup
> deleted file mode 100755
> index 98263c4..0000000
> --- a/installer/modules/ovirt/files/ovirt-appliance-setup
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -#!/bin/bash
> -for i in `seq 1 5`; do /bin/dd if=/dev/null of=/ovirtiscsi/iSCSI$i bs=1
count=1 seek=5G; done
> -for i in `seq 1 5`; do /bin/dd if=/dev/zero of=/ovirtnfs/disk$i.dsk bs=1
count=1 seek=5G; done
> -
> diff --git a/installer/modules/ovirt/files/ovirt-storage
b/installer/modules/ovirt/files/ovirt-storage
> deleted file mode 100755
> index e923500..0000000
> --- a/installer/modules/ovirt/files/ovirt-storage
> +++ /dev/null
> @@ -1,73 +0,0 @@
> -#!/bin/bash
> -#
> -# ovirt-storage Set up storage for oVirt Server Appliance
> -#
> -# chkconfig: 3 96 4
> -# description: oVirt Appliance Storage Services
> -#
> -
> -# Source functions library
> -. /etc/init.d/functions
> -TARGET_ID=32101
> -
> -prog="ovirt-storage"
> -num_iscsi_luns=5
> -
> -start() {
> -    echo -n "Starting $prog: "
> -
> -    # Set up the fake iscsi target
> -    tgtadm --lld iscsi --op new --mode target --tid $TARGET_ID \
> -        -T ovirtpriv:storage
> -
> -    #
> -    # Now associate them to the LVs
> -    #
> -    for i in `seq 1 $num_iscsi_luns` ; do
> -        tgtadm --lld iscsi --op new --mode logicalunit --tid $TARGET_ID \
> -            --lun $i -b /ovirtiscsi/iSCSI$i
> -    done
> -
> -    #
> -    # Now make them available
> -    #
> -    tgtadm --lld iscsi --op bind --mode target --tid $TARGET_ID -I ALL
> -
> -    echo_success
> -    echo
> -}
> -
> -stop() {
> -    echo -n "Stopping $prog: "
> -
> -    # stop access to the iscsi target
> -    tgtadm --lld iscsi --op unbind --mode target --tid $TARGET_ID -I ALL
> -
> -    # unbind the LUNs
> -    for i in `seq 1 $num_iscsi_luns` ; do
> -        tgtadm --lld iscsi --op delete --mode logicalunit --tid $TARGET_ID
--lun $i
> -    done
> -
> -    # shutdown the target
> -    tgtadm --lld iscsi --op delete --mode target --tid $TARGET_ID
> -
> -    echo_success
> -    echo
> -}
> -
> -case "$1" in
> -    start)
> -        start
> -        ;;
> -    stop)
> -        stop
> -        ;;
> -    restart)
> -        stop
> -        start
> -        ;;
> -    *)
> -        echo "Usage: $0 {start|stop|restart}"
> -        exit 2
> -esac
> -
> diff --git a/installer/modules/ovirt/manifests/appliance.pp
b/installer/modules/ovirt/manifests/appliance.pp
> deleted file mode 100644
> index 474d1df..0000000
> --- a/installer/modules/ovirt/manifests/appliance.pp
> +++ /dev/null
> @@ -1,152 +0,0 @@
> -#--
> -#  Copyright (C) 2008 Red Hat Inc.
> -#
> -#  This library is free software; you can redistribute it and/or
> -#  modify it under the terms of the GNU Lesser General Public
> -#  License as published by the Free Software Foundation; either
> -#  version 2.1 of the License, or (at your option) any later version.
> -#
> -#  This library is distributed in the hope that it will be useful,
> -#  but WITHOUT ANY WARRANTY; without even the implied warranty of
> -#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -#  Lesser General Public License for more details.
> -#
> -#  You should have received a copy of the GNU Lesser General Public
> -#  License along with this library; if not, write to the Free Software
> -#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 
USA
> -#
> -# Author: Joey Boggs <jboggs at redhat.com>
> -#--
> -
> -class appliance::bundled {
> -
> -$nfs_changes = [
> -    "set /files/etc/sysconfig/nfs/MOUNTD_PORT 892"
> -]
> -
> -augeas {"nfs_config":
> -    changes => $nfs_changes,
> -    notify => Service["nfs"]
> -}
> -
> -$nfslock_changes = [
> -    "set /files/etc/sysconfig/nfs/LOCKD_TCPPORT 32803",
> -    "set /files/etc/sysconfig/nfs/LOCKD_UDPPORT 32769",
> -    "set /files/etc/sysconfig/nfs/STATD_PORT 662"
> -]
> -
> -augeas {"nfslock_config":
> -    changes => $nfslock_changes,
> -    notify => Service["nfslock"]
> -}
> -
> -firewall_rule {"tgtd": destination_port => '3260'}
> -firewall_rule {"nfsd": destination_port => '2049'}
> -firewall_rule {"rpcbind": destination_port => '111'}
> -firewall_rule {"rpcbind-udp": destination_port =>
'111', protocol => 'udp'}
> -firewall_rule {"rpc.mountd": destination_port =>
'892'}
> -firewall_rule {"rpc.mountd-udp": destination_port =>
'892', protocol => 'udp'}
> -firewall_rule {"rpc.statd": destination_port =>
'662'}
> -firewall_rule {"rpc.statd-udp": destination_port =>
'662', protocol => 'udp'}
> -
> -service {"nfs":
> -    ensure => "running",
> -    enable => true,
> -    require => Service["network"]
> -}
> -
> -service {"nfslock":
> -    ensure => "running",
> -    enable => true
> -}
> -
> -service {"network":
> -    ensure => "running",
> -    enable => true
> -}
> -
> -file{"/mnt/data/ovirtiscsi":
> -    ensure => directory
> -}
> -
> -file{"/ovirtiscsi":
> -    ensure => directory
> -}
> -
> -file{"/ovirtnfs":
> -    ensure => directory
> -}
> -
> -file{"/mnt/data/ovirtnfs":
> -    ensure => directory
> -}
> -
> -mount{"/ovirtiscsi":
> -    atboot => true,
> -    ensure => mounted,
> -    fstype => bind,
> -    options => bind,
> -    device => "/mnt/data/ovirtiscsi",
> -    require =>
[File["/mnt/data/ovirtiscsi"],File["/ovirtiscsi"]]
> -}
> -
> -mount{"/ovirtnfs":
> -    atboot => true,
> -    ensure => mounted,
> -    fstype => bind,
> -    options => bind,
> -    device => "/mnt/data/ovirtnfs",
> -    require =>
[File["/mnt/data/ovirtnfs"],File["/ovirtnfs"]]
> -}
> -
> -file {"/usr/sbin/ovirt-appliance-setup":
> -    source => "puppet:///ovirt/ovirt-appliance-setup",
> -    mode => 755
> -}
> -
> -single_exec{"ovirtnfs_export":
> -    command => '/bin/echo "/ovirtnfs
192.168.50.0/24(rw,no_root_squash)" >> /etc/exports',
> -    notify => Service[nfs]
> -}
> -
> -file{"/mnt/data/cobblernfs":
> -    ensure => directory
> -}
> -
> -file{"/cobblernfs":
> -    ensure => directory
> -}
> -
> -mount{"/cobblernfs":
> -    atboot => true,
> -    ensure => mounted,
> -    fstype => bind,
> -    options => bind,
> -    device => "/mnt/data/ovirtnfs",
> -    require =>
[File["/mnt/data/ovirtnfs"],File["/cobblernfs"]]
> -}
> -
> -single_exec{"cobbler_nfs_export":
> -    command => '/bin/echo "/cobblernfs
192.168.50.0/24(rw,no_root_squash)" >> /etc/exports',
> -    notify => Service[nfs],
> -    require => Mount["/cobblernfs"]
> -}
> -
> -
> -file {"/etc/init.d/ovirt-storage":
> -	source => "puppet:///ovirt/ovirt-storage",
> -	mode => 755
> -}
> -
> -single_exec{"ovirt-appliance-setup":
> -    command => "/usr/sbin/ovirt-appliance-setup",
> -    require => File["/usr/sbin/ovirt-appliance-setup"]
> -    }
> -
> -service {"ovirt-storage":
> -    ensure => "running",
> -    enable => true,
> -    require =>
[File["/etc/init.d/ovirt-storage"],Single_exec["ovirt-appliance-setup"]]
> -}
> -
> -}
>   
any oppositions to this edit? if not I will push in a few days