Merge lp:~andreserl/ubuntu/natty/eucalyptus/lp732082 into lp:~ubuntu-virt/ubuntu/natty/eucalyptus/natty

[Andres Rodriguez]

[lp:~andreserl/ubuntu/natty/eucalyptus/lp732082]

1134. By Andres Rodriguez on 2011-03-17

debian/control: Change Recommends order of bittorrent to bittornado
first. Allows demontion of bittorrent. (LP: #697753)

[Dave Walker (davewalker)]

Looks good to me... nice work.

It will introduce a new binary package, but it doesn't introduce new files.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-05 09:31:36 +0000
+++ debian/changelog	2011-03-17 20:02:50 +0000
@@ -1,3 +1,24 @@
+eucalyptus (2.0.1+bzr1256-0ubuntu3) natty; urgency=low
+
+  * Separate admin tools from eucalyptus-common package(LP: #732082)
+    - debian/control:
+      + Add eucalyptus-admin-tools binary package.
+      + Add missing Depends on python-psutil. (LP: #731672)
+      + eucalyptus-cloud: Depends on eucalyptus-admin-tools.
+    - debian/eucalyptus-admin-tools.install: Added.
+    - debian/eucalyptus-common.install: Drop installation of admin tools.
+  * Switch to dh_python2 instead of python-central.
+    - debian/control. Bump Depends on cdbs to (>= 0.4.90~); bump depends on
+      python to (>= 2.6.6-3).
+  * Add powernap configs to leverage recent PowerNap changes (LP: #726769):
+    - debian/powernap/eucalyptus.conf: Add config.
+    - debian/eucalyptus-nc.install: Install config.
+    - debian/eucalyptus-nc.links: Symlink to /etc/powernap/config.d/.
+  * debian/control: Change Recommends order of bittorrent to bittornado
+    first. Allows demontion of bittorrent. (LP: #697753)
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 17 Mar 2011 15:23:36 -0400
+
 eucalyptus (2.0.1+bzr1256-0ubuntu2) natty; urgency=low
 
   [ Andres Rodriguez ]
 
=== modified file 'debian/control'
--- debian/control	2011-03-04 22:25:46 +0000
+++ debian/control	2011-03-17 20:02:50 +0000
@@ -5,7 +5,7 @@
 Build-Depends:
  ant,
  ant-optional,
- cdbs,
+ cdbs (>= 0.4.90~),
  debhelper (>= 7),
  default-jdk,
  groovy (>= 1.7),
@@ -56,25 +56,21 @@
  zlib1g-dev,
  libjavassist-java,
  libjetty-extra-java,
- python-central (>= 0.5),
- python
-XS-Python-Version: >= 2.5
+ python (>= 2.6.6-3)
+XS-Python-Version: >= 2.6
 Standards-Version: 3.9.1
 Homepage: http://open.eucalyptus.com/
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-virt/ubuntu/natty/eucalyptus/natty/revision/1120
 
 Package: eucalyptus-common
 Architecture: any
-XB-Python-Version: ${python:Versions}
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  adduser,
  openssh-server (>= 1:5.2p1-1ubuntu1),
  openssh-client,
- avahi-utils,
- python,
- python-boto
+ avahi-utils
 Recommends:
  unzip,
  munin-node
@@ -87,6 +83,23 @@
  This package contains the common parts: you will need to install either
  eucalyptus-cloud, eucalyptus-cc or eucalyptus-nc (or all of them).
 
+Package: eucalyptus-admin-tools
+Architecture: any
+XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends},
+ ${misc:Depends},
+ python-boto,
+ python-psutil
+Conflicts: eucalyptus-common (<= 2.0.1+bzr1256-0ubuntu2)
+Replaces: eucalyptus-common (<= 2.0.1+bzr1256-0ubuntu2)
+Description: Elastic Utility Computing Architecture - Admin tools
+ EUCALYPTUS is an open source service overlay that implements elastic
+ 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 the eucalyptus admin tools.
+
 Package: eucalyptus-sc
 Architecture: any
 Depends:
@@ -114,7 +127,8 @@
  ${misc:Depends},
  eucalyptus-common,
  uec-component-listener,
- eucalyptus-java-common
+ eucalyptus-java-common,
+ eucalyptus-admin-tools
 Recommends:
  python-image-store-proxy,
  postfix | mail-transport-agent,
@@ -140,7 +154,7 @@
  eucalyptus-java-common
 Recommends:
  munin-node,
- bittorrent | bittornado
+ bittornado | bittorrent
 Description: Elastic Utility Computing Architecture - Walrus (S3)
  EUCALYPTUS is an open source service overlay that implements elastic
  computing using existing resources. The goal of EUCALYPTUS is to allow
 
=== added file 'debian/eucalyptus-admin-tools.install'
--- debian/eucalyptus-admin-tools.install	1970-01-01 00:00:00 +0000
+++ debian/eucalyptus-admin-tools.install	2011-03-17 20:02:50 +0000
@@ -0,0 +1,16 @@
+/usr/sbin/euca-add-user
+/usr/sbin/euca-delete-user
+/usr/sbin/euca-deregister-cluster
+/usr/sbin/euca-deregister-storage-controller
+/usr/sbin/euca-deregister-walrus
+/usr/sbin/euca-describe-clusters
+/usr/sbin/euca-describe-properties
+/usr/sbin/euca-describe-storage-controllers
+/usr/sbin/euca-describe-users
+/usr/sbin/euca-describe-walruses
+/usr/sbin/euca-get-credentials
+/usr/sbin/euca-modify-property
+/usr/sbin/euca-register-cluster
+/usr/sbin/euca-register-storage-controller
+/usr/sbin/euca-register-walrus
+/usr/sbin/euca_admin usr/share/pyshared/
 
=== modified file 'debian/eucalyptus-common.install'
--- debian/eucalyptus-common.install	2011-03-04 22:25:46 +0000
+++ debian/eucalyptus-common.install	2011-03-17 20:02:50 +0000
@@ -25,19 +25,3 @@
 debian/axis2.xml /etc/eucalyptus/axis2
 debian/source_eucalyptus.py usr/share/apport/package-hooks
 debian/15-eucalyptus-url /etc/update-motd.d/
-/usr/sbin/euca-add-user
-/usr/sbin/euca-delete-user
-/usr/sbin/euca-deregister-cluster
-/usr/sbin/euca-deregister-storage-controller
-/usr/sbin/euca-deregister-walrus
-/usr/sbin/euca-describe-clusters
-/usr/sbin/euca-describe-properties
-/usr/sbin/euca-describe-storage-controllers
-/usr/sbin/euca-describe-users
-/usr/sbin/euca-describe-walruses
-/usr/sbin/euca-get-credentials
-/usr/sbin/euca-modify-property
-/usr/sbin/euca-register-cluster
-/usr/sbin/euca-register-storage-controller
-/usr/sbin/euca-register-walrus
-/usr/sbin/euca_admin usr/share/pyshared/
 
=== modified file 'debian/eucalyptus-nc.install'
--- debian/eucalyptus-nc.install	2010-08-03 13:11:48 +0000
+++ debian/eucalyptus-nc.install	2011-03-17 20:02:50 +0000
@@ -12,3 +12,4 @@
 /usr/share/eucalyptus/disconnect_iscsitarget.pl
 /usr/share/eucalyptus/get_iscsitarget.pl
 debian/30-eucalyptus-nc.conf etc/sysctl.d
+debian/powernap/eucalyptus.conf usr/share/eucalyptus/powernap
 
=== added file 'debian/eucalyptus-nc.links'
--- debian/eucalyptus-nc.links	1970-01-01 00:00:00 +0000
+++ debian/eucalyptus-nc.links	2011-03-17 20:02:50 +0000
@@ -0,0 +1,1 @@
+usr/share/eucalyptus/powernap/eucalyptus.conf etc/powernap/config.d/eucalyptus.conf
 
=== added directory 'debian/powernap'
=== added file 'debian/powernap/eucalyptus.conf'
--- debian/powernap/eucalyptus.conf	1970-01-01 00:00:00 +0000
+++ debian/powernap/eucalyptus.conf	2011-03-17 20:02:50 +0000
@@ -0,0 +1,37 @@
+# This config file adds/overrides PowerNap Monitor configuration for Eucalyptus
+# compatibility with PowerNap, due to recent PowerNap changes.
+
+[ProcessMonitor]
+# By default, it is assumed that PowerNap runs with PowerSave (ACTION_METHOD=0)
+# (see /etc/powernap/config). This monitor will prevent PowerNap from entering
+# into a lower power state by tracking the KVM Process. This means that when
+# no instances are being run in the Node Controller, PowerNap will enter into
+# a lower Power State.
+# Setting this monitor will allow PowerNap to save power even though Eucalyptus
+# has not been configured to do so. This Monitor is enabled by default and should
+# be used in the following situations:
+#  - When running SCHEDPOLICY=ROUNDROBIN, Eucalyptus will not manage PowerNap
+#    at all. PowerNap will, however, enter into PowerSaving mode when no KVM
+#    Processes are found in the NC.
+#  - When running SCHEDPOLICY=POWERSAVE, Eucalyptus will decide when to put a
+#    NC to sleep by sending the powernap-now command. This command will execute
+#    the defined ACTION_METHOD, however, having this Monitor enabled, it will
+#    ensure that the NC enters to a PowerSave mode when there are no instances
+#    running. PowerNap and Eucalyptus in convination will manage the power saving
+#    features.
+euca-kvm = "kvm"
+
+# When PowerNap ACTION_METHOD is configured to Suspend/Poweroff/Best-Effor
+# (ACTION_METHOD equal to 1, 2, 3 or 4), this Process Monitor will prevent PowerNap
+# from executing an action when it shouldn't.
+# This monitor MUST be used to prevent PowerNap from taking the NC to a sleep
+# state in the following situations:
+#  - When running SCHEDPOLICY=ROUNDROBIN, Eucalyptus does not manage power saving
+#    and adding this monitor will prevent PowerNap to put NC's to sleep even when
+#    there are instances running.
+#  - When running SCHEDPOLICY=POWERSAVE, Eucalyptus automatically manage when the
+#    NC's are put to sleep (sending powernap-now command). This monitor prevents
+#    PowerNap from putting NC's to sleep when Eucalyptus hasn't decided to so. This
+#    allows Eucalyptus to solely manage the POWERSAVE feature without the manual
+#    intervention of PowerNap.
+#euca-init = "^/sbin/init"
 
=== modified file 'debian/rules'
--- debian/rules	2011-03-04 22:25:46 +0000
+++ debian/rules	2011-03-17 20:02:50 +0000
@@ -56,7 +56,9 @@
 binary-install/eucalyptus-common::
 	dh_installinit -p$(cdbs_curpkg) --name=eucalyptus-network
 	dh_installinit -p$(cdbs_curpkg) --name=eucalyptus
-	DH_PYCENTRAL="include-links" dh_pycentral -peucalyptus-common
+
+binary-install/eucalyptus-admin-tools::
+	dh_python2
 
 binary-install/eucalyptus-cc::
 	dh_installinit -p$(cdbs_curpkg) --name=eucalyptus-cc-publication