From 1eb1eae67288b856d8e94b1d81cf1612c16f52b6 Mon Sep 17 00:00:00 2001 From: Ben Kero Date: Mon, 23 Nov 2009 11:10:06 -0800 Subject: [PATCH 2/2] Alter files to remove cell content --- cfengine/inputs/cf.arch | 9 +---- cfengine/inputs/cf.boot | 3 -- cfengine/inputs/cf.classes | 9 ++--- cfengine/inputs/cf.hosts | 3 -- cfengine/inputs/cf.misc | 2 +- cfengine/inputs/cf.nfs | 20 +---------- cfengine/inputs/cf.packages-gentoo | 5 --- cfengine/inputs/cf.powerdev | 71 ------------------------------------ cfengine/inputs/cfrun.hosts | 3 -- 9 files changed, 6 insertions(+), 119 deletions(-) diff --git a/cfengine/inputs/cf.arch b/cfengine/inputs/cf.arch index 7fc0678..1584dff 100644 --- a/cfengine/inputs/cf.arch +++ b/cfengine/inputs/cf.arch @@ -187,13 +187,6 @@ copy: server=$(gold) define=update_make_conf - arch_cell.gentoo:: - $(masterfiles)/etc/make.conf.d/arch.conf.cell - dest=/etc/make.conf.d/arch.conf - mode=644 - server=$(gold) - define=update_make_conf - files: any:: @@ -256,7 +249,7 @@ links: profile_2007_0.ppc64.arch_power5:: /etc/make.profile ->! ../usr/portage/profiles/default-linux/ppc/ppc64/2007.0/64bit-userland/power5 - profile_2007_0.ppc64.(arch_cell|arch_g5):: + profile_2007_0.ppc64.arch_g5:: /etc/make.profile ->! ../usr/portage/profiles/default-linux/ppc/ppc64/2007.0/64bit-userland profile_10_0.ppc64:: diff --git a/cfengine/inputs/cf.boot b/cfengine/inputs/cf.boot index eb9c807..e7bd55a 100644 --- a/cfengine/inputs/cf.boot +++ b/cfengine/inputs/cf.boot @@ -214,9 +214,6 @@ packages: # ebuild based kernels - service_buildkernel.ppc64.arch_cell:: - sys-kernel/kernel-cell-ppc64 cmp=ge version=2.6.27_p1-r8 action=install elsedefine=update_yaboot_conf - service_grub.guest.x86_32:: sys-kernel/kernel-virt-x86 cmp=ge version=2.6.28_p2-r7 action=install elsedefine=update_grub_conf diff --git a/cfengine/inputs/cf.classes b/cfengine/inputs/cf.classes index 548bd6f..9cfb3d1 100644 --- a/cfengine/inputs/cf.classes +++ b/cfengine/inputs/cf.classes @@ -119,8 +119,7 @@ groups: www_inkscape_org www1_mozillazine_org www2_mozillazine_org www_phpbb_com yang yin yum util_drupal_org ) - service_powerdev = ( chestnut hazelnut hickory pecan walnut ) - service_powerdev_nfsclient = ( chestnut pecan ) + service_powerdev = ( hazelnut hickory ) service_ldap_login = ( service_cs312 service_oslrelay service_powerdev drupal_web_node ash backup backup2 bigleaf bigscreen castor cholula dspace efs @@ -167,7 +166,7 @@ groups: service_netboot = ( oak ) service_nfs = ( service_netboot hazelnut www1_drupal_org www1_mozillazine_org pg1 ) - service_nfsclient = ( service_powerdev_nfsclient www2_drupal_org + service_nfsclient = ( www2_drupal_org www3_drupal_org www4_drupal_org www5_drupal_org mail_drupal_org www2_mozillazine_org pg2 util_drupal_org ) service_tor = ( nohosts ) @@ -177,7 +176,6 @@ groups: kt1 larch madrone oooapps pcc www1_mozillazine_org www_phpbb_com ) service_virus = ( service_oslrelay galena oooapps umpqua vapor yin ) - service_autofs = ( service_powerdev_nfsclient ) service_mdadm = ( backup dogwood_osuosl_org lodgepole ns1 ns2 ns3 shore yang yin ) service_dns_cache = ( service_oslrelay ) @@ -325,8 +323,7 @@ groups: arch_x86_64 = ( x86_64 ) arch_g5 = ( hickory ) arch_power5 = ( hazelnut ) - arch_cell = ( chestnut pecan walnut ) - arch_ppc64 = ( ppc64 -arch_power5 -arch_g5 -arch_cell ) # catch all for ppc64 + arch_ppc64 = ( ppc64 -arch_power5 -arch_g5 ) # catch all for ppc64 # enable extra NRPE commands for monitoring hardware and such check_hpadu = ( hardware_hp_raid chinkapin ftp_atl ftp_nyc diff --git a/cfengine/inputs/cf.hosts b/cfengine/inputs/cf.hosts index 246e6c5..50b9fb9 100644 --- a/cfengine/inputs/cf.hosts +++ b/cfengine/inputs/cf.hosts @@ -207,9 +207,6 @@ import: vapor_osuosl_org:: hosts/cf.vapor - walnut_osuosl_org:: - hosts/cf.walnut - umpqua_orvsd_org:: hosts/cf.umpqua diff --git a/cfengine/inputs/cf.misc b/cfengine/inputs/cf.misc index d55d61d..c211b0e 100644 --- a/cfengine/inputs/cf.misc +++ b/cfengine/inputs/cf.misc @@ -464,7 +464,7 @@ editfiles: EndGroup } - arch_power5|arch_cell:: + arch_power5:: { /etc/inittab SetCommentStart '#' UnCommentLinesMatching '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' diff --git a/cfengine/inputs/cf.nfs b/cfengine/inputs/cf.nfs index f2283e8..147e2d9 100644 --- a/cfengine/inputs/cf.nfs +++ b/cfengine/inputs/cf.nfs @@ -1,6 +1,6 @@ control: - AddInstallable = ( bounce_autofs bounce_nfs update_initd ) + AddInstallable = ( bounce_nfs update_initd ) packages: @@ -14,12 +14,6 @@ packages: (service_nfs|service_nfsclient).fedora_11:: nfs-utils action=install - service_autofs.gentoo:: - net-fs/autofs cmp=ge version=5.0.3-r6 action=install - - service_autofs.fedora:: - autofs action=install - copy: service_nfs.gentoo:: @@ -47,20 +41,11 @@ copy: mode=750 server=$(gold) -processes: - - service_autofs.!install_only:: - "automount$" - restart "$(initd) autofs stopstart" - shellcommands: service_nfs.bounce_nfs.!install_only.gentoo:: "$(initd) nfs reload" - service_autofs.bounce_autofs.!install_only:: - "$(initd) autofs restart" - files: service_nfs.gentoo:: @@ -68,6 +53,3 @@ files: (service_nfs|service_nfsclient).gentoo:: $(rcdir)/on/portmap action=touch mode=644 define=update_initd - - service_autofs:: - $(rcdir)/on/autofs action=touch mode=644 define=update_initd diff --git a/cfengine/inputs/cf.packages-gentoo b/cfengine/inputs/cf.packages-gentoo index 0bf2822..3b963a2 100644 --- a/cfengine/inputs/cf.packages-gentoo +++ b/cfengine/inputs/cf.packages-gentoo @@ -301,11 +301,6 @@ packages: package_irssi:: net-irc/irssi cmp=ge version=0.8.13-r1 action=install - # arch_cell specific packages - arch_cell:: - # include tools like update_firmware for updating the bios - sys-apps/ibm-powerpc-utils-papr action=install - # arch_power5 specific packages arch_power5:: # SCSI controller tools diff --git a/cfengine/inputs/cf.powerdev b/cfengine/inputs/cf.powerdev index 6ce8ced..d3186c1 100644 --- a/cfengine/inputs/cf.powerdev +++ b/cfengine/inputs/cf.powerdev @@ -118,40 +118,12 @@ copy: mode=644 server=$(gold) - service_powerdev.pecan_osuosl_org:: - $(masterfiles)/etc/cron.d/powerdev/users-pecan - dest=/etc/cron.d/users-pecan - mode=644 - server=$(gold) - - service_powerdev.chestnut_osuosl_org:: - $(masterfiles)/etc/cron.d/powerdev/users-chestnut - dest=/etc/cron.d/users-chestnut - mode=644 - server=$(gold) - service_powerdev.hickory_osuosl_org:: $(masterfiles)/etc/cron.d/powerdev/users-hickory dest=/etc/cron.d/users-hickory mode=644 server=$(gold) - # IBM Cell/BE SDK Repos - service_powerdev.arch_cell.fedora:: - $(masterfiles)/etc/pki/rpm-gpg/ - dest=/etc/pki/rpm-gpg/ - include=*cellsdk - include=*cellsdk* - r=1 - mode=644 - server=$(gold) - define=import_gpg_cell - - $(masterfiles)/etc/yum.repos.d/fedora/cellsdk-Fedora.repo - dest=/etc/yum.repos.d/cellsdk-Fedora.repo - mode=644 - server=$(gold) - # default bashrc for powerdev nfs servers to make things like fedora happy service_powerdev.hazelnut_osuosl_org:: $(masterfiles)/etc/skel/dotbashrc/powerdev @@ -159,39 +131,6 @@ copy: mode=644 server=$(gold) - service_powerdev_nfsclient:: - $(masterfiles)/etc/auto.master/powerdev - dest=/etc/auto.master - mode=644 - server=$(gold) - define=bounce_autofs - - $(masterfiles)/etc/auto.home/powerdev - dest=/etc/auto.home - mode=644 - server=$(gold) - define=bounce_autofs - - $(masterfiles)/etc/cron.hourly/powerdev/create-datadirs - dest=/etc/cron.hourly/create-datadirs - mode=750 - server=$(gold) - - service_powerdev.arch_cell:: - $(restrictedfiles)/etc/ssh/hostkeys/ibmcell - dest=/etc/ssh/ - include=ssh_host_*_key - r=1 - mode=600 - server=$(gold) - - $(restrictedfiles)/etc/ssh/hostkeys/ibmcell - dest=/etc/ssh/ - include=ssh_host_*_key.pub - r=1 - mode=644 - server=$(gold) - files: service_powerdev:: @@ -241,17 +180,7 @@ packages: perl-Digest-SHA1 action=install tcl-devel action=install - # Cell SDK - cell-early-license elsedefine=install_cellsdk - shellcommands: service_powerdev.update_issue:: "/usr/local/sbin/update-powerdev-issue" - - service_powerdev.import_gpg_cell.fedora:: - "/bin/rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-cellsdk" - "/bin/rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-cellsdk-open" - - service_powerdev.install_cellsdk.fedora:: - "$(yum) --enablerepo=CellSDK-Open-Fedora-cbea groupinstall cellsdk" diff --git a/cfengine/inputs/cfrun.hosts b/cfengine/inputs/cfrun.hosts index d0a130f..bebf6d9 100644 --- a/cfengine/inputs/cfrun.hosts +++ b/cfengine/inputs/cfrun.hosts @@ -12,7 +12,6 @@ bigleaf.osuosl.org bigscreen.osuosl.org busybox.osuosl.org cherry.osuosl.org -chestnut.osuosl.org chinkapin.osuosl.org cholula.osuosl.org columbia.orvsd.org @@ -94,7 +93,6 @@ orford.osuosl.org osi.osuosl.org parrotvm.osuosl.org pdxplumbers.osuosl.org -pecan.osuosl.org pg1.osuosl.org pg2.osuosl.org rainier.osuosl.org @@ -111,7 +109,6 @@ snake.orvsd.org sugarlabs.osuosl.org twist.osuosl.org vapor.osuosl.org -walnut.osuosl.org web1.helpdesk.osuosl.org whitealder.osuosl.org www.inkscape.org -- 1.6.4.4