Merge lp://qastaging/~openstack-ubuntu-packagers/ubuntu/natty/nova/ubuntu-natty-packaging-changes into lp://qastaging/~openstack-ubuntu-packagers/ubuntu/natty/nova/ubuntu
Proposed by
Chuck Short
Status: | Merged |
---|---|
Approved by: | Soren Hansen |
Approved revision: | 18 |
Merged at revision: | 7 |
Proposed branch: | lp://qastaging/~openstack-ubuntu-packagers/ubuntu/natty/nova/ubuntu-natty-packaging-changes |
Merge into: | lp://qastaging/~openstack-ubuntu-packagers/ubuntu/natty/nova/ubuntu |
Diff against target: |
118 lines (+30/-32) 6 files modified
debian/changelog (+9/-0) debian/control (+1/-1) debian/nova-api.conf (+4/-0) debian/nova-common.install (+14/-10) debian/nova-compute.conf (+2/-0) debian/start-redis (+0/-21) |
To merge this branch: | bzr merge lp://qastaging/~openstack-ubuntu-packagers/ubuntu/natty/nova/ubuntu-natty-packaging-changes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Soren Hansen (community) | Approve | ||
Chuck Short (community) | Needs Resubmitting | ||
Review via email: mp+41194@code.qastaging.launchpad.net |
Description of the change
natty debian changes:
- Update build dependencies by adding python-greenlet.
- Add missing template files that were previously not added before.
- Update nova configuration files due to nova-api changes
- Add python-rrdtool as a dependency to nova-monitor.
- Add options to install user-mode-linux.
To post a comment you must log in.
On 18-11-2010 17:42, Chuck Short wrote: ubuntu- packagers)
> Chuck Short has proposed merging lp:~openstack-ubuntu-packagers/ubuntu/natty/nova/ubuntu-natty-packaging-changes into lp:~openstack-ubuntu-packagers/ubuntu/natty/nova/ubuntu.
>
> Requested reviews:
> OpenStack Ubuntu packagers (openstack-
>
>
> natty debian changes
Please be more verbose about the changes you're making. This is the
Natty packaging branch. If you want to change it, it's rather obvious
that they're natty changes. :)
> === modified file 'debian/changelog' bzr403- 0ubuntu1) UNRELEASED; urgency=low
> --- debian/changelog 2010-11-18 15:35:00 +0000
> +++ debian/changelog 2010-11-18 16:42:00 +0000
> @@ -1,10 +1,22 @@
> nova (2011.1~
>
> + [Soren Hansen]
> * New upstream snapshot.
> * Added the new tarballs page to debian/watch.
> * Clean out patch-branches (everything is upstream now).
> * Remove redis-server as a build-depends and don't start it for tests
> anymore.
> +
> + [Chuck Short]
> + * debian/control:
> + - Add option to use user-mode-linux
"Add UML templates to flagfile" would be better.
> + - Add python-greenlet as a build dependency.
Why?
> + - Update maintainer according to spec.
a) The spec deals with packages that we import from Debian.
b) If the Maintainer already is an @ubuntu.com address, you don't have
to change it.
It's ok that you did, it's just the log entry that's off.
> + - Add dependency to python-rrdtool so that nova-instancemo nitor doesnt complain about missing python modules nova-common. install: Add missing templates.
> + when starting.
> + * debian/
> + * debian/nova-*.conf: Update configs due to changes to nova-api.
Not all the changes you made to the conf files are due to change in
nova-api. They're due to all sorts of things.
> - python-sqlalchemy, python-eventlet, python-routes
> + python-sqlalchemy, python-eventlet, python-routes, python-greenlet
Why?
> === modified file 'debian/ nova-api. conf' nova-api. conf 2010-11-18 15:16:24 +0000 nova-api. conf 2010-11-18 16:42:00 +0000 /var/log/ nova/nova- api.log n=sqlite: ////var/ lib/nova/ nova.sqlite subdomain= ec2 xml_template= /usr/share/ nova/libvirt. qemu.xml. template uml_xml_ template= /usr/share/ nova/libvirt. uml.xml. template rescue_ xml_template= /usr/share/ nova/libvirt. rescue. qemu.xml. template rescue_ uml_xml_ template= /usr/share/ nova/libvirt. rescue. uml.xml. template
> --- debian/
> +++ debian/
> @@ -6,3 +6,7 @@
> --logfile=
> --sql_connectio
> --FAKE_
> +--libvirt_
> +--libvirt_
> +--libvirt_
> +--libvirt_
This is fine, but soon won't be needed anymore, just FYI. The API server
doesn't use them, so it's a bug that it needs them there.
> === removed file 'debian/ start-redis' '/redis. pid!g' \
> --- debian/start-redis 2010-11-18 15:16:24 +0000
> +++ debian/start-redis 1970-01-01 00:00:00 +0000
> @@ -1,21 +0,0 @@
> -#!/bin/sh
> -
> -port=6379
> -maxport=6400
> -while netstat -ln | grep -q :$port.*LISTEN
> -do
> - if [ $port -eq $maxport ]
> - then
> - exit 1
> - fi
> - port=$(($port + 1))
> -done
> -
> -sed -e 's!^save!#&!g' \
> - -e 's!^dir .*!dir '"$PWD"'!g' \
> - -e 's!^pidfile .*!pidfile '"$PWD"
> - -e 's!^logfile .*!logfile /dev/stdout!g' \
> - -e 's!^port ...