Merge lp://qastaging/~anotherjesse/nova/unused-reqs into lp://qastaging/~hudson-openstack/nova/trunk

lgtm

gawk may still be required. It is needed for libvirt nwfilter driver and some versions of the libvirt packaging weren't listing it as a dependency. Are we not using python-tempita anymore?

Vish

On Apr 17, 2011, at 10:02 PM, anotherjesse wrote:

> anotherjesse has proposed merging lp:~anotherjesse/nova/unused-reqs into lp:nova.
>
> Requested reviews:
> Nova Core (nova-core)
>
> For more details, see:
> https://code.launchpad.net/~anotherjesse/nova/unused-reqs/+merge/58067
> --
> https://code.launchpad.net/~anotherjesse/nova/unused-reqs/+merge/58067
> You are subscribed to branch lp:nova.
> === modified file 'contrib/nova.sh'
> --- contrib/nova.sh 2011-03-25 16:40:59 +0000
> +++ contrib/nova.sh 2011-04-18 05:01:50 +0000
> @@ -65,7 +65,7 @@
> sudo apt-get install -y python-software-properties
> sudo add-apt-repository ppa:nova-core/trunk
> sudo apt-get update
> - sudo apt-get install -y dnsmasq-base kpartx kvm gawk iptables ebtables
> + sudo apt-get install -y dnsmasq-base kpartx kvm iptables ebtables
> sudo apt-get install -y user-mode-linux kvm libvirt-bin
> sudo apt-get install -y screen euca2ools vlan curl rabbitmq-server
> sudo apt-get install -y lvm2 iscsitarget open-iscsi
> @@ -80,7 +80,7 @@
> sudo apt-get install -y python-libvirt python-libxml2 python-routes
> sudo apt-get install -y python-netaddr python-pastedeploy python-eventlet
> sudo apt-get install -y python-novaclient python-glance python-cheetah
> - sudo apt-get install -y python-carrot python-tempita python-sqlalchemy
> + sudo apt-get install -y python-carrot python-sqlalchemy
> sudo apt-get install -y python-suds
>
>
>
> === modified file 'doc/source/runnova/getting.started.rst'
> --- doc/source/runnova/getting.started.rst 2011-02-21 20:30:20 +0000
> +++ doc/source/runnova/getting.started.rst 2011-04-18 05:01:50 +0000
> @@ -66,7 +66,6 @@
>
> * iptables
> * ebtables
> -* gawk
> * curl
> * kvm
> * libvirt
>
> === modified file 'tools/pip-requires'
> --- tools/pip-requires 2011-03-31 03:33:56 +0000
> +++ tools/pip-requires 2011-04-18 05:01:50 +0000
> @@ -5,19 +5,15 @@
> Cheetah==2.4.2.1
> M2Crypto==0.20.2
> amqplib==0.6.1
> -anyjson==0.2.4
> boto==1.9b
> carrot==0.10.5
> eventlet==0.9.12
> lockfile==0.8
> python-novaclient==2.3
> -python-daemon==1.5.5
> python-gflags==1.3
> redis==2.0.0
> routes==1.12.3
> WebOb==0.9.8
> -wsgiref==0.1.2
> -zope.interface==3.6.1
> mox==0.5.0
> -f http://pymox.googlecode.com/files/mox-0.5.0.tar.gz
> greenlet==0.3.1
>

With regards to gawk - perhaps we should just add a note that if you have an older version of libvirt you might need to add gawk?

I don't think we are using tempita:

$ grep -i -r tempita .
./contrib/nova.sh: sudo apt-get install -y python-carrot python-tempita python-sqlalchemy

On Apr 17, 2011, at 11:51 PM, Vish Ishaya wrote:

> gawk may still be required. It is needed for libvirt nwfilter driver and some versions of the libvirt packaging weren't listing it as a dependency. Are we not using python-tempita anymore?
>
> Vish
>
> On Apr 17, 2011, at 10:02 PM, anotherjesse wrote:
>
>> anotherjesse has proposed merging lp:~anotherjesse/nova/unused-reqs into lp:nova.
>>
>> Requested reviews:
>> Nova Core (nova-core)
>>
>> For more details, see:
>> https://code.launchpad.net/~anotherjesse/nova/unused-reqs/+merge/58067
>> --
>> https://code.launchpad.net/~anotherjesse/nova/unused-reqs/+merge/58067
>> You are subscribed to branch lp:nova.
>> === modified file 'contrib/nova.sh'
>> --- contrib/nova.sh 2011-03-25 16:40:59 +0000
>> +++ contrib/nova.sh 2011-04-18 05:01:50 +0000
>> @@ -65,7 +65,7 @@
>> sudo apt-get install -y python-software-properties
>> sudo add-apt-repository ppa:nova-core/trunk
>> sudo apt-get update
>> - sudo apt-get install -y dnsmasq-base kpartx kvm gawk iptables ebtables
>> + sudo apt-get install -y dnsmasq-base kpartx kvm iptables ebtables
>> sudo apt-get install -y user-mode-linux kvm libvirt-bin
>> sudo apt-get install -y screen euca2ools vlan curl rabbitmq-server
>> sudo apt-get install -y lvm2 iscsitarget open-iscsi
>> @@ -80,7 +80,7 @@
>> sudo apt-get install -y python-libvirt python-libxml2 python-routes
>> sudo apt-get install -y python-netaddr python-pastedeploy python-eventlet
>> sudo apt-get install -y python-novaclient python-glance python-cheetah
>> - sudo apt-get install -y python-carrot python-tempita python-sqlalchemy
>> + sudo apt-get install -y python-carrot python-sqlalchemy
>> sudo apt-get install -y python-suds
>>
>>
>>
>> === modified file 'doc/source/runnova/getting.started.rst'
>> --- doc/source/runnova/getting.started.rst 2011-02-21 20:30:20 +0000
>> +++ doc/source/runnova/getting.started.rst 2011-04-18 05:01:50 +0000
>> @@ -66,7 +66,6 @@
>>
>> * iptables
>> * ebtables
>> -* gawk
>> * curl
>> * kvm
>> * libvirt
>>
>> === modified file 'tools/pip-requires'
>> --- tools/pip-requires 2011-03-31 03:33:56 +0000
>> +++ tools/pip-requires 2011-04-18 05:01:50 +0000
>> @@ -5,19 +5,15 @@
>> Cheetah==2.4.2.1
>> M2Crypto==0.20.2
>> amqplib==0.6.1
>> -anyjson==0.2.4
>> boto==1.9b
>> carrot==0.10.5
>> eventlet==0.9.12
>> lockfile==0.8
>> python-novaclient==2.3
>> -python-daemon==1.5.5
>> python-gflags==1.3
>> redis==2.0.0
>> routes==1.12.3
>> WebOb==0.9.8
>> -wsgiref==0.1.2
>> -zope.interface==3.6.1
>> mox==0.5.0
>> -f http://pymox.googlecode.com/files/mox-0.5.0.tar.gz
>> greenlet==0.3.1
>>
>
>
> --
> https://code.launchpad.net/~anotherjesse/nova/unused-reqs/+merge/58067
> You are the owner of lp:~anotherjesse/nova/unused-reqs.

Needs a commit message to land. Otherwise seems alright to me.

This branch fails to merge w/ trunk:

Text conflict in tools/pip-requires
1 conflicts encountered.

Setting to work in progress while merge issues are resolved.