Merge lp:~james-page/nova/compute-plus-others into lp:~ubuntu-server-dev/nova/icehouse

[James Page]

See changelog for details.

[lp:~james-page/nova/compute-plus-others]

645. By James Page on 2013-12-12

* d/control: Drop BDI on openssh-client, no longer required.
* d/control: Drop dependency on curl, no longer required.
* d/control,rules,nova-compute-uml.*: Drop nova-compute-uml package.

646. By James Page on 2013-12-12

Resurect openssh-client usage

647. By James Page on 2013-12-12

Add missing vmware files

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-12 14:08:51 +0000
+++ debian/changelog	2013-12-12 16:36:45 +0000
@@ -3,14 +3,29 @@
   [ Chuck Short ]
   * debian/patches/fix-libvirt-regression.patch: Dropped.
   * debian/patches/sqlachemy-0.8.3-compat.patch: Refreshed.
-  * debian/control: Add python-pycadf as a dependency.
-  * debian/patches/fix-requirements.patch: Refreshed
+  * debian/control: Add python-pycadf dependency.
+  * debian/patches/fix-requirements.patch: Refreshed.
 
   [ James Page ]
   * d/nova-compute-*.conf: Update default hypervisor configurations
     to use new libvirt section configuration. 
   * d/control: Bump version for stevedore to >= 0.12.
   * d/p/*: Refreshed.
+  * d/control: Add new nova-compute-libvirt package to support libvirt
+    based hypervisors, rework dependencies for nova-compute{-*} to
+    align to this approach (LP: #928834).
+  * d/nova-compute.postinst: Renamed to nova-compute-libvirt.postinst
+    as its only appropriate for libvirt based hypervisors.
+  * d/control,nova-compute-vmware.*,rules: Add new nova-compute-vmware
+    hypervisor package.
+  * d/control: Add missing ebtables dependency for nova-network
+    (LP: #1161338).
+  * d/nova-compute.upstart: If libvirt-bin is installed, then wait
+    for it to reach running state before starting nova-compute
+    (LP: #907152, #1190280).
+  * d/nova-spiceproxy.logrotate: Manage the correct log file (LP: #1259332).
+  * d/control: Drop dependency on curl, no longer required.
+  * d/control,rules,nova-compute-uml.*: Drop nova-compute-uml package.
 
  -- Chuck Short <[e-mail]>  Thu, 05 Dec 2013 15:08:16 -0500
 
 
=== modified file 'debian/control'
--- debian/control	2013-12-11 14:07:07 +0000
+++ debian/control	2013-12-12 16:36:45 +0000
@@ -4,10 +4,12 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Openstack Maintainers <[e-mail]>
 Uploaders: Soren Hansen <[e-mail]>, Thomas Goirand <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50),
+Build-Depends:
+ debhelper (>= 7.0.50),
  python-all (>= 2.6),
  python-all-dev (>= 2.6.6-3~)
-Build-Depends-Indep: openssh-client,
+Build-Depends-Indep:
+ openssh-client,
  openssl,
  python-amqplib (>= 0.6.1),
  python-anyjson (>= 0.3.3),
@@ -18,20 +20,21 @@
  python-crypto,
  python-distutils-extra,
  python-eventlet (>= 0.13.0),
+ python-feedparser,
  python-fixtures (>= 0.3.14),
- python-feedparser,
+ python-glanceclient (>= 1:0.9.0),
  python-greenlet (>= 0.3.2),
- python-glanceclient (>= 1:0.9.0),
  python-iso8601,
+ python-jinja2,
+ python-jsonschema (>= 1.3.0),
  python-keystoneclient (>= 1:0.3.2),
  python-kombu (>= 2.5.12),
- python-jsonschema (>= 1.3.0),
- python-jinja2,
  python-lxml (>= 2.3),
  python-migrate (>= 0.8.2),
  python-mock,
  python-mox,
  python-netaddr (>= 0.7.6),
+ python-neutronclient (>= 1:2.3.0),
  python-oslo.config (>= 1:1.2.0),
  python-oslo.sphinx,
  python-paramiko (>= 1.8.0),
@@ -40,13 +43,12 @@
  python-pbr (>= 0.5.21),
  python-pyasn1,
  python-pycadf (>= 0.1.9),
- python-neutronclient (>= 1:2.3.0),
  python-routes,
  python-setuptools,
  python-six (>= 1.4.1),
- python-stevedore (>= 0.12),
  python-sphinx (>> 1.0),
  python-sqlalchemy-ext ( >= 0.7.8-1~) | python-sqlalchemy,
+ python-stevedore (>= 0.12),
  python-suds,
  python-testtools (>= 0.9.32),
  python-webob (>= 1.2.3),
@@ -63,7 +65,8 @@
 Package: python-nova
 Architecture: all
 Section: python
-Depends: openssh-client,
+Depends:
+ openssh-client,
  openssl,
  python-amqplib (>= 0.6.1),
  python-anyjson (>= 0.3.3),
@@ -71,29 +74,29 @@
  python-boto (>= 2.4.0),
  python-cinderclient (>= 1:1.0.5),
  python-eventlet (>= 0.13.0),
+ python-glanceclient (>= 1:0.9.0),
  python-greenlet (>= 0.3.2),
- python-glanceclient (>= 1:0.9.0),
- python-keystoneclient (>= 1:0.3.2),
- python-neutronclient (>= 1:2.3.0),
  python-iso8601,
  python-jinja2,
  python-jsonschema (>= 1.3.0),
+ python-keystoneclient (>= 1:0.3.2),
  python-kombu (>= 2.5.12),
  python-lxml (>= 2.3),
  python-m2crypto,
  python-migrate,
  python-netaddr (>= 0.7.6),
+ python-neutronclient (>= 1:2.3.0),
  python-oslo.config (>= 1:1.2.0),
  python-paramiko (>= 1.8.0),
  python-paste,
  python-pastedeploy (>= 1.5.0),
+ python-pyasn1,
+ python-pycadf (>= 0.1.9),
  python-routes,
+ python-simplejson,
  python-six,
- python-simplejson,
  python-sqlalchemy-ext ( >= 0.7.8-1~) | python-sqlalchemy (<< 0.6.3-2),
  python-stevedore (>= 0.12),
- python-pyasn1,
- python-pycadf (>= 0.1.9),
  python-suds,
  python-webob (>= 1.2.3),
  sudo,
@@ -123,7 +126,8 @@
 
 Package: nova-common
 Architecture: all
-Depends: adduser,
+Depends:
+ adduser,
  python-nova (= ${binary:Version}),
  ${misc:Depends},
  ${python:Depends}
@@ -148,24 +152,48 @@
 
 Package: nova-compute
 Architecture: all
-Depends: curl,
+Depends:
+ nova-common (= ${binary:Version}),
+ nova-compute-kvm | nova-compute-hypervisor,
+ ${misc:Depends},
+ ${python:Depends}
+Description: OpenStack Compute - compute node base
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
+ addition to its "native" API (the OpenStack API), it also supports the Amazon
+ EC2 API.
+ .
+ Nova is intended to be modular and easy to extend and adapt. It supports many
+ different hypervisors (KVM and Xen to name a few), different database backends
+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
+ databases (LDAP or SQL), etc.
+ .
+ This is the package you will install on the nodes that will run your
+ virtual machines.
+
+Package: nova-compute-libvirt
+Architecture: all
+Depends:
+ adduser,
  ebtables,
- gawk,
+ genisoimage,
  iptables,
  kpartx,
- lsb-base (>= 3.0.6),
- nova-common (= ${binary:Version}),
- nova-compute-kvm | nova-compute-hypervisor,
+ libvirt-bin,
+ nova-compute (= ${binary:Version}),
  open-iscsi,
  parted,
+ python-libvirt,
  qemu-utils,
- genisoimage,
  vlan,
  ${misc:Depends},
- ${python:Depends},
- adduser
-Suggests: guestmount, sysfsutils, sg3-utils, multipath-tools
-Description: OpenStack Compute - compute node
+ ${python:Depends}
+Suggests: guestmount, multipath-tools, sg3-utils, sysfsutils
+Description: OpenStack Compute - compute node libvirt support
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
  and private cloud providers regardless of size, by being simple to implement
@@ -180,15 +208,12 @@
  (SQLite, MySQL, and PostgreSQL, for instance), different types of user
  databases (LDAP or SQL), etc.
  .
- This is the package you will install on the nodes that will run your
- virtual machines.
+ This package provides common dependencies and setup for all libvirt based
+ hypervisor options.
 
 Package: nova-compute-lxc
 Architecture: all
-Depends: libvirt-bin,
- nova-compute (= ${binary:Version}),
- python-libvirt,
- ${misc:Depends}
+Depends: nova-compute-libvirt (= ${binary:Version}), ${misc:Depends}
 Provides: nova-compute-hypervisor
 Conflicts: nova-compute-hypervisor
 Description: OpenStack Compute - compute node (LXC)
@@ -208,37 +233,10 @@
  .
  Install this package on your compute nodes if you're using LXC.
 
-Package: nova-compute-uml
-Architecture: all
-Depends: libvirt-bin,
- nova-compute (= ${binary:Version}),
- python-libvirt,
- user-mode-linux,
- ${misc:Depends}
-Provides: nova-compute-hypervisor
-Conflicts: nova-compute-hypervisor
-Description: OpenStack Compute - compute node (UserModeLinux)
- OpenStack is a reliable cloud infrastructure. Its mission is to produce
- the ubiquitous cloud computing platform that will meet the needs of public
- and private cloud providers regardless of size, by being simple to implement
- and massively scalable.
- .
- OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
- addition to its "native" API (the OpenStack API), it also supports the Amazon
- EC2 API.
- .
- Nova is intended to be modular and easy to extend and adapt. It supports many
- different hypervisors (KVM and Xen to name a few), different database backends
- (SQLite, MySQL, and PostgreSQL, for instance), different types of user
- databases (LDAP or SQL), etc.
- .
- Install this package on your compute nodes if you're using UserModeLinux.
-
 Package: nova-compute-xen
 Architecture: all
-Depends: libvirt-bin,
- nova-compute (= ${binary:Version}),
- python-libvirt,
+Depends:
+ nova-compute-libvirt (= ${binary:Version}),
  xen-system-amd64 | xen-system-i386,
  ${misc:Depends}
 Provides: nova-compute-hypervisor
@@ -262,11 +260,7 @@
 
 Package: nova-compute-qemu
 Architecture: all
-Depends: libvirt-bin,
- nova-compute (= ${binary:Version}),
- python-libvirt,
- qemu,
- ${misc:Depends}
+Depends: nova-compute-libvirt (= ${binary:Version}), qemu, ${misc:Depends}
 Provides: nova-compute-hypervisor
 Conflicts: nova-compute-hypervisor
 Description: OpenStack Compute - compute node (QEmu)
@@ -288,10 +282,9 @@
 
 Package: nova-compute-kvm
 Architecture: all
-Depends: qemu-system (>= 1.3.0) | kvm,
- libvirt-bin,
- nova-compute (= ${binary:Version}),
- python-libvirt,
+Depends:
+ nova-compute-libvirt (= ${binary:Version}),
+ qemu-system (>= 1.3.0) | kvm,
  ${misc:Depends}
 Provides: nova-compute-hypervisor
 Conflicts: nova-compute-hypervisor
@@ -312,9 +305,34 @@
  .
  Install this package on your compute nodes if you're using kvm.
 
+Package: nova-compute-vmware
+Architecture: all
+Depends:
+ nova-compute (= ${binary:Version}),
+ ${misc:Depends}
+Provides: nova-compute-hypervisor
+Conflicts: nova-compute-hypervisor
+Description: OpenStack Compute - compute node (VMware)
+ OpenStack is a reliable cloud infrastructure. Its mission is to produce
+ the ubiquitous cloud computing platform that will meet the needs of public
+ and private cloud providers regardless of size, by being simple to implement
+ and massively scalable.
+ .
+ OpenStack Compute, codenamed Nova, is a cloud computing fabric controller. In
+ addition to its "native" API (the OpenStack API), it also supports the Amazon
+ EC2 API.
+ .
+ Nova is intended to be modular and easy to extend and adapt. It supports many
+ different hypervisors (KVM and Xen to name a few), different database backends
+ (SQLite, MySQL, and PostgreSQL, for instance), different types of user
+ databases (LDAP or SQL), etc.
+ .
+ Install this package on your compute nodes if you're using VMware vCenter.
+
 Package: nova-conductor
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
@@ -337,7 +355,8 @@
 
 Package: nova-cert
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
@@ -360,7 +379,8 @@
 
 Package: nova-scheduler
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
@@ -385,7 +405,7 @@
 Section: oldlibs
 Priority: extra
 Architecture: all
-Depends: cinder-volume, cinder-api, cinder-scheduler, ${misc:Depends}
+Depends: cinder-api, cinder-scheduler, cinder-volume, ${misc:Depends}
 Description: OpenStack Compute - storage
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
@@ -407,7 +427,8 @@
 Architecture: all
 Section: oldlibs
 Priority: extra
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
@@ -430,7 +451,8 @@
 
 Package: nova-novncproxy
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  novnc,
  websockify,
  ${misc:Depends},
@@ -456,7 +478,8 @@
 
 Package: nova-xvpvncproxy
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
@@ -480,9 +503,10 @@
 
 Package: nova-spiceproxy
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
- websockify,
+Depends:
+ nova-common (= ${binary:Version}),
  spice-html5,
+ websockify,
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
@@ -506,11 +530,12 @@
 
 Package: nova-api
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ iptables,
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
- ${python:Depends},
- iptables
+ ${python:Depends}
 Description: OpenStack Compute - API frontend
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public
@@ -530,7 +555,9 @@
 
 Package: nova-network
 Architecture: all
-Depends: bridge-utils,
+Depends:
+ bridge-utils,
+ ebtables,
  dnsmasq-base,
  dnsmasq-utils,
  iptables,
@@ -565,7 +592,8 @@
 
 Package: nova-objectstore
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
@@ -589,7 +617,8 @@
 
 Package: nova-console
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
@@ -615,7 +644,8 @@
 
 Package: nova-consoleauth
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
@@ -664,7 +694,8 @@
 
 Package: nova-api-metadata
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
@@ -683,7 +714,8 @@
 
 Package: nova-api-os-compute
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
@@ -719,7 +751,8 @@
 
 Package: nova-api-ec2
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
@@ -743,7 +776,8 @@
 
 Package: nova-cells
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
@@ -766,7 +800,8 @@
 
 Package: nova-baremetal
 Architecture: all
-Depends: nova-common (= ${binary:Version}),
+Depends:
+ nova-common (= ${binary:Version}),
  ${misc:Depends},
  ${ostack-lsb-base},
  ${python:Depends}
 
=== modified file 'debian/nova-baremetal.install'
--- debian/nova-baremetal.install	2013-01-11 02:05:18 +0000
+++ debian/nova-baremetal.install	2013-12-12 16:36:45 +0000
@@ -1,2 +1,2 @@
+usr/bin/nova-baremetal-deploy-helper
 usr/bin/nova-baremetal-manage
-usr/bin/nova-baremetal-deploy-helper
 
=== renamed file 'debian/nova-compute.postinst' => 'debian/nova-compute-libvirt.postinst'
=== removed file 'debian/nova-compute-uml.conf'
--- debian/nova-compute-uml.conf	2013-12-10 18:21:29 +0000
+++ debian/nova-compute-uml.conf	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-[DEFAULT]
-compute_driver=libvirt.LibvirtDriver
-[libvirt]
-virt_type=uml
 
=== removed file 'debian/nova-compute-uml.postinst'
--- debian/nova-compute-uml.postinst	2012-03-31 00:18:30 +0000
+++ debian/nova-compute-uml.postinst	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "configure" ]; then
-  chown nova:nova /etc/nova/nova-compute.conf
-  chmod 0600 /etc/nova/nova-compute.conf
-fi
-
-#DEBHELPER#
 
=== added file 'debian/nova-compute-vmware.conf'
--- debian/nova-compute-vmware.conf	1970-01-01 00:00:00 +0000
+++ debian/nova-compute-vmware.conf	2013-12-12 16:36:45 +0000
@@ -0,0 +1,2 @@
+[DEFAULT]
+compute_driver=vmwareapi.VMwareVCDriver
 
=== added file 'debian/nova-compute-vmware.postinst'
--- debian/nova-compute-vmware.postinst	1970-01-01 00:00:00 +0000
+++ debian/nova-compute-vmware.postinst	2013-12-12 16:36:45 +0000
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+  chown nova:nova /etc/nova/nova-compute.conf
+  chmod 0600 /etc/nova/nova-compute.conf
+fi
+
+#DEBHELPER#
 
=== modified file 'debian/nova-compute.upstart'
--- debian/nova-compute.upstart	2012-12-06 17:46:39 +0000
+++ debian/nova-compute.upstart	2013-12-12 16:36:45 +0000
@@ -1,20 +1,25 @@
+# vim: set ft=upstart et ts=2:
 description "Nova compute worker"
 author "Soren Hansen <[e-mail]>"
 
 start on runlevel [2345]
 stop on runlevel [!2345]
 
-
 chdir /var/run
 
 pre-start script
-	mkdir -p /var/run/nova
-	chown nova:root /var/run/nova/
-
-	mkdir -p /var/lock/nova
-	chown nova:root /var/lock/nova/
-
-	modprobe nbd
+  mkdir -p /var/run/nova
+  chown nova:root /var/run/nova/
+
+  mkdir -p /var/lock/nova
+  chown nova:root /var/lock/nova/
+
+  modprobe nbd
+
+  # If libvirt-bin is installed, always wait for it to start first
+  if status libvirt-bin; then
+    start wait-for-state WAIT_FOR=libvirt-bin WAIT_STATE=running WAITER=nova-compute
+  fi
 end script
 
 exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-compute -- --config-file=/etc/nova/nova.conf --config-file=/etc/nova/nova-compute.conf
 
=== modified file 'debian/nova-scheduler.install'
--- debian/nova-scheduler.install	2012-11-08 13:54:40 +0000
+++ debian/nova-scheduler.install	2013-12-12 16:36:45 +0000
@@ -1,3 +1,3 @@
-usr/bin/nova-scheduler
 usr/bin/nova-clear-rabbit-queues
 usr/bin/nova-rpc-zmq-receiver
+usr/bin/nova-scheduler
 
=== modified file 'debian/nova-spiceproxy.logrotate'
--- debian/nova-spiceproxy.logrotate	2013-01-22 15:43:41 +0000
+++ debian/nova-spiceproxy.logrotate	2013-12-12 16:36:45 +0000
@@ -1,4 +1,4 @@
-/var/log/nova/nova-novncproxy.log {
+/var/log/nova/nova-spiceproxy.log {
     daily
     missingok
     compress
 
=== modified file 'debian/rules'
--- debian/rules	2013-12-05 16:25:44 +0000
+++ debian/rules	2013-12-12 16:36:45 +0000
@@ -38,7 +38,7 @@
 	chmod 440 $(CURDIR)/debian/nova-common/etc/sudoers.d/nova_sudoers
 	install -D -m 644 debian/source_nova.py debian/php5-common/usr/share/apport/package-hooks/source_nova.py
 	install -D -m 0644 $(CURDIR)/etc/nova/logging_sample.conf $(CURDIR)/debian/nova-common/etc/nova/logging.conf
-	for hypervisor in qemu kvm xen uml lxc; do \
+	for hypervisor in qemu kvm xen lxc vmware; do \
 		install -D -m 0600 $(CURDIR)/debian/nova-compute-$${hypervisor}.conf $(CURDIR)/debian/nova-compute-$${hypervisor}/etc/nova/nova-compute.conf; \
 	done