Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Re-apply build system changes

  • Loading branch information...
commit 47eb0ffd58b286da36debe560242cc239e9abb0b 1 parent 1026038
@gholms gholms authored
View
6 cluster/Makefile
@@ -44,15 +44,15 @@ generated/stubs: $(CCWSDL) $(NCWSDL)
server: $(SERVICE_SO)
-$(SERVICE_SO): generated/stubs ../storage/storage.o server-marshal.o handlers.o handlers-state.o server-marshal-state.o $(AXIS2C_HOME)/lib/libaxutil.so ../util/windows-bundle.o
+$(SERVICE_SO): generated/stubs ../storage/storage.o server-marshal.o handlers.o handlers-state.o server-marshal-state.o ../util/windows-bundle.o
$(CC) -shared generated/*.o server-marshal.o handlers.o handlers-state.o server-marshal-state.o ../util/windows-bundle.o $(SCLIBS) $(NCLIBS) $(VNLIBS) $(WSSECLIBS) $(CC_LIBS) -o $(SERVICE_SO)
client: $(CLIENT)_full $(CLIENTKILLALL)
-$(CLIENT)_full: generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o handlers-state.o $(AXIS2C_HOME)/lib/libaxutil.so
+$(CLIENT)_full: generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o handlers-state.o
$(CC) -o $(CLIENT)_full $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=1
-$(CLIENTKILLALL): generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o handlers-state.o $(AXIS2C_HOME)/lib/libaxutil.so
+$(CLIENTKILLALL): generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o handlers-state.o
$(CC) -o $(CLIENTKILLALL) $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=0
deploy:
View
8,513 configure
2,455 additions, 6,058 deletions not shown
View
66 configure.ac
@@ -18,6 +18,7 @@ AC_CONFIG_SRCDIR([wsdl/eucalyptus_nc.wsdl])
AC_CONFIG_HEADER([util/eucalyptus-config.h])
AC_PREFIX_DEFAULT([/opt/eucalyptus/])
AC_USE_SYSTEM_EXTENSIONS
+AC_CANONICAL_BUILD
EUCA_VERSION="`cat VERSION`"
# let's figure out where is the source tree
@@ -63,6 +64,9 @@ AC_ARG_WITH(axis2,
AC_ARG_WITH(libvirt,
[ --with-libvirt=<dir> where libvirt is installed],
[LIBVIRT_HOME="${withval}"])
+AC_ARG_WITH(wsdl2c-sh,
+ [ --with-wsdl2c-sh=<file> where WSDL2C.sh is installed],
+ [WSDL2C="${withval}"])
AC_ARG_WITH(vddk,
[ --with-vddk=<dir> where VMware's VDDK is installed],
[VDDK_HOME="${withval}"])
@@ -84,32 +88,38 @@ AC_ARG_ENABLE(debug,
# If we didn't specify the services directory, let's use the default
if test -z "$AXIS2C_SERVICES" ; then
- AXIS2C_SERVICES="${AXIS2C_HOME}/services"
+ AXIS2C_SERVICES="${AXIS2C_HOME}/services"
fi
# Fix the paths for includes and libraries
if test -n "${AXIS2C_HOME}" ; then
- if test -d "${AXIS2C_HOME}"/include ; then
- for x in `ls ${AXIS2C_HOME}/include`; do
- INCLUDES="${INCLUDES} -I${AXIS2C_HOME}/include/$x"
- done
- LIBS="-L${AXIS2C_HOME}/lib ${LIBS}"
- fi
- if test -d ${AXIS2C_HOME}/modules/rampart ; then
- LIBS="-L${AXIS2C_HOME}/modules/rampart ${LIBS}"
- fi
+ if test -d "${AXIS2C_HOME}"/include ; then
+ for x in `ls ${AXIS2C_HOME}/include`; do
+ INCLUDES="${INCLUDES} -I${AXIS2C_HOME}/include/$x"
+ done
+ fi
+ if test -d "${AXIS2C_HOME}"/lib ; then
+ LIBS="-L${AXIS2C_HOME}/lib ${LIBS}"
+ fi
+ if test -d ${AXIS2C_HOME}/modules/rampart ; then
+ LIBS="-L${AXIS2C_HOME}/modules/rampart ${LIBS}"
+ fi
fi
if test -n "${LIBVIRT_HOME}" ; then
- if test -d "${LIBVIRT_HOME}"/include ; then
- INCLUDES="${INCLUDES} -I${LIBVIRT_HOME}/include"
- LIBS="-L${LIBVIRT_HOME}/lib ${LIBS}"
- fi
+ if test -d "${LIBVIRT_HOME}"/include ; then
+ INCLUDES="${INCLUDES} -I${LIBVIRT_HOME}/include"
+ LIBS="-L${LIBVIRT_HOME}/lib ${LIBS}"
+ fi
fi
if test -n "${VDDK_HOME}" ; then
- if test -d "${VDDK_HOME}"/lib/vmware-vix-disklib/include/ ; then
- INCLUDES="${INCLUDES} -I${VDDK_HOME}/lib/vmware-vix-disklib/include/"
- LIBS="-L${VDDK_HOME}/lib ${LIBS}"
- fi
+ AS_IF([test "x$build_cpu" = "xx86_64"], [LIBS="-L${VDDK_HOME}/lib64 ${LIBS}"],
+ [LIBS="-L${VDDK_HOME}/lib32 ${LIBS}"])
+
+ if test -d "${VDDK_HOME}"/include/ ; then
+ INCLUDES="${INCLUDES} -I${VDDK_HOME}/include/"
+ elif test -d "${VDDK_HOME}"/lib/vmware-vix-disklib/include/ ; then
+ INCLUDES="${INCLUDES} -I${VDDK_HOME}/lib/vmware-vix-disklib/include/"
+ fi
fi
@@ -120,23 +130,15 @@ AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PATH_PROG(RM, rm)
-# let's search for WSDL2C.sh
-# we cannot use AC_PROG_PATH because WSDL2C.sh is not executable
-#AC_PATH_PROG([WSDL2C], WSDL2C.sh,,$AXIS2C_HOME/bin/tools/wsdl2c:$PATH)
-WSDL2C=$AXIS2C_HOME/bin/tools/wsdl2c/WSDL2C.sh
-ALT_WSDL2C=$AXIS2C_HOME/WSDL2C.sh
-AC_CHECK_FILE($WSDL2C,[HAVE_WSDL2C=yes])
-AC_CHECK_FILE($ALT_WSDL2C,[HAVE_ALT_WSDL2C=yes])
-# check if we found either of the possible WSDL2Cs
-if test -z "$HAVE_WSDL2C$HAVE_ALT_WSDL2C" ; then
- AC_MSG_ERROR([Cannot find WSDL2C.sh!])
+if test -z "$WSDL2C"; then
+ # let's search for WSDL2C.sh
+ AC_PATH_PROG([WSDL2C], WSDL2C.sh,,$AXIS2C_HOME/bin/tools/wsdl2c:$PATH)
fi
-# made it here: we found one! -- set WSDL2C if the default location is wrong
-if test -n "$HAVE_ALT_WSDL2C" ; then
- WSDL2C=$ALT_WSDL2C
+# check if we found WSDL2C.sh
+if test -z "$WSDL2C" ; then
+ AC_MSG_ERROR([Cannot find WSDL2C.sh!])
fi
-
# we need JAVA_HOME
if test -z "$JAVA_HOME" ; then
AC_MSG_ERROR([JAVA_HOME is not defined!])
View
487 eucalyptus-eee.spec
@@ -9,7 +9,6 @@
%if %is_suse
%global euca_dhcp dhcp-server
%global euca_httpd apache2
-%global euca_libvirt xen-tools, libvirt
%global euca_hypervisor xen
%global euca_curl libcurl4
%global euca_libcurl libcurl-devel
@@ -22,7 +21,6 @@
%global euca_which util-linux
%endif
%if %is_centos
-%global euca_libvirt libvirt >= 0.6
%global euca_hypervisor xen
%global euca_bridge xenbr0
%global euca_java java-sdk >= 1.6.0
@@ -32,25 +30,66 @@
%global euca_which which
%endif
%if %is_fedora
-%global euca_libvirt libvirt
%global euca_hypervisor kvm
%global euca_bridge br0
%global euca_java java-devel >= 1:1.6.0
+%global euca_iscsi_client iscsi-initiator-utils
+%global euca_iscsi_server scsi-target-utils
+%global euca_fuse fuse-libs
+%global euca_which which
%endif
-%if %is_centos
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-%endif
Summary: Elastic Utility Computing Architecture
-Name: eucalyptus
-Version: 2.0.1eee
-Release: 2.REVNO
+Name: eucalyptus-eee
+Version: 2.1.0
+Release: 0%{?dist}
License: Eucalyptus EEE Software License
-Group: Applications/System
-BuildRequires: gcc, make, %{euca_libvirt}-devel, %{euca_libvirt}, %{euca_libcurl}, ant, ant-nodeps, euca-axis2c >= 1.6.0, euca-rampartc >= 1.3.0, %{euca_iscsi_client}
-Requires: %{euca_build_req}, perl-Crypt-OpenSSL-RSA, perl-Crypt-OpenSSL-Random, %{euca_which}, sudo
-Source: %{name}-%{version}.tar.gz
URL: http://www.eucalyptus.com
+Group: Applications/System
+
+# EEE fails to build with el5's gcj-based ant 1.6
+BuildRequires: ant >= 1.7
+BuildRequires: ant-nodeps >= 1.7
+BuildRequires: axis2
+BuildRequires: axis2c-devel >= 1.6.0
+BuildRequires: libvirt-devel >= 0.6
+BuildRequires: rampartc-devel >= 1.3.0
+BuildRequires: swig
+%if %{is_suse}
+BuildRequires: xen-tools
+%endif
+%if %{is_suse}
+BuildRequires: libopenssl-devel
+%else
+BuildRequires: openssl-devel
+%endif
+# The bytecode encryption we use for EEE doesn't work with OpenJDK
+BuildRequires: jdk
+# The VMware code requires FUSE libs to link correstly
+BuildRequires: %{euca_fuse}
+BuildRequires: %{euca_iscsi_client}
+BuildRequires: %{euca_libcurl}
+Requires: %{euca_build_req}
+Requires: %{euca_which}
+Requires: perl(Crypt::OpenSSL::RSA)
+Requires: perl(Crypt::OpenSSL::Random)
+Requires: sudo
+
+%if %{is_centos}
+Requires: python26
+Requires: python26-boto
+%else
+Requires: python
+Requires: python-boto >= 1.9b
+%endif
+
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Source0: %{name}-%{version}.tar.gz
+# A version of WSDL2C.sh that respects standard classpaths
+Source1: euca-WSDL2C.sh
+# The VMware VDDK may be non-redistributable. We don't include it just in case.
+Source2: vmware-vix-disklib-distrib.tgz
%description
EUCALYPTUS is a service overlay that implements elastic computing
@@ -64,8 +103,10 @@ eucalyptus-vmware-broker, eucalyptus-cc or eucalyptus-nc (or all of
them).
%package common-java
-Summary: Elastic Utility Computing Architecture - ws java stack
-Requires: %{name} = %{version}, lvm2, %{euca_fuse}
+Summary: Elastic Utility Computing Architecture - ws java stack
+Requires: %{name} = %{version}-%{release}
+Requires: lvm2
+Requires: jre
Group: Applications/System
%description common-java
@@ -78,7 +119,8 @@ This package contains the java WS stack.
%package walrus
Summary: Elastic Utility Computing Architecture - walrus
-Requires: %{name}-common-java = %{version}, lvm2
+Requires: %{name}-common-java = %{version}-%{release}
+Requires: lvm2
Group: Applications/System
%description walrus
@@ -93,11 +135,10 @@ cloud controller.
%package sc
Summary: Elastic Utility Computing Architecture - storage controller
-%if %is_centos
-Requires: %{name}-common-java = %{version}, lvm2, vblade, %{euca_iscsi_server}
-%else
-Requires: %{name}-common-java = %{version}, lvm2, vblade, %{euca_iscsi_server}
-%endif
+Requires: %{name}-common-java = %{version}-%{release}
+Requires: lvm2
+Requires: vblade
+Requires: %{euca_iscsi_server}
Group: Applications/System
%description sc
@@ -112,8 +153,14 @@ alongside the cluster-controller.
%package cloud
Summary: Elastic Utility Computing Architecture - cloud controller
-Requires: %{name}-common-java = %{version}, euca2ools-eee, lvm2
+Requires: %{name}-common-java = %{version}-%{release}
+Requires: euca2ools-eee
+Requires: lvm2
+%if %{is_centos}
+Requires: python26-boto
+%else
Requires: python-boto >= 1.9b
+%endif
Group: Applications/System
%description cloud
@@ -128,7 +175,13 @@ the cloud clients.
%package cc
Summary: Elastic Utility Computing Architecture - cluster controller
-Requires: %{name} = %{version}, %{name}-gl = %{version}, %{euca_httpd}, euca-axis2c >= 1.6.0, euca-rampartc >= 1.3.0, iptables, bridge-utils, %{euca_dhcp}, vtun
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-gl = %{version}-%{release}
+Requires: bridge-utils
+Requires: iptables
+Requires: %{euca_dhcp}
+Requires: %{euca_httpd}
+Requires: vtun
Group: Applications/System
%description cc
@@ -142,7 +195,14 @@ handles multiple node controllers.
%package nc
Summary: Elastic Utility Computing Architecture - node controller
-Requires: %{name} = %{version}, %{name}-gl = %{version}, euca2ools-eee, %{euca_httpd}, euca-axis2c >= 1.6.0, euca-rampartc >= 1.3.0, bridge-utils, %{euca_libvirt}, %{euca_curl}, %{euca_hypervisor}, %{euca_iscsi_client}
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-gl = %{version}-%{release}
+Requires: euca2ools-eee
+Requires: bridge-utils
+Requires: %{euca_curl}
+Requires: %{euca_httpd}
+Requires: %{euca_hypervisor}
+Requires: %{euca_iscsi_client}
Group: Applications/System
%description nc
@@ -156,7 +216,8 @@ components that handles the instances.
%package gl
Summary: Elastic Utility Computing Architecture - log service
-Requires: %{name} = %{version}, %{euca_httpd}, euca-axis2c >= 1.6.0, euca-rampartc >= 1.3.0
+Requires: %{name} = %{version}
+Requires: %{euca_httpd}
Group: Applications/System
%description gl
@@ -169,8 +230,12 @@ This package contains the internal log service of eucalyptus.
%package broker
Summary: Elastic Utility Computing Architecture - vmware broker
-Requires: %{name}-common-java = %{version}, %{name}-cc
-AutoReqProv: no
+Requires: %{name}-common-java = %{version}-%{release}
+Requires: %{name}-cc = %{version}-%{release}
+Requires: %{euca_httpd}
+# The VMware broker links against the VMware disk library.
+# Are we allowed to redistribute it?
+AutoReq: no
Group: Applications/System
%description broker
@@ -179,72 +244,66 @@ computing using existing resources. The goal of EUCALYPTUS is to allow
sites with existing clusters and server infrastructure to co-host an
elastic computing service that is interface-compatible with Amazon's EC2.
-This package contains broker needed to let EUCALYPTUS control a vmware
-installation.
+This package contains the broker needed to let EUCALYPTUS control a
+VMware installation.
%prep
-%setup -n %{name}-%{version}
+%setup -q
+%setup -q -T -D -b 2
%build
export DESTDIR=$RPM_BUILD_ROOT
-./configure --with-axis2=/opt/packages/axis2-1.4 --with-axis2c=/opt/euca-axis2c --enable-debug --prefix=/ --with-vddk=/opt/packages/vddk/
-cd clc
+# Oracle JDK links to Java without using alternatives
+export JAVA_HOME=/usr/java/latest
+./configure --with-axis2=%{_datadir}/axis2-* --with-axis2c=%{_libdir}/axis2c --with-wsdl2c-sh=%{S:1} --enable-debug --prefix=/ --with-vddk=$RPM_BUILD_DIR/vmware-vix-disklib-distrib
+
+pushd clc
+# The CLC's build XML file looks for jar files in clc/lib, so symlink the
+# system's copies of important jar files to that location.
make deps
-cd ..
-make 2> err.log > out.log
+popd
+
+# Write builds logs to files so we can triage build failures.
+# mock logs stdout and stderr, so this hackery will eventually go away.
+(make 2>&1 1>&3 | tee err.log) 3>&1 1>&2 | tee out.log
+
%if %is_centos
for x in `/bin/ls clc/tools/src/euca-*`; do
- sed --in-place 's:#!/usr/bin/env python:#!/usr/bin/env python2.5:' $x
+ sed --in-place 's:#!/usr/bin/env python:#!%{_bindir}/python2.6:' $x
done
%endif
%install
-export DESTDIR=$RPM_BUILD_ROOT
-make install
+[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
+make install DESTDIR=$RPM_BUILD_ROOT
%clean
-export DESTDIR=$RPM_BUILD_ROOT
-make uninstall
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
%files
%doc LICENSE INSTALL README CHANGELOG
-/etc/eucalyptus/eucalyptus.conf
-/var/lib/eucalyptus/keys
-/var/log/eucalyptus
-/var/run/eucalyptus
-/usr/share/eucalyptus/add_key.pl
-/usr/share/eucalyptus/euca_ipt
-/usr/share/eucalyptus/populate_arp.pl
-/usr/share/eucalyptus/euca_upgrade
-/usr/lib/eucalyptus/euca_rootwrap
-/usr/lib/eucalyptus/euca_mountwrap
/etc/bash_completion.d/euca_conf
-/usr/sbin/euca_conf
-/usr/sbin/euca_sync_key
-/usr/sbin/euca_killall
-/etc/eucalyptus/httpd.conf
+/etc/eucalyptus/eucalyptus.conf
/etc/eucalyptus/eucalyptus-version
-/usr/share/eucalyptus/connect_iscsitarget.pl
-/usr/share/eucalyptus/disconnect_iscsitarget.pl
-/usr/share/eucalyptus/get_iscsitarget.pl
-/usr/share/eucalyptus/floppy
-/usr/share/eucalyptus/udev/55-openiscsi.rules
-/usr/share/eucalyptus/udev/README
-/usr/share/eucalyptus/udev/iscsidev-centos.sh
-/usr/share/eucalyptus/udev/iscsidev-opensuse.sh
-/usr/share/eucalyptus/udev/iscsidev-ubuntu.sh
+/etc/eucalyptus/httpd.conf
+/usr/lib/eucalyptus/euca_mountwrap
+/usr/lib/eucalyptus/euca_rootwrap
/usr/sbin/euca-add-group-membership
/usr/sbin/euca-add-user
/usr/sbin/euca-add-user-group
+/usr/sbin/euca_admin
+/usr/sbin/euca_conf
/usr/sbin/euca-convert-volumes
/usr/sbin/euca-delete-user
/usr/sbin/euca-delete-user-group
+/usr/sbin/euca-deregister-arbitrator
/usr/sbin/euca-deregister-cluster
/usr/sbin/euca-deregister-storage-controller
/usr/sbin/euca-deregister-walrus
+/usr/sbin/euca-describe-arbitrators
/usr/sbin/euca-describe-clusters
+/usr/sbin/euca-describe-components
+/usr/sbin/euca-describe-nodes
/usr/sbin/euca-describe-properties
/usr/sbin/euca-describe-storage-controllers
/usr/sbin/euca-describe-user-groups
@@ -252,17 +311,35 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
/usr/sbin/euca-describe-walruses
/usr/sbin/euca-get-credentials
/usr/sbin/euca-grant-zone-permission
+/usr/sbin/euca_killall
+/usr/sbin/euca-modify-cluster
/usr/sbin/euca-modify-property
/usr/sbin/euca-modify-storage-controller
/usr/sbin/euca-modify-walrus
+/usr/sbin/euca-register-arbitrator
/usr/sbin/euca-register-cluster
/usr/sbin/euca-register-storage-controller
/usr/sbin/euca-register-walrus
/usr/sbin/euca-remove-group-membership
/usr/sbin/euca-revoke-zone-permission
-/usr/sbin/euca-describe-nodes
-/usr/sbin/euca_admin
+/usr/sbin/euca_sync_key
+/usr/share/eucalyptus/add_key.pl
+/usr/share/eucalyptus/connect_iscsitarget.pl
+/usr/share/eucalyptus/disconnect_iscsitarget.pl
/usr/share/eucalyptus/doc
+/usr/share/eucalyptus/euca_ipt
+/usr/share/eucalyptus/euca_upgrade
+/usr/share/eucalyptus/floppy
+/usr/share/eucalyptus/get_iscsitarget.pl
+/usr/share/eucalyptus/populate_arp.pl
+/usr/share/eucalyptus/udev/55-openiscsi.rules
+/usr/share/eucalyptus/udev/iscsidev-centos.sh
+/usr/share/eucalyptus/udev/iscsidev-opensuse.sh
+/usr/share/eucalyptus/udev/iscsidev-ubuntu.sh
+/usr/share/eucalyptus/udev/README
+/var/lib/eucalyptus/keys
+/var/log/eucalyptus
+/var/run/eucalyptus
%files common-java
@@ -285,23 +362,26 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
/usr/share/eucalyptus/disconnect_iscsitarget_sc.pl
%files cc
-/opt/euca-axis2c/services/EucalyptusCC
+%{_libdir}/axis2c/services/EucalyptusCC
/etc/init.d/eucalyptus-cc
/etc/eucalyptus/vtunall.conf.template
+/usr/share/eucalyptus/dynserv.pl
%files nc
-/usr/share/eucalyptus/gen_libvirt_xml
+/usr/share/eucalyptus/detach.pl
/usr/share/eucalyptus/gen_kvm_libvirt_xml
-/usr/share/eucalyptus/partition2disk
-/usr/share/eucalyptus/get_xen_info
+/usr/share/eucalyptus/gen_libvirt_xml
+/usr/share/eucalyptus/getstats.pl
/usr/share/eucalyptus/get_sys_info
-/usr/share/eucalyptus/detach.pl
+/usr/share/eucalyptus/get_xen_info
+/usr/share/eucalyptus/partition2disk
+/usr/sbin/eucanetd
/usr/sbin/euca_test_nc
-/opt/euca-axis2c/services/EucalyptusNC
+%{_libdir}/axis2c/services/EucalyptusNC
/etc/init.d/eucalyptus-nc
%files gl
-/opt/euca-axis2c/services/EucalyptusGL
+%{_libdir}/axis2c/services/EucalyptusGL
%files broker
/usr/share/eucalyptus/euca_vmware
@@ -309,51 +389,53 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
/usr/lib/eucalyptus/_euca_imager
%pre
-if [ "$1" = "2" ];
+if [ "$1" = "2" ];
then
- # let's see where we installed
- EUCADIRS="/"
- for i in $EUCADIRS
- do
- if [ -e $i/etc/eucalyptus/eucalyptus-version ]; then
- EUCADIR=$i
- break
- fi
- done
- cd $EUCADIR
-
- # stop all old services
- if [ -x etc/init.d/eucalyptus-cloud ];
- then
- etc/init.d/eucalyptus-cloud stop
- fi
- if [ -x etc/init.d/eucalyptus-cc ];
- then
- etc/init.d/eucalyptus-cc cleanstop
- fi
- if [ -x etc/init.d/eucalyptus-nc ];
- then
- etc/init.d/eucalyptus-nc stop
- fi
-
- # save a backup of important data
- DATESTR=`date +%s`
- echo /root/eucalyptus.backup.$DATESTR > /tmp/eucaback.dir
- mkdir -p /root/eucalyptus.backup.$DATESTR
- cd /root/eucalyptus.backup.$DATESTR
- EUCABACKUPS=""
- for i in $EUCADIR/var/lib/eucalyptus/keys/ $EUCADIR/var/lib/eucalyptus/db/ $EUCADIR/etc/eucalyptus/eucalyptus.conf $EUCADIR/etc/eucalyptus/eucalyptus-version $EUCADIR/usr/share/eucalyptus/
- do
- if [ -e $i ]; then
- EUCABACKUPS="$EUCABACKUPS $i"
- fi
- done
- if [ -e etc/eucalyptus/eucalyptus.conf ]; then
- sed -i "s/DISABLE_EBS=.*/#DISABLE_EBS=\"N\"/" etc/eucalyptus/eucalyptus.conf
- fi
- sed -i "s/Defaults.*requiretty/#Defaults requiretty/" /etc/sudoers
- tar cf - $EUCABACKUPS 2>/dev/null | tar xf - 2>/dev/null
- cd $EUCADIR
+ # let's see where we installed
+ EUCADIRS="/"
+ for i in $EUCADIRS
+ do
+ if [ -e $i/etc/eucalyptus/eucalyptus-version ]; then
+ EUCADIR=$i
+ break
+ fi
+ done
+ cd $EUCADIR
+
+ # stop all old services
+ if [ -x etc/init.d/eucalyptus-cloud ];
+ then
+ etc/init.d/eucalyptus-cloud stop
+ fi
+ if [ -x etc/init.d/eucalyptus-cc ];
+ then
+ etc/init.d/eucalyptus-cc cleanstop
+ fi
+ if [ -x etc/init.d/eucalyptus-nc ];
+ then
+ etc/init.d/eucalyptus-nc stop
+ fi
+
+ # save a backup of important data
+ DATESTR=`date +%s`
+ echo /root/eucalyptus.backup.$DATESTR > /tmp/eucaback.dir
+ mkdir -p /root/eucalyptus.backup.$DATESTR
+ cd /root/eucalyptus.backup.$DATESTR
+ EUCABACKUPS=""
+ for i in $EUCADIR/var/lib/eucalyptus/keys/ $EUCADIR/var/lib/eucalyptus/db/ $EUCADIR/etc/eucalyptus/eucalyptus.conf $EUCADIR/etc/eucalyptus/eucalyptus-version $EUCADIR/usr/share/eucalyptus/
+ do
+ if [ -e $i ]; then
+ EUCABACKUPS="$EUCABACKUPS $i"
+ fi
+ done
+
+ if [ -e etc/eucalyptus/eucalyptus.conf ]; then
+ sed -i "s/DISABLE_EBS=.*/#DISABLE_EBS=\"N\"/" etc/eucalyptus/eucalyptus.conf
+ fi
+ sed -i "s/Defaults.*requiretty/#Defaults requiretty/" /etc/sudoers
+
+ tar cf - $EUCABACKUPS 2>/dev/null | tar xf - 2>/dev/null
+ cd $EUCADIR
fi
%post
@@ -363,7 +445,7 @@ cp /usr/share/eucalyptus/udev/55-openiscsi.rules /etc/udev/rules.d/
mkdir -p /etc/udev/scripts/
%if %is_suse
cp /usr/share/eucalyptus/udev/iscsidev-opensuse.sh /etc/udev/scripts/iscsidev.sh
- udevadm control --reload-rules
+ udevadm control --reload-rules
%endif
%if %is_centos
cp /usr/share/eucalyptus/udev/iscsidev-centos.sh /etc/udev/scripts/iscsidev.sh
@@ -382,38 +464,38 @@ EOF
chmod +x /etc/udev/scripts/iscsidev.sh
# set java home to location of SunJDK for EEE
-sed -i "s/.*CLOUD_OPTS=.*/CLOUD_OPTS=\"--java-home=\/opt\/packages\/jdk\"/" /etc/eucalyptus/eucalyptus.conf
+sed -i 's#.*CLOUD_OPTS=.*#CLOUD_OPTS="--java-home=/usr/java/latest"#' /etc/eucalyptus/eucalyptus.conf
# we need a eucalyptus user
if ! getent passwd eucalyptus > /dev/null ; then
%if %is_suse
- groupadd eucalyptus
- useradd -M eucalyptus -g eucalyptus
+ groupadd eucalyptus
+ useradd -M eucalyptus -g eucalyptus
%endif
%if %is_centos
- adduser -M eucalyptus
+ adduser -M eucalyptus
%endif
%if %is_fedora
- adduser -U --system eucalyptus
+ adduser -U --system eucalyptus
%endif
fi
-if [ "$1" = "1" ];
+if [ "$1" = "1" ];
then
- # let's configure eucalyptus
- /usr/sbin/euca_conf -d / --instances /usr/local/eucalyptus/ -hypervisor %{euca_hypervisor} -bridge %{euca_bridge}
+ # let's configure eucalyptus
+ /usr/sbin/euca_conf -d / --instances /usr/local/eucalyptus/ -hypervisor %{euca_hypervisor} -bridge %{euca_bridge}
fi
if [ "$1" = "2" ];
then
- /usr/sbin/euca_conf -d / --instances /usr/local/eucalyptus/ -hypervisor %{euca_hypervisor} -bridge %{euca_bridge}
- if [ -f /tmp/eucaback.dir ]; then
- BACKDIR=`cat /tmp/eucaback.dir`
- if [ -d "$BACKDIR" ]; then
-# /usr/share/eucalyptus/euca_upgrade --old $BACKDIR --new / --conf --keys
- echo "**NOTICE** If you are upgrading to EEE, you will need to perform the upgrade process manually. Your previous Eucalyptus data is backed up in $BACKDIR."
- /usr/sbin/euca_conf -setup
- fi
- fi
+ /usr/sbin/euca_conf -d / --instances /usr/local/eucalyptus/ -hypervisor %{euca_hypervisor} -bridge %{euca_bridge}
+ if [ -f /tmp/eucaback.dir ]; then
+ BACKDIR=`cat /tmp/eucaback.dir`
+ if [ -d "$BACKDIR" ]; then
+# /usr/share/eucalyptus/euca_upgrade --old $BACKDIR --new / --conf --keys
+ echo "**NOTICE** If you are upgrading to EEE, you will need to perform the upgrade process manually. Your previous Eucalyptus data is backed up in $BACKDIR."
+ /usr/sbin/euca_conf -setup
+ fi
+ fi
fi
# final setup and set the new user
@@ -423,13 +505,13 @@ fi
if [ "$1" = "2" ];
then
if [ -f /tmp/eucaback.dir ]; then
- BACKDIR=`cat /tmp/eucaback.dir`
- if [ -d "$BACKDIR" ]; then
- /usr/sbin/euca_conf -setup
-# /usr/share/eucalyptus/euca_upgrade --old $BACKDIR --new / --db
- echo "**NOTICE** If you are upgrading to EEE, you will need to perform the upgrade process manually. Your previous Eucalyptus data is backed up in $BACKDIR."
- /usr/sbin/euca_conf -setup
- fi
+ BACKDIR=`cat /tmp/eucaback.dir`
+ if [ -d "$BACKDIR" ]; then
+ /usr/sbin/euca_conf -setup
+# /usr/share/eucalyptus/euca_upgrade --old $BACKDIR --new / --db
+ echo "**NOTICE** If you are upgrading to EEE, you will need to perform the upgrade process manually. Your previous Eucalyptus data is backed up in $BACKDIR."
+ /usr/sbin/euca_conf -setup
+ fi
fi
fi
chkconfig --add eucalyptus-cloud
@@ -440,11 +522,11 @@ chkconfig --add eucalyptus-cloud
%if %is_centos
if [ -e /etc/sysconfig/system-config-securitylevel ];
then
- if ! grep 8773:tcp /etc/sysconfig/system-config-securitylevel > /dev/null ;
- then
- echo "--port=8773:tcp" >> /etc/sysconfig/system-config-securitylevel
- echo "--port=8443:tcp" >> /etc/sysconfig/system-config-securitylevel
- fi
+ if ! grep 8773:tcp /etc/sysconfig/system-config-securitylevel > /dev/null ;
+ then
+ echo "--port=8773:tcp" >> /etc/sysconfig/system-config-securitylevel
+ echo "--port=8443:tcp" >> /etc/sysconfig/system-config-securitylevel
+ fi
fi
%endif
@@ -464,10 +546,10 @@ chkconfig --add eucalyptus-cc
%if %is_centos
if [ -e /etc/sysconfig/system-config-securitylevel ];
then
- if ! grep 8774:tcp /etc/sysconfig/system-config-securitylevel > /dev/null ;
- then
- echo "--port=8774:tcp" >> /etc/sysconfig/system-config-securitylevel
- fi
+ if ! grep 8774:tcp /etc/sysconfig/system-config-securitylevel > /dev/null ;
+ then
+ echo "--port=8774:tcp" >> /etc/sysconfig/system-config-securitylevel
+ fi
fi
%endif
@@ -486,19 +568,19 @@ usermod -G kvm eucalyptus
%if %is_centos
if [ -e /etc/sysconfig/system-config-securitylevel ];
then
- if ! grep 8775:tcp /etc/sysconfig/system-config-securitylevel > /dev/null ;
- then
- echo "--port=8775:tcp" >> /etc/sysconfig/system-config-securitylevel
- fi
+ if ! grep 8775:tcp /etc/sysconfig/system-config-securitylevel > /dev/null ;
+ then
+ echo "--port=8775:tcp" >> /etc/sysconfig/system-config-securitylevel
+ fi
fi
%endif
%if %is_suse
-if [ -e /etc/PolicyKit/PolicyKit.conf ];
+if [ -e /etc/PolicyKit/PolicyKit.conf ];
then
- if ! grep eucalyptus /etc/PolicyKit/PolicyKit.conf > /dev/null ;
- then
- sed -i '/<config version/ a <match action="org.libvirt.unix.manage">\n <match user="eucalyptus">\n <return result="yes"/>\n </match>\n</match>' /etc/PolicyKit/PolicyKit.conf
- fi
+ if ! grep eucalyptus /etc/PolicyKit/PolicyKit.conf > /dev/null ;
+ then
+ sed -i '/<config version/ a <match action="org.libvirt.unix.manage">\n <match user="eucalyptus">\n <return result="yes"/>\n </match>\n</match>' /etc/PolicyKit/PolicyKit.conf
+ fi
fi
%endif
@@ -515,68 +597,68 @@ fi
# in case of removal let's try to clean up the best we can
if [ "$1" = "0" ];
then
- rm -rf /var/log/eucalyptus
- rm -rf /etc/eucalyptus/http-*
+ rm -rf /var/log/eucalyptus
+ rm -rf /etc/eucalyptus/http-*
fi
%preun cloud
if [ "$1" = "0" ];
then
%if %is_centos
- if [ -e /etc/sysconfig/system-config-securitylevel ];
- then
- sed -i '/^--port=8773/ d' /etc/sysconfig/system-config-securitylevel
- sed -i '/^--port=8443/ d' /etc/sysconfig/system-config-securitylevel
- fi
+ if [ -e /etc/sysconfig/system-config-securitylevel ];
+ then
+ sed -i '/^--port=8773/ d' /etc/sysconfig/system-config-securitylevel
+ sed -i '/^--port=8443/ d' /etc/sysconfig/system-config-securitylevel
+ fi
%endif
- [ -x /usr/sbin/euca_conf ] && /usr/sbin/euca_conf --disable cloud
- if [ -e /etc/init.d/eucalyptus-cloud -a -e /etc/eucalyptus/eucalyptus.conf ];
- then
- /etc/init.d/eucalyptus-cloud restart || true
- fi
+ [ -x /usr/sbin/euca_conf ] && /usr/sbin/euca_conf --disable cloud
+ if [ -e /etc/init.d/eucalyptus-cloud -a -e /etc/eucalyptus/eucalyptus.conf ];
+ then
+ /etc/init.d/eucalyptus-cloud restart || true
+ fi
fi
%preun walrus
if [ "$1" = "0" ];
then
- [ -x /usr/sbin/euca_conf ] && /usr/sbin/euca_conf --disable walrus
- if [ -e /etc/init.d/eucalyptus-cloud -a -e /etc/eucalyptus/eucalyptus.conf ];
- then
- /etc/init.d/eucalyptus-cloud restart || true
- fi
+ [ -x /usr/sbin/euca_conf ] && /usr/sbin/euca_conf --disable walrus
+ if [ -e /etc/init.d/eucalyptus-cloud -a -e /etc/eucalyptus/eucalyptus.conf ];
+ then
+ /etc/init.d/eucalyptus-cloud restart || true
+ fi
fi
%preun sc
if [ "$1" = "0" ];
then
- [ -x /usr/sbin/euca_conf ] && /usr/sbin/euca_conf --disable sc
- if [ -e /etc/init.d/eucalyptus-cloud -a -e /etc/eucalyptus/eucalyptus.conf ];
- then
- /etc/init.d/eucalyptus-cloud restart || true
- fi
+ [ -x /usr/sbin/euca_conf ] && /usr/sbin/euca_conf --disable sc
+ if [ -e /etc/init.d/eucalyptus-cloud -a -e /etc/eucalyptus/eucalyptus.conf ];
+ then
+ /etc/init.d/eucalyptus-cloud restart || true
+ fi
fi
%preun broker
if [ "$1" = "0" ];
then
- [ -x /usr/sbin/euca_conf ] && /usr/sbin/euca_conf --disable vmwarebroker
- if [ -e /etc/init.d/eucalyptus-cloud -a -e /etc/eucalyptus/eucalyptus.conf ];
- then
- /etc/init.d/eucalyptus-cloud restart || true
- fi
- if [ -e /etc/init.d/eucalyptus-cc -a -e /etc/eucalyptus/eucalyptus.conf ]; then
- sed -i "s/NC_SERVICE=.*/NC_SERVICE=\"\/axis2\/services\/EucalyptusNC\"/" /etc/eucalyptus/eucalyptus.conf
- sed -i "s/NC_PORT=.*/NC_PORT=\"8775\"/" /etc/eucalyptus/eucalyptus.conf
- /etc/init.d/eucalyptus-cc cleanrestart
- fi
+ [ -x /usr/sbin/euca_conf ] && /usr/sbin/euca_conf --disable vmwarebroker
+ if [ -e /etc/init.d/eucalyptus-cloud -a -e /etc/eucalyptus/eucalyptus.conf ];
+ then
+ /etc/init.d/eucalyptus-cloud restart || true
+ fi
+ if [ -e /etc/init.d/eucalyptus-cc -a -e /etc/eucalyptus/eucalyptus.conf ]; then
+ sed -i "s/NC_SERVICE=.*/NC_SERVICE=\"\/axis2\/services\/EucalyptusNC\"/" /etc/eucalyptus/eucalyptus.conf
+ sed -i "s/NC_PORT=.*/NC_PORT=\"8775\"/" /etc/eucalyptus/eucalyptus.conf
+ /etc/init.d/eucalyptus-cc cleanrestart
+ fi
fi
%preun common-java
if [ "$1" = "0" ];
then
if [ -f /etc/eucalyptus/eucalyptus.conf ]; then
- /etc/init.d/eucalyptus-cloud stop
+ /etc/init.d/eucalyptus-cloud stop
fi
chkconfig --del eucalyptus-cloud
rm -f /var/lib/eucalyptus/services
@@ -586,14 +668,14 @@ fi
if [ "$1" = "0" ];
then
if [ -f /etc/eucalyptus/eucalyptus.conf ]; then
- /etc/init.d/eucalyptus-cc cleanstop
+ /etc/init.d/eucalyptus-cc cleanstop
fi
chkconfig --del eucalyptus-cc
%if %is_centos
- if [ -e /etc/sysconfig/system-config-securitylevel ];
- then
- sed -i '/^--port=8774/ d' /etc/sysconfig/system-config-securitylevel
- fi
+ if [ -e /etc/sysconfig/system-config-securitylevel ];
+ then
+ sed -i '/^--port=8774/ d' /etc/sysconfig/system-config-securitylevel
+ fi
%endif
fi
@@ -601,21 +683,24 @@ fi
if [ "$1" = "0" ];
then
if [ -f /etc/eucalyptus/eucalyptus.conf ]; then
- /etc/init.d/eucalyptus-nc stop
+ /etc/init.d/eucalyptus-nc stop
fi
chkconfig --del eucalyptus-nc
%if %is_centos
if [ -e /etc/sysconfig/system-config-securitylevel ];
then
- sed -i '/^--port=8775/ d' /etc/sysconfig/system-config-securitylevel
+ sed -i '/^--port=8775/ d' /etc/sysconfig/system-config-securitylevel
fi
%endif
fi
%changelog
-* Tue Jun 1 2010 Eucalyptus Systems (support@eucalyptus.com)
+* Wed Jan 12 2011 Eucalyptus Release Engineering <support@eucalyptus.com> - 2.1.0-1
+- Version 2.1 of Eucalyptus Enterprise Cloud
+
+* Tue Jun 1 2010 Eucalyptus Release Engineering <support@eucalyptus.com> - 2.0.0-1
- Version 2.0 of Eucalyptus Enterprise Cloud
- Windows VM Support
- - User/Group Management
+ - User/Group Management
- SAN Integration
- VMWare Hypervisor Support
View
6 gatherlog/Makefile
@@ -34,12 +34,12 @@ generated/stubs: $(GLWSDL)
server: $(SERVICE_SO)
-$(SERVICE_SO): generated/stubs gl-client-marshal-adb.o server-marshal.o handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
- $(CC) -shared generated/*.o server-marshal.o handlers.o $(WSSECLIBS) -L$(AXIS2C_HOME)/lib $(LIBS) ../util/misc.o ../util/euca_auth.o ./gl-client-marshal-adb.o -o $(SERVICE_SO)
+$(SERVICE_SO): generated/stubs gl-client-marshal-adb.o server-marshal.o handlers.o
+ $(CC) -shared generated/*.o server-marshal.o handlers.o $(WSSECLIBS) $(LIBS) ../util/misc.o ../util/euca_auth.o ./gl-client-marshal-adb.o -o $(SERVICE_SO)
client: $(CLIENT)
-$(CLIENT): generated/stubs $(CLIENT).c gl-client-marshal-adb.c handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
+$(CLIENT): generated/stubs $(CLIENT).c gl-client-marshal-adb.c handlers.o
$(CC) -o $(CLIENT) $(CFLAGS) $(INCLUDES) $(LIBS) generated/adb_*.o generated/axis2_stub_*.o ../util/misc.o ../util/euca_auth.o $(CLIENT).c gl-client-marshal-adb.c -DMODE=1
deploy:
View
4 node/Makefile
@@ -59,14 +59,14 @@ server: $(SERVICE_SO)
../util/windows-bundle.o: ../util/windows-bundle.c ../util/windows-bundle.h
make -C ../util
-$(SERVICE_SO): generated/stubs ../storage/storage.o ../storage/walrus.o ../net/vnetwork.o ../util/misc.o ../util/data.o ../util/windows-bundle.o server-marshal.o handlers.o $(NC_HANDLERS) $(AXIS2C_HOME)/lib/libaxutil.so ../util/eucalyptus.h ../util/euca_auth.o
+$(SERVICE_SO): generated/stubs ../storage/storage.o ../storage/walrus.o ../net/vnetwork.o ../util/misc.o ../util/data.o ../util/windows-bundle.o server-marshal.o handlers.o $(NC_HANDLERS) ../util/eucalyptus.h ../util/euca_auth.o
$(CC) -o $(SERVICE_SO) -shared $(NC_LIBS) generated/adb_*.o generated/axis2*_skel_*.o server-marshal.o handlers.o $(NC_HANDLERS) ../storage/walrus.o ../storage/storage.o ../storage/http.o ../storage/storage-windows.o ../net/*.o ../util/*.o
clientlib: generated/stubs ../util/data.o client-marshal-adb.o
client: $(CLIENT) $(CLIENT)_local
-$(CLIENT): generated/stubs ../util/misc.o ../util/data.o client-marshal-adb.o client-marshal-local.o $(AXIS2C_HOME)/lib/libaxutil.so $(CLIENT).c
+$(CLIENT): generated/stubs ../util/misc.o ../util/data.o client-marshal-adb.o client-marshal-local.o $(CLIENT).c
$(CC) -o $(CLIENT) $(CFLAGS) $(INCLUDES) $(NC_LIBS) generated/adb_*.o generated/axis2_stub_*.o client-marshal-adb.o ../util/*.o ../storage/storage.o ../storage/storage-windows.o ../storage/walrus.o ../net/*.o $(CLIENT).c
$(CLIENT)_local: generated/stubs ../util/misc.o ../util/data.o client-marshal-adb.o client-marshal-local.o handlers.o $(NC_HANDLERS) $(CLIENT).c ../util/euca_auth.o
View
2  storage/Makefile
@@ -6,7 +6,7 @@ include ../Makedefs
STORAGE_LIBS = -lcurl -lssl
IMAGER_LIBS = ../util/euca_auth.o ../util/misc.o ../util/ipc.o cache.o walrus.o cmd_download.o cmd_create.o cmd_inject.o cmd_convert.o cmd_upload.o cmd_bundle.o cmd_fsck.o map.o vmdk.o http.o img.o diskfile.o helpers.o
-VDDK_FLAGS = -L${VDDK_HOME}/lib -lvixDiskLib -lvixMntapi -std=gnu99 -UDYNAMIC_LOADING
+VDDK_FLAGS = $(LIBS) -lvixDiskLib -lvixMntapi -std=gnu99 -UDYNAMIC_LOADING
IMAGER_WRAPPER=euca_imager
IMAGER=_euca_imager
Please sign in to comment.
Something went wrong with that request. Please try again.