[eucalyptus] console bugfixes and systemd unit; clean-cc bugfix
Andy Grimm
arg at fedoraproject.org
Thu Dec 13 15:13:42 UTC 2012
commit 8ed4ad3e1ac738d8382bb713bd8b76ee7edd1ef1
Author: Andy Grimm <agrimm at gmail.com>
Date: Thu Dec 13 10:05:47 2012 -0500
console bugfixes and systemd unit; clean-cc bugfix
eucalyptus-clean-cc | 2 +-
eucalyptus-console.service | 15 ++++++++++
eucalyptus-no-console-cert-validation.patch | 11 +++++++
eucalyptus.spec | 41 +++++++++++++++-----------
4 files changed, 51 insertions(+), 18 deletions(-)
---
diff --git a/eucalyptus-clean-cc b/eucalyptus-clean-cc
index b9473b9..2d6ff84 100755
--- a/eucalyptus-clean-cc
+++ b/eucalyptus-clean-cc
@@ -107,7 +107,7 @@ do_fullclean() {
pkill -9 -s $sids >/dev/null 2>&1
fi
- rm -f $EUCARUNDIR/CC/*
+ rm -f $EUCASTATEDIR/CC/*
rm -f /dev/shm/*eucalyptusCC*
}
diff --git a/eucalyptus-console.service b/eucalyptus-console.service
new file mode 100644
index 0000000..1d48f49
--- /dev/null
+++ b/eucalyptus-console.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=The Eucalyptus Cluster Controller service
+After=syslog.target network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+User=eucaconsole
+PIDFile=/var/run/eucalyptus-console/eucalyptus-console.pid
+EnvironmentFile=/etc/sysconfig/eucalyptus-console
+ExecStart=/usr/bin/euca-console-server -d
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/eucalyptus-no-console-cert-validation.patch b/eucalyptus-no-console-cert-validation.patch
new file mode 100644
index 0000000..eb6e922
--- /dev/null
+++ b/eucalyptus-no-console-cert-validation.patch
@@ -0,0 +1,11 @@
+--- eucalyptus-3.2.0git5ab72572.orig/console/eucaconsole/botoclcinterface.py 2012-12-10 14:18:28.000000000 -0500
++++ eucalyptus-3.2.0git5ab72572/console/eucaconsole/botoclcinterface.py 2012-12-13 07:43:13.297385594 -0500
+@@ -52,7 +52,7 @@
+ except ConfigParser.Error:
+ pass
+ self.conn = EC2Connection(access_id, secret_key, region=reg,
+- port=port, path=path,
++ port=port, path=path, validate_certs=False,
+ is_secure=True, security_token=token, debug=0)
+ self.conn.APIVersion = '2012-03-01'
+ self.conn.http_connection_kwargs['timeout'] = 30
diff --git a/eucalyptus.spec b/eucalyptus.spec
index 8ee5327..d6d0b73 100644
--- a/eucalyptus.spec
+++ b/eucalyptus.spec
@@ -14,7 +14,7 @@
Summary: Elastic Utility Computing Architecture
Name: eucalyptus
Version: 3.2.0
-Release: 0.4.20121210git%{gittag}%{?dist}
+Release: 0.5.20121210git%{gittag}%{?dist}
License: GPLv3 and (GPLv3 and ASL 2.0) and (GPLv3 and BSD)
URL: http://www.eucalyptus.com
Group: Applications/System
@@ -46,9 +46,6 @@ BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang
BuildRequires: axiom
# BuildRequires: axis2
-%if 0%{?fedora} < 19
-BuildRequires: backport-util-concurrent
-%endif
BuildRequires: bcel
BuildRequires: bouncycastle
BuildRequires: btm
@@ -159,6 +156,9 @@ Source14: eucalyptus-nc-libvirt.rules
# Add tmpfiles config
Source15: eucalyptus.tmpfiles
+# Systemd unit for eucalyptus-console
+Source16: eucalyptus-console.service
+
# https://eucalyptus.atlassian.net/browse/EUCA-2364
Patch0: eucalyptus-jdk7.patch
# https://eucalyptus.atlassian.net/browse/EUCA-3253
@@ -208,6 +208,10 @@ Patch27: eucalyptus-bad-tgt-check.patch
# https://eucalyptus.atlassian.net/browse/EUCA-4400
Patch28: eucalyptus-unlink-mod_rampart.patch
+# cert validation in boto 2.6.0 breaks the user console,
+# since the CLC has a self-signed cert
+Patch29: eucalyptus-no-console-cert-validation.patch
+
%description
Eucalyptus is a service overlay that implements elastic computing
using existing resources. The goal of Eucalyptus is to allow sites
@@ -233,9 +237,6 @@ Requires: apache-commons-compress
Requires: apache-commons-fileupload
Requires: apache-commons-io
Requires: axiom
-%if 0%{?fedora} < 19
-Requires: backport-util-concurrent
-%endif
Requires: bcel
Requires: bouncycastle
Requires: btm
@@ -521,6 +522,7 @@ touch gatherlog/generated/stubs cluster/generated/stubs node/generated/stubs
%patch26 -p1
%patch27 -p1
%patch28 -p1
+%patch29 -p1
# remove classes which depend on junit
# This is because junit on Fedora bundles hamcrest 1.1, which has conflicts
@@ -608,9 +610,6 @@ do
fi
ln -s $x clc/lib/;
done
-%if 0%{?fedora} < 19
-ln -s /usr/share/java/backport-util-concurrent-3.1.jar clc/lib/
-%endif
# FIXME: storage/Makefile breaks with parallel make
make # %{?_smp_mflags}
@@ -722,6 +721,8 @@ install -p -m 644 %{SOURCE4} \
$RPM_BUILD_ROOT%{_unitdir}/eucalyptus-cc.service
install -p -m 644 %{SOURCE5} \
$RPM_BUILD_ROOT%{_unitdir}/eucalyptus-nc.service
+install -p -m 644 %{SOURCE16} \
+ $RPM_BUILD_ROOT%{_unitdir}/eucalyptus-console.service
# Copy axis2.xml into /etc for now, and symlink it
install -m 644 %{SOURCE6} \
@@ -780,10 +781,6 @@ install -m 0644 %{SOURCE15} $RPM_BUILD_ROOT/etc/tmpfiles.d/%{name}
pushd console
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-# Install init script
-install -d $RPM_BUILD_ROOT%{_initrddir}
-install -m 755 ../tools/eucalyptus-console-init $RPM_BUILD_ROOT%{_libexecdir}/%{name}/eucalyptus-console.init
-
# Install sysconfig file
install -d $RPM_BUILD_ROOT/etc/sysconfig
install -m 644 ../tools/eucalyptus-console.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/eucalyptus-console
@@ -969,7 +966,7 @@ popd console
%{python_sitelib}/eucaconsole*
%{python_sitelib}/Eucalyptus_Management_Console*.egg-info
%{_bindir}/euca-console-server
-%{_libexecdir}/eucalyptus/eucalyptus-console.init
+%{_unitdir}/eucalyptus-console.service
%attr(-,eucaconsole,eucaconsole) %{_datadir}/eucalyptus-console
%attr(-,eucaconsole,eucaconsole) %dir /etc/eucalyptus-console
%attr(-,eucaconsole,eucaconsole) %config /etc/eucalyptus-console/console.ini
@@ -992,8 +989,6 @@ getent passwd eucalyptus >/dev/null || \
-c 'Eucalyptus' eucalyptus
%pre console
-# TODO: systemd macros
-
getent group eucaconsole >/dev/null || groupadd -r eucaconsole
getent passwd eucaconsole >/dev/null || \
useradd -r -g eucaconsole -d /etc/eucalyptus-console \
@@ -1012,6 +1007,9 @@ udevadm control --reload-rules
usermod -a -G kvm eucalyptus
%systemd_post eucalyptus-nc.service
+%post console
+%systemd_post eucalyptus-console.service
+
%preun common-java
%systemd_preun eucalyptus-cloud.service
@@ -1021,6 +1019,9 @@ usermod -a -G kvm eucalyptus
%preun nc
%systemd_preun eucalyptus-nc.service
+%preun console
+%systemd_preun eucalyptus-console.service
+
%postun
# Reload udev rules on uninstall
if [ "$1" = "0" ]; then
@@ -1028,6 +1029,12 @@ if [ "$1" = "0" ]; then
fi
%changelog
+* Thu Dec 13 2012 Andy Grimm <agrimm at gmail.com> - 3.2.0-0.5.20121210git5ab7257
+- Remove backport-util-concurrent
+- Add systemd unit for eucalyptus-console
+- Fix cert validation error in eucalyptus-console
+- Fix a typo in eucalyptus-clean-cc script
+
* Wed Dec 12 2012 Andy Grimm <agrimm at gmail.com> - 3.2.0-0.4.20121210git5ab7257
- Use newer wss4j / xml-security / hibernate in F18
- Fix systemd macro usage
More information about the scm-commits
mailing list