From ab5b2ca9dffa72f162fe75c402541a3649fc06c9 Mon Sep 17 00:00:00 2001 From: mellor Date: Wed, 6 Oct 2010 19:05:26 +0000 Subject: [PATCH] bundle file and pkglist updates to automatically install perl-DBD and ODBC rpms on service nodes git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7767 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- .../xcat/install/fedora/service.fedora9.pkglist | 4 ++++ .../fedora/service.fedora9.ppc64.pkglist | 4 ++++ .../share/xcat/install/fedora/service.pkglist | 4 ++++ .../xcat/install/fedora/service.ppc64.pkglist | 4 ++++ .../share/xcat/install/rh/service.pkglist | 4 ++++ .../share/xcat/install/rh/service.ppc64.pkglist | 4 ++++ .../xcat/install/rh/service.rhel6.ppc64.pkglist | 4 ++++ .../xcat/install/sles/service.sles11.pkglist | 11 ++++++++++- .../share/xcat/installp_bundles/xCATaixSN53.bnd | 5 +++-- .../share/xcat/installp_bundles/xCATaixSN61.bnd | 17 ++++++++--------- .../share/xcat/installp_bundles/xCATaixSN71.bnd | 17 ++++++++--------- .../share/xcat/netboot/fedora/service.pkglist | 4 ++++ .../share/xcat/netboot/rh/service.pkglist | 3 +++ .../share/xcat/netboot/rh/service.ppc64.pkglist | 3 +++ .../xcat/netboot/sles/service.sles11.pkglist | 11 +++++++++-- .../netboot/sles/service.sles11.ppc64.pkglist | 10 +++++++++- 16 files changed, 85 insertions(+), 24 deletions(-) diff --git a/xCAT-server/share/xcat/install/fedora/service.fedora9.pkglist b/xCAT-server/share/xcat/install/fedora/service.fedora9.pkglist index 04608f5cd..34ac0a813 100644 --- a/xCAT-server/share/xcat/install/fedora/service.fedora9.pkglist +++ b/xCAT-server/share/xcat/install/fedora/service.fedora9.pkglist @@ -17,3 +17,7 @@ gdb binutils openssh-server vsftpd +unixODBC +perl-DBD-MySQL +mysql-connector-odbc +perl-DBD-Pg diff --git a/xCAT-server/share/xcat/install/fedora/service.fedora9.ppc64.pkglist b/xCAT-server/share/xcat/install/fedora/service.fedora9.ppc64.pkglist index 2ef5e89ba..2173e62e7 100644 --- a/xCAT-server/share/xcat/install/fedora/service.fedora9.ppc64.pkglist +++ b/xCAT-server/share/xcat/install/fedora/service.fedora9.ppc64.pkglist @@ -18,3 +18,7 @@ gdb binutils openssh-server vsftpd +unixODBC +perl-DBD-MySQL +mysql-connector-odbc +perl-DBD-Pg diff --git a/xCAT-server/share/xcat/install/fedora/service.pkglist b/xCAT-server/share/xcat/install/fedora/service.pkglist index bd065c737..13b0cd565 100644 --- a/xCAT-server/share/xcat/install/fedora/service.pkglist +++ b/xCAT-server/share/xcat/install/fedora/service.pkglist @@ -19,3 +19,7 @@ gdb binutils openssh-server vsftpd +unixODBC +perl-DBD-MySQL +mysql-connector-odbc +perl-DBD-Pg diff --git a/xCAT-server/share/xcat/install/fedora/service.ppc64.pkglist b/xCAT-server/share/xcat/install/fedora/service.ppc64.pkglist index bd065c737..13b0cd565 100644 --- a/xCAT-server/share/xcat/install/fedora/service.ppc64.pkglist +++ b/xCAT-server/share/xcat/install/fedora/service.ppc64.pkglist @@ -19,3 +19,7 @@ gdb binutils openssh-server vsftpd +unixODBC +perl-DBD-MySQL +mysql-connector-odbc +perl-DBD-Pg diff --git a/xCAT-server/share/xcat/install/rh/service.pkglist b/xCAT-server/share/xcat/install/rh/service.pkglist index 612667998..6260b9485 100644 --- a/xCAT-server/share/xcat/install/rh/service.pkglist +++ b/xCAT-server/share/xcat/install/rh/service.pkglist @@ -26,3 +26,7 @@ binutils openssh-server util-linux compat-libstdc++-33 +unixODBC +perl-DBD-MySQL +mysql-connector-odbc +perl-DBD-Pg diff --git a/xCAT-server/share/xcat/install/rh/service.ppc64.pkglist b/xCAT-server/share/xcat/install/rh/service.ppc64.pkglist index 612667998..6260b9485 100644 --- a/xCAT-server/share/xcat/install/rh/service.ppc64.pkglist +++ b/xCAT-server/share/xcat/install/rh/service.ppc64.pkglist @@ -26,3 +26,7 @@ binutils openssh-server util-linux compat-libstdc++-33 +unixODBC +perl-DBD-MySQL +mysql-connector-odbc +perl-DBD-Pg diff --git a/xCAT-server/share/xcat/install/rh/service.rhel6.ppc64.pkglist b/xCAT-server/share/xcat/install/rh/service.rhel6.ppc64.pkglist index fc34ce6ad..bfb14d3d4 100644 --- a/xCAT-server/share/xcat/install/rh/service.rhel6.ppc64.pkglist +++ b/xCAT-server/share/xcat/install/rh/service.rhel6.ppc64.pkglist @@ -30,3 +30,7 @@ util-linux compat-libstdc++-33 perl-DBD-MySQL perl-Socket6 +unixODBC +perl-DBD-MySQL +mysql-connector-odbc +perl-DBD-Pg diff --git a/xCAT-server/share/xcat/install/sles/service.sles11.pkglist b/xCAT-server/share/xcat/install/sles/service.sles11.pkglist index bfcef697c..f31276553 100644 --- a/xCAT-server/share/xcat/install/sles/service.sles11.pkglist +++ b/xCAT-server/share/xcat/install/sles/service.sles11.pkglist @@ -5,7 +5,6 @@ rsync nmap perl-DBI vsftpd -perl-DBD-mysql perl-IO-Socket-SSL perl-IO-Tty apache2 @@ -16,3 +15,13 @@ bind perl-Expect perl-SNMP dhcp-server +unixODBC +perl-DBD-mysql +mysql-client +libmysqlclient15 +# The following rpms are available on the SLES SDK +# You will need to locate and make these rpms available in your zypper +# repository for service node installs and uncomment the following lines: +#MyODBC-unixODBC +#perl-DBD-Pg + diff --git a/xCAT-server/share/xcat/installp_bundles/xCATaixSN53.bnd b/xCAT-server/share/xcat/installp_bundles/xCATaixSN53.bnd index aa34a73e1..93c2b955b 100644 --- a/xCAT-server/share/xcat/installp_bundles/xCATaixSN53.bnd +++ b/xCAT-server/share/xcat/installp_bundles/xCATaixSN53.bnd @@ -49,6 +49,9 @@ R:perl-Net_SSLeay.pm-1.30-3* R:perl-IO-Socket-SSL* R:unixODBC* +R:perl-DBD-mysql* +R:mysql-connector-odbc* + R:perl-xCAT* R:xCAT-client* R:xCAT-server* @@ -59,5 +62,3 @@ R:xCATsn* #R:xcat-postgresql-8.4-4.aix6.1.ppc.rpm #R:perl-DBD-Pg-2-17.2.aix6.1.ppc.rpm -# optional - needed if using MySql -#R:perl-DBD-mysql* diff --git a/xCAT-server/share/xcat/installp_bundles/xCATaixSN61.bnd b/xCAT-server/share/xcat/installp_bundles/xCATaixSN61.bnd index 447412faf..c5c50482b 100644 --- a/xCAT-server/share/xcat/installp_bundles/xCATaixSN61.bnd +++ b/xCAT-server/share/xcat/installp_bundles/xCATaixSN61.bnd @@ -54,18 +54,17 @@ R:perl-Net_SSLeay.pm-1.30-2* R:perl-IO-Socket-SSL* R:unixODBC* +R:perl-DBD-DB2* +R:perl-DBD-Pg* +R:perl-DBD-mysql* +R:mysql-connector-odbc* + +# optional - needed if using Postgresql +#R:xcat-postgresql* + R:perl-xCAT* R:xCAT-client* R:xCAT-server* R:xCAT-rmc* R:xCATsn* -# optional - needed if using Postgresql -#R:xcat-postgresql* -#R:perl-DBD-Pg* - -# optional - needed if using DB2 -#R:perl-DBD-DB2* - -# optional - needed if using MySql -#R:perl-DBD-mysql* diff --git a/xCAT-server/share/xcat/installp_bundles/xCATaixSN71.bnd b/xCAT-server/share/xcat/installp_bundles/xCATaixSN71.bnd index 3d68e6294..8c8183247 100644 --- a/xCAT-server/share/xcat/installp_bundles/xCATaixSN71.bnd +++ b/xCAT-server/share/xcat/installp_bundles/xCATaixSN71.bnd @@ -50,18 +50,17 @@ R:perl-Net_SSLeay.pm-1.30-3* R:perl-IO-Socket-SSL* R:unixODBC* +R:perl-DBD-DB2* +R:perl-DBD-Pg* +R:perl-DBD-mysql* +R:mysql-connector-odbc* + +# optional - needed if using Postgresql +#R:xcat-postgresql* + R:perl-xCAT* R:xCAT-client* R:xCAT-server* R:xCAT-rmc* R:xCATsn* -# optional - needed if using Postgresql -#R:xcat-postgresql* -#R:perl-DBD-Pg* - -# optional - needed if using DB2 -#R:perl-DBD-DB2* - -# optional - needed if using MySql -#R:perl-DBD-mysql* diff --git a/xCAT-server/share/xcat/netboot/fedora/service.pkglist b/xCAT-server/share/xcat/netboot/fedora/service.pkglist index df38907b7..ccc842946 100644 --- a/xCAT-server/share/xcat/netboot/fedora/service.pkglist +++ b/xCAT-server/share/xcat/netboot/fedora/service.pkglist @@ -19,3 +19,7 @@ wget vsftpd ntp rsync +unixODBC +perl-DBD-MySQL +mysql-connector-odbc +perl-DBD-Pg diff --git a/xCAT-server/share/xcat/netboot/rh/service.pkglist b/xCAT-server/share/xcat/netboot/rh/service.pkglist index d16bd0865..bcb1155ba 100644 --- a/xCAT-server/share/xcat/netboot/rh/service.pkglist +++ b/xCAT-server/share/xcat/netboot/rh/service.pkglist @@ -30,3 +30,6 @@ perl-Net-Telnet net-snmp-perl ntp rsync +unixODBC +perl-DBD-MySQL +mysql-connector-odbc diff --git a/xCAT-server/share/xcat/netboot/rh/service.ppc64.pkglist b/xCAT-server/share/xcat/netboot/rh/service.ppc64.pkglist index db3df2704..f783e0c78 100644 --- a/xCAT-server/share/xcat/netboot/rh/service.ppc64.pkglist +++ b/xCAT-server/share/xcat/netboot/rh/service.ppc64.pkglist @@ -31,3 +31,6 @@ ntp rsync ppc64-utils iputils +unixODBC +perl-DBD-MySQL +mysql-connector-odbc diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles11.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sles11.pkglist index 94775997a..9ddad6296 100644 --- a/xCAT-server/share/xcat/netboot/sles/service.sles11.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/service.sles11.pkglist @@ -31,11 +31,18 @@ hal pam pam-modules timezone -mysql-client perl-Expect openssl xCATsn -perl-DBD-mysql portmap zypper rsync +unixODBC +perl-DBD-mysql +mysql-client +libmysqlclient15 +# The following rpms are available on the SLES SDK +# You will need to locate and make these rpms available in your zypper +# repository for service node installs and uncomment the following lines: +#MyODBC-unixODBC +#perl-DBD-Pg diff --git a/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.pkglist b/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.pkglist index 4c97b727c..d3b973978 100644 --- a/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/service.sles11.ppc64.pkglist @@ -34,10 +34,18 @@ timezone mysql-client perl-Expect openssl -perl-DBD-mysql portmap zypper rsync powerpc-utils bc iputils +unixODBC +perl-DBD-mysql +mysql-client +libmysqlclient15 +# The following rpms are available on the SLES SDK +# You will need to locate and make these rpms available in your zypper +# repository for service node installs +#MyODBC-unixODBC +#perl-DBD-Pg