Merge lp:~openstack-ubuntu-packagers/ubuntu/natty/nova/ubuntu-natty-packaging-changes into lp:~openstack-ubuntu-packagers/ubuntu/natty/nova/ubuntu

[Chuck Short]

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.

[Soren Hansen (soren)]

On 18-11-2010 17:42, Chuck Short wrote:
> 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-ubuntu-packagers)
>
>
> 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'
> --- 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~bzr403-0ubuntu1) UNRELEASED; urgency=low
>
> + [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-instancemonitor doesnt complain about missing python modules
> + when starting.
> + * debian/nova-common.install: Add missing templates.

> + * 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'
> --- debian/nova-api.conf 2010-11-18 15:16:24 +0000
> +++ debian/nova-api.conf 2010-11-18 16:42:00 +0000
> @@ -6,3 +6,7 @@
> --logfile=/var/log/nova/nova-api.log
> --sql_connection=sqlite:////var/lib/nova/nova.sqlite
> --FAKE_subdomain=ec2
> +--libvirt_xml_template=/usr/share/nova/libvirt.qemu.xml.template
> +--libvirt_uml_xml_template=/usr/share/nova/libvirt.uml.xml.template
> +--libvirt_rescue_xml_template=/usr/share/nova/libvirt.rescue.qemu.xml.template
> +--libvirt_rescue_uml_xml_template=/usr/share/nova/libvirt.rescue.uml.xml.template

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'
> --- 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"'/redis.pid!g' \
> - -e 's!^logfile .*!logfile /dev/stdout!g' \
> - -e 's!^port ...

review: Needs Fixing

[Chuck Short (zulcss)]

My comments are inline

> On 18-11-2010 17:42, Chuck Short wrote:
> > 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-ubuntu-packagers)
> >
> >
> > 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'
> > --- 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~bzr403-0ubuntu1) UNRELEASED; urgency=low
> >
> > + [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?

Nova.sh requires you to install it. And its required in the tools/pip-requires. If this is outdated then this change can be dropped.

> > + - 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.

Ill update the changelog then.

> > + - Add dependency to python-rrdtool so that nova-instancemonitor doesnt
> complain about missing python modules
> > + when starting.
> > + * debian/nova-common.install: Add missing templates.
>
> > + * 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.

So should I phrase it as "due to changes in nova between maverick and natty?"

> > - python-sqlalchemy, python-eventlet, python-routes
> > + python-sqlalchemy, python-eventlet, python-routes, python-greenlet
>
> Why?

See above:

> > === modified file 'debian/nova-api.conf'
> > --- debian/nova-api.conf 2010-11-18 15:16:24 +0000
> > +++ debian/nova-api.conf 2010-11-18 16:42:00 +0000
> > @@ -6,3 +6,7 @@
> > --logfile=/var/log/nova/nova-api.log
> > --sql_connection=sqlite:////var/lib/nova/nova.sqlite
> > --FAKE_subdomain=ec2
> > +--libvirt_xml_template=/usr/share/nova/libvirt.qemu.xml.template
> > +--libvirt_uml_xml_template=/usr/share/nova/libvirt.uml.xml.template
> > +--libvirt_rescue_xml_template=/usr/share/nova/libvirt.rescue.qemu.xml.templ
> ate
> > +--libvirt_rescue_uml_xml_template=/usr/share/nova/libvirt.rescue.uml.xml.te
> mplate
>
> 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.

Agreed, but if people want to test it right now they will have to add it to /etc/nova/nova-api.conf. ...

[Soren Hansen (soren)]

On 19-11-2010 15:49, Chuck Short wrote:
>>> + - Add python-greenlet as a build dependency.
>> Why?
> Nova.sh requires you to install it. And its required in the
> tools/pip-requires. If this is outdated then this change can be
> dropped.

It seems there's some ordering of builds or whatnot that gets messed up
if they don't do it that way. They're workarounds if you're using
virtualenv. We don't use python-greenlet directly, so shouldn't have to
add it.

>>> + * 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.
> So should I phrase it as "due to changes in nova between maverick and natty?"

Maybe "debian/nova-*.conf: Include flags that were added upstream since
last snapshot."?

Or even just "debian/nova-*.conf: Update flagfiles.". Vague is better
than wrong/misleading.

>> 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.
> Agreed, but if people want to test it right now they will have to add
> it to /etc/nova/nova-api.conf.

Right, exactly. That's why I said it was fine :)

> Ill add a bug with you guys.

Cool, thanks.

--
Soren Hansen
Ubuntu Developer http://www.ubuntu.com/
OpenStack Developer http://www.openstack.org/

[lp:~openstack-ubuntu-packagers/ubuntu/natty/nova/ubuntu-natty-packaging-changes]

14. By Chuck Short on 2010-11-19

We dont need greenlet afterall

15. By Chuck Short on 2010-11-19

Dont update the maintainer

16. By Chuck Short on 2010-11-19

Update changelog to reflect reality with respect to the flagfiles

[Soren Hansen (soren)]

One of the changelog lines are way too long and there are merge conflicts. Can you fix that up, please?

review: Needs Fixing

[Chuck Short (zulcss)]

> One of the changelog lines are way too long and there are merge conflicts. Can
> you fix that up, please?

Done

review: Needs Resubmitting

[lp:~openstack-ubuntu-packagers/ubuntu/natty/nova/ubuntu-natty-packaging-changes]

17. By Chuck Short on 2010-11-22

Fix up changelog

18. By Chuck Short on 2010-11-22

Merge trunk

[Soren Hansen (soren)]

Looks great. Feel free to merge it. I would do it, but I'm on my way out the door.

review: Approve

[Soren Hansen (soren)]

Never mind, just merged it.

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-19 13:11:53 +0000
+++ debian/changelog	2010-11-22 16:20:43 +0000
@@ -1,11 +1,20 @@
 nova (2011.1~bzr403-0ubuntu1) UNRELEASED; urgency=low
 
+  [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.
   * Add missing dependency on python-webob.
+ 
+  [Chuck Short]
+  * debian/control: 
+   - Add dependency to python-rrdtool so that nova-instancemonitor 
+     doesnt complain about missing python modules when starting.
+  * debian/nova-common.install: Add missing templates.
+  * debian/nova-*.conf: Update flagfiles to handle upstream changes.
+  * Dropped start-redis since we dont do redis anymore.
 
  -- Soren Hansen <[e-mail]>  Thu, 18 Nov 2010 16:25:46 +0100
 
 
=== modified file 'debian/control'
--- debian/control	2010-11-19 13:11:53 +0000
+++ debian/control	2010-11-22 16:20:43 +0000
@@ -214,7 +214,7 @@
 
 Package: nova-instancemonitor
 Architecture: all
-Depends: nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
+Depends: python-rrdtool, nova-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}
 Description: Nova instance monitor
  OpenStack is free, open source software for building reliable cloud
  infrastructure.
 
=== modified file 'debian/nova-api.conf'
--- debian/nova-api.conf	2010-11-18 15:16:24 +0000
+++ debian/nova-api.conf	2010-11-22 16:20:43 +0000
@@ -6,3 +6,7 @@
 --logfile=/var/log/nova/nova-api.log
 --sql_connection=sqlite:////var/lib/nova/nova.sqlite
 --FAKE_subdomain=ec2
+--libvirt_xml_template=/usr/share/nova/libvirt.qemu.xml.template
+--libvirt_uml_xml_template=/usr/share/nova/libvirt.uml.xml.template
+--libvirt_rescue_xml_template=/usr/share/nova/libvirt.rescue.qemu.xml.template
+--libvirt_rescue_uml_xml_template=/usr/share/nova/libvirt.rescue.uml.xml.template
 
=== modified file 'debian/nova-common.install'
--- debian/nova-common.install	2010-11-18 15:16:24 +0000
+++ debian/nova-common.install	2010-11-22 16:20:43 +0000
@@ -1,11 +1,15 @@
 usr/bin/nova-manage
-debian/nova-manage.conf               etc/nova
-nova/auth/novarc.template             usr/share/nova
-nova/cloudpipe/client.ovpn.template   usr/share/nova
-nova/virt/libvirt.qemu.xml.template   usr/share/nova
-nova/virt/libvirt.uml.xml.template    usr/share/nova
-nova/virt/interfaces.template         usr/share/nova
-CA/openssl.cnf.tmpl                   var/lib/nova/CA
-CA/geninter.sh                        var/lib/nova/CA
-CA/genrootca.sh                       var/lib/nova/CA
-debian/nova_sudoers                   etc/sudoers.d
+debian/nova-manage.conf               		etc/nova
+nova/auth/novarc.template             		usr/share/nova
+nova/cloudpipe/client.ovpn.template   		usr/share/nova
+nova/virt/libvirt.qemu.xml.template   		usr/share/nova
+nova/virt/libvirt.rescue.qemu.xml.template   	usr/share/nova
+nova/virt/libvirt.uml.xml.template    		usr/share/nova
+nova/virt/libvirt.rescue.ml.xml.template    	usr/share/nova
+nova/virt/libvirt.xen.xml.template		usr/share/nova
+nova/virt/libvirt.rescue.xen.xml.template	usr/share/nova
+nova/virt/interfaces.template         		usr/share/nova
+CA/openssl.cnf.tmpl                   		var/lib/nova/CA
+CA/geninter.sh                        		var/lib/nova/CA
+CA/genrootca.sh                       		var/lib/nova/CA
+debian/nova_sudoers                   		etc/sudoers.d
 
=== modified file 'debian/nova-compute.conf'
--- debian/nova-compute.conf	2010-11-18 15:16:24 +0000
+++ debian/nova-compute.conf	2010-11-22 16:20:43 +0000
@@ -4,6 +4,8 @@
 --injected_network_template=/usr/share/nova/interfaces.template
 --libvirt_xml_template=/usr/share/nova/libvirt.qemu.xml.template
 --libvirt_uml_xml_template=/usr/share/nova/libvirt.uml.xml.template
+--libvirt_rescue_xml_template=/usr/share/nova/libvirt.rescue.qemu.xml.template
+--libvirt_rescue_uml_xml_template=/usr/share/nova/libvirt.rescue.uml.xml.template
 --vpn_client_template=/usr/share/nova/client.ovpn.template
 --credentials_template=/usr/share/nova/novarc.template
 --logfile=/var/log/nova/nova-compute.log
 
=== removed file 'debian/start-redis'
--- 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"'/redis.pid!g' \
-	-e 's!^logfile .*!logfile /dev/stdout!g' \
-	-e 's!^port .*!port '$port'!g' \
-	/etc/redis/redis.conf | redis-server -
-echo $port
-exit 0