--- a/components/openstack/nova/nova.p5m	Tue Apr 07 15:49:29 2015 -0700
+++ b/components/openstack/nova/nova.p5m	Tue Apr 07 13:31:20 2015 -0700
@@ -28,7 +28,7 @@
 set name=pkg.summary value="OpenStack Nova (Compute Service)"
 set name=pkg.description \
     value="OpenStack Nova provides a cloud computing fabric controller, supporting a wide variety of virtualization technologies. In addition to its native API, it includes compatibility with the commonly encountered Amazon EC2 and S3 APIs."
-set name=pkg.human-version value="Havana $(COMPONENT_VERSION)"
+set name=pkg.human-version value="Juno $(COMPONENT_VERSION)"
 set name=com.oracle.info.description value="Nova, the OpenStack compute service"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
@@ -39,12 +39,14 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream value="OpenStack <[email protected]>"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=openstack.upgrade-id reboot-needed=true value=$(COMPONENT_BE_VERSION)
 set name=org.opensolaris.arc-caseid value=PSARC/2013/350 value=PSARC/2014/049 \
-    value=PSARC/2014/210
+    value=PSARC/2014/210 value=PSARC/2015/110
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir  path=etc/nova owner=nova group=nova mode=0700
-file files/api-paste.ini path=etc/nova/api-paste.ini owner=nova group=nova \
-    mode=0644 overlay=allow preserve=renamenew
+#
+file path=etc/nova/api-paste.ini owner=nova group=nova mode=0644 overlay=allow \
+    preserve=renamenew
 file path=etc/nova/cells.json owner=nova group=nova mode=0644 overlay=allow \
     preserve=renamenew
 file etc/nova/logging_sample.conf path=etc/nova/logging.conf owner=nova \
@@ -61,26 +63,18 @@
 file files/nova.prof_attr path=etc/security/prof_attr.d/cloud:openstack:nova \
     group=sys
 file files/nova.user_attr path=etc/user_attr.d/cloud:openstack:nova group=sys
-file files/nova-api-ec2.xml \
-    path=lib/svc/manifest/application/openstack/nova-api-ec2.xml
-file files/nova-api-osapi-compute.xml \
-    path=lib/svc/manifest/application/openstack/nova-api-osapi-compute.xml
-file files/nova-cert.xml \
-    path=lib/svc/manifest/application/openstack/nova-cert.xml
-file files/nova-compute.xml \
-    path=lib/svc/manifest/application/openstack/nova-compute.xml
-file files/nova-conductor.xml \
-    path=lib/svc/manifest/application/openstack/nova-conductor.xml
-file files/nova-consoleauth.xml \
-    path=lib/svc/manifest/application/openstack/nova-consoleauth.xml
-file files/nova-novncproxy.xml \
-    path=lib/svc/manifest/application/openstack/nova-novncproxy.xml
-file files/nova-objectstore.xml \
-    path=lib/svc/manifest/application/openstack/nova-objectstore.xml
-file files/nova-scheduler.xml \
-    path=lib/svc/manifest/application/openstack/nova-scheduler.xml
-file files/zone-vnc-console.xml \
-    path=lib/svc/manifest/application/openstack/zone-vnc-console.xml
+file path=lib/svc/manifest/application/openstack/nova-api-ec2.xml
+file path=lib/svc/manifest/application/openstack/nova-api-metadata.xml
+file path=lib/svc/manifest/application/openstack/nova-api-osapi-compute.xml
+file path=lib/svc/manifest/application/openstack/nova-cert.xml
+file path=lib/svc/manifest/application/openstack/nova-compute.xml
+file path=lib/svc/manifest/application/openstack/nova-conductor.xml
+file path=lib/svc/manifest/application/openstack/nova-consoleauth.xml
+file path=lib/svc/manifest/application/openstack/nova-novncproxy.xml
+file path=lib/svc/manifest/application/openstack/nova-objectstore.xml
+file path=lib/svc/manifest/application/openstack/nova-scheduler.xml
+file path=lib/svc/manifest/application/openstack/nova-upgrade.xml
+file path=lib/svc/manifest/application/openstack/zone-vnc-console.xml
 file files/nova-api path=lib/svc/method/nova-api
 file files/nova-cert path=lib/svc/method/nova-cert
 file files/nova-compute path=lib/svc/method/nova-compute
@@ -89,6 +83,7 @@
 file files/nova-novncproxy path=lib/svc/method/nova-novncproxy
 file files/nova-objectstore path=lib/svc/method/nova-objectstore
 file files/nova-scheduler path=lib/svc/method/nova-scheduler
+file files/nova-upgrade path=lib/svc/method/nova-upgrade
 file files/zone-vnc-console path=lib/svc/method/zone-vnc-console
 file path=usr/bin/nova-manage
 file usr/bin/nova-api-ec2 path=usr/lib/nova/nova-api-ec2 mode=0555
@@ -103,6 +98,7 @@
 file usr/bin/nova-novncproxy path=usr/lib/nova/nova-novncproxy mode=0555
 file usr/bin/nova-objectstore path=usr/lib/nova/nova-objectstore mode=0555
 file usr/bin/nova-scheduler path=usr/lib/nova/nova-scheduler mode=0555
+file usr/bin/nova-serialproxy path=usr/lib/nova/nova-serialproxy mode=0555
 file usr/bin/nova-spicehtml5proxy path=usr/lib/nova/nova-spicehtml5proxy \
     mode=0555
 file usr/bin/nova-xvpvncproxy path=usr/lib/nova/nova-xvpvncproxy mode=0555
@@ -111,6 +107,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/nova-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/nova-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/nova-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
 file path=usr/lib/python$(PYVER)/vendor-packages/nova-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/nova-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/CA/geninter.sh
@@ -119,6 +116,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/auth.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/compute_req_id.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/ec2/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/ec2/apirequest.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/ec2/cloud.py
@@ -143,6 +141,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/assisted_volume_snapshots.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/attach_interfaces.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/availability_zone.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/baremetal_ext_status.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/baremetal_nodes.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/block_device_mapping_v2_boot.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/cell_capacities.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/cells.py
@@ -150,20 +150,25 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/cloudpipe.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/cloudpipe_update.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/config_drive.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/console_auth_tokens.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/console_output.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/consoles.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/coverage_ext.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/createserverext.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/deferred_delete.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/disk_config.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/evacuate.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_availability_zone.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_evacuate_find_host.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_floating_ips.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_hypervisors.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_ips.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_ips_mac.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_networks.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_quotas.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_rescue_with_image.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_server_attributes.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_services.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_services_delete.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_status.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_virtual_interfaces_net.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/extended_volumes.py
@@ -182,6 +187,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/fping.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/hide_server_addresses.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/hosts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/hypervisor_status.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/hypervisors.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/image_size.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/instance_actions.py
@@ -193,6 +199,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/networks_associate.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/os_networks.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/os_tenant_networks.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/preserve_ephemeral_rebuild.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/quota_classes.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/quotas.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/rescue.py
@@ -200,6 +207,10 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/security_group_default_rules.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/security_groups.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/server_diagnostics.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/server_external_events.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/server_group_quotas.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/server_groups.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/server_list_multi_status.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/server_password.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/server_start_stop.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/contrib/server_usage.py
@@ -221,6 +232,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/limits.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/access_ips.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/admin_actions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/admin_password.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/agents.py
@@ -228,14 +240,15 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/attach_interfaces.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/availability_zone.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/block_device_mapping.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/block_device_mapping_v1.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/cells.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/certificates.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/config_drive.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/console_auth_tokens.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/console_output.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/consoles.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/coverage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/create_backup.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/deferred_delete.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/disk_config.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/evacuate.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/extended_availability_zone.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/extended_server_attributes.py
@@ -250,22 +263,28 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/hide_server_addresses.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/hosts.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/hypervisors.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/image_metadata.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/image_size.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/images.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/instance_actions.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/ips.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/keypairs.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/limits.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/lock_server.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/migrate_server.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/migrations.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/multinic.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/multiple_create.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/personalities.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/quota_classes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/pause_server.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/pci.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/quota_sets.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/remote_consoles.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/rescue.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/scheduler_hints.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/security_groups.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/server_diagnostics.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/server_external_events.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/server_groups.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/server_metadata.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/server_password.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/server_usage.py
@@ -273,9 +292,12 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/services.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/shelve.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/simple_tenant_usage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/suspend_server.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/used_limits.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/user_data.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/versions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/plugins/v3/volumes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/atom-link.rng
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/atom.rng
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v1.1/addresses.rng
@@ -294,12 +316,35 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v1.1/servers_index.rng
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v1.1/version.rng
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v1.1/versions.rng
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/addresses.rng
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/flavor.rng
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/flavors.rng
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/server.rng
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/servers.rng
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/servers_index.rng
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/access_ips.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/admin_password.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/agents.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/aggregates.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/attach_interfaces.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/availability_zone.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/cells.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/config_drive.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/console_output.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/create_backup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/evacuate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/extended_volumes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/flavor_access.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/flavor_manage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/flavors_extraspecs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/hosts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/keypairs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/migrate_server.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/multinic.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/multiple_create.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/quota_sets.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/remote_consoles.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/rescue.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/reset_server_state.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/security_groups.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/server_metadata.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/servers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/schemas/v3/user_data.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/server_metadata.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/servers.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/compute/versions.py
@@ -315,6 +360,9 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/wsgi.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/openstack/xmlutil.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/sizelimit.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/validation/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/validation/parameter_types.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/validation/validators.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/api/validator.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/availability_zones.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/baserpc.py
@@ -358,25 +406,35 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/console.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/consoleauth.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/dhcpbridge.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/idmapshift.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/manage.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/network.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/novnc.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/novncproxy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/objectstore.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/rpc_zmq_receiver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/scheduler.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/serialproxy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/spicehtml5proxy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/cmd/xvpvncproxy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/api.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/arch.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/cells_api.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/claims.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/fakevirtinstance.xml
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/flavors.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/hvtype.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/instance_actions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/manager.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/monitors/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/monitors/cpu_monitor.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/monitors/virt/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/monitors/virt/cpu_monitor.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/power_state.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/resource_tracker.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/resources/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/resources/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/resources/vcpu.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/rpcapi.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/stats.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/compute/task_states.py
@@ -395,6 +453,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/console/fake.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/console/manager.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/console/rpcapi.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/console/serial.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/console/type.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/console/vmrc.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/console/vmrc_manager.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/console/websocketproxy.py
@@ -415,107 +475,61 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/manage.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/migrate.cfg
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/134_add_counters_to_bw_usage_cache.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/135_add_node_to_instances.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/136_add_index_to_instances.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/137_add_indexes_to_migrations.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/138_drop_server_name_from_instances.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/138_sqlite_downgrade.sql
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/138_sqlite_upgrade.sql
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/139_add_indexes_to_fixed_ips.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/140_drop_unused_postgresql_volume_sequences.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/141_update_migrations_instance_uuid.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/142_add_migrations_instance_status_index.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/143_rename_instance_info_cache_sequence.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/144_add_node_to_migrations.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/145_add_volume_usage_cache.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/146_aggregate_zones.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/147_no_service_zones.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/148_add_instance_actions.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/149_inet_datatype_for_postgres.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/150_add_host_to_instance_faults.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/151_change_task_log_column_type.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/152_change_type_of_deleted_column.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/153_instance_type_in_system_metadata.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/154_add_shadow_tables.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/155_add_task_log_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/156_cidr_column_length.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/157_add_security_group_default_rules.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/158_add_networks_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/159_revert_ip_column_length.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/159_sqlite_downgrade.sql
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/159_sqlite_upgrade.sql
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/160_fix_system_metadata_deleted.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/161_fix_system_metadata_none_strings.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/162_placeholder.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/163_placeholder.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/164_placeholder.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/165_placeholder.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/166_placeholder.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/167_placeholder.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/168_placeholder.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/169_placeholder.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/170_placeholder.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/171_placeholder.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/172_add_instance_type_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/173_add_unique_constraint_to_key_pairs.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/174_add_instance_type_access_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/175_add_project_user_id_to_volume_usage_cache.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/176_add_availability_zone_to_volume_usage_cache.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/177_add_floating_ip_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/178_add_index_to_compute_node_stats.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/179_change_cells_deleted_to_int.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/180_fix_175_and_176_migration_sync_shadow_table.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/181_fix_179_migration_sync_shadow_table.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/182_fix_156_migration_sync_shadow_table.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/183_fix_157_migration_sync_shadow_table.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/184_fix_159_migration_sync_shadow_table.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/184_sqlite_downgrade.sql
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/184_sqlite_upgrade.sql
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/185_rename_unique_constraints.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/186_new_bdm_format.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/187_add_instance_groups.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/188_add_reason_column_to_service.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/189_add_cells_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/190_add_security_group_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/191_add_quota_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/192_change_virtual_interface_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/193_cinder_cleanup.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/194_fix_152_migration_indexes.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/195_add_fixed_ip_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/196_add_service_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/197_add_agent_build_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/198_add_console_pools_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/199_add_aggregate_hosts_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/200_add_transport_url_to_cell.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/201_add_sqlite_indexes.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/202_add_instance_type_extra_specs_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/203_make_user_quotas_key_and_value.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/204_add_indexes_to_reservations.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/205_add_locked_by_to_instance.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/206_add_instance_cleaned.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/207_fix_uniqname_cells.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/208_expand_compute_node.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/209_add_missing_foreign_keys.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/210_fix_project_user_quotas_user_id_deleted_index.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/211_add_aggregate_metadata_uc.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/212_fix_migrations_index.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/213_add_pci_devices.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/214_complete_194_missing_index.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/215_fix_deleted_compute_node_stats.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/216_sync_quota_usages.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/216_havana.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/217_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/218_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/219_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/220_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/221_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/222_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/223_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/224_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/225_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/226_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/227_fix_project_user_quotas_resource_length.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/228_add_metrics_in_compute_nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/229_add_extra_resources_in_compute_nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/230_add_details_column_to_instance_actions_events.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/231_add_ephemeral_key_uuid.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/232_drop_dump_tables.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/233_add_stats_in_compute_nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/234_add_expire_reservations_index.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/235_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/236_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/237_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/238_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/239_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/240_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/241_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/242_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/243_placeholder.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/244_increase_user_id_length_volume_usage_cache.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/245_add_mtu_and_dhcp_server.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/246_add_compute_node_id_fk.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/246_sqlite_downgrade.sql
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/246_sqlite_upgrade.sql
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/247_nullable_mismatch.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/248_add_expire_reservations_index.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/249_remove_duplicate_index.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/250_remove_instance_groups_metadata.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/251_add_numa_topology_to_comput_nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/252_add_instance_extra_table.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/253_add_pci_requests_to_instance_extra_table.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/254_add_request_id_in_pci_devices.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migrate_repo/versions/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/migration.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/models.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/types.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/db/sqlalchemy/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/debugger.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/exception.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/filters.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/hacking/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/hacking/checks.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/hooks.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/i18n.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/image/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/image/api.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/image/download/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/image/download/base.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/image/download/file.py
@@ -533,58 +547,11 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/keymgr/not_implemented_key_mgr.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/keymgr/single_key_mgr.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/loadables.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/ar/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/bg_BG/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/bs/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/ca/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/cs/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/da/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/de/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/en_AU/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/en_GB/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/en_US/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/es/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/es_MX/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/fi_FI/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/fil/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/fr/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/hi/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/hr/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/hu/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/id/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/it/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/it_IT/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/ja/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/ka_GE/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/kn/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/ko/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/ko_KR/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/ms/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/nb/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/ne/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/nl_NL/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/pl_PL/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/pt/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/pt_BR/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/ro/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/ru/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/ru_RU/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/sk/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/sl_SI/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/sw_KE/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/tl/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/tl_PH/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/tr/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/tr_TR/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/uk/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/vi_VN/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/zh_CN/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/zh_HK/LC_MESSAGES/nova.po
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/locale/zh_TW/LC_MESSAGES/nova.po
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/manager.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/netconf.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/network/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/network/api.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/network/base_api.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/network/dns_driver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/network/driver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/network/floating_ips.py
@@ -604,24 +571,39 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/network/security_group/neutron_driver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/network/security_group/openstack_driver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/network/security_group/security_group_base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/network/solaris_net.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/notifications.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/notifier.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/agent.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/aggregate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/bandwidth_usage.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/block_device.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/compute_node.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/dns_domain.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/ec2.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/external_event.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/fields.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/fixed_ip.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/flavor.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/floating_ip.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/instance.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/instance_action.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/instance_fault.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/instance_group.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/instance_info_cache.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/instance_numa_topology.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/instance_pci_requests.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/keypair.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/migration.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/network.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/network_request.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/pci_device.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/quotas.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/security_group.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/security_group_rule.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/service.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/objects/virtual_interface.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objectstore/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/objectstore/s3server.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/__init__.py
@@ -631,66 +613,69 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/config/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/config/generator.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/context.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/db/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/db/api.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/db/exception.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/db/sqlalchemy/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/db/sqlalchemy/models.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/db/sqlalchemy/session.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/db/sqlalchemy/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/eventlet_backdoor.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/excutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/fileutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/fixture/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/fixture/config.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/fixture/lockutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/fixture/logging.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/fixture/mockpatch.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/fixture/moxstubout.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/gettextutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/imageutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/importutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/jsonutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/local.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/lockutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/log.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/log_handler.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/loopingcall.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/memorycache.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/middleware/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/middleware/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/middleware/request_id.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/network_utils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/notifier/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/notifier/api.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/notifier/log_notifier.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/notifier/no_op_notifier.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/notifier/rabbit_notifier.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/notifier/rpc_notifier.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/notifier/rpc_notifier2.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/notifier/test_notifier.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/periodic_task.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/policy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/processutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rootwrap/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rootwrap/cmd.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rootwrap/filters.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rootwrap/wrapper.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/amqp.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/common.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/dispatcher.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/impl_fake.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/impl_kombu.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/impl_qpid.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/impl_zmq.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/matchmaker.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/matchmaker_redis.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/matchmaker_ring.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/proxy.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/securemessage.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/serializer.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/service.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/rpc/zmq_receiver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/generators/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/generators/conf.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/generators/threading.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/generators/version.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/guru_meditation_report.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/models/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/models/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/models/conf.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/models/threading.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/models/version.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/models/with_default_views.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/report.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/views/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/views/jinja_view.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/views/json/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/views/json/generic.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/views/text/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/views/text/generic.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/views/text/header.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/views/text/threading.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/views/xml/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/report/views/xml/generic.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/service.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/sslutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/strutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/systemd.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/threadgroup.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/timeutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/units.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/uuidutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/versionutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/openstack/common/xmlutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/paths.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/pci/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/pci/pci_device.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/pci/pci_devspec.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/pci/pci_manager.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/pci/pci_request.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/pci/pci_stats.py
@@ -698,15 +683,22 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/pci/pci_whitelist.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/policy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/quota.py
-file path=usr/lib/python$(PYVER)/vendor-packages/nova/rpcclient.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/rdp/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/rpc.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/safe_utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/baremetal_host_manager.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/base_baremetal_host_manager.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/caching_scheduler.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/chance.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/client/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/client/query.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/client/report.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/driver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filter_scheduler.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/affinity_filter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/aggregate_image_properties_isolation.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/aggregate_instance_extra_specs.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/aggregate_multitenancy_isolation.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/all_hosts_filter.py
@@ -715,23 +707,31 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/compute_filter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/core_filter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/disk_filter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/exact_core_filter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/exact_disk_filter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/exact_ram_filter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/extra_specs_ops.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/image_props_filter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/io_ops_filter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/isolated_hosts_filter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/json_filter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/metrics_filter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/num_instances_filter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/numa_topology_filter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/pci_passthrough_filter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/ram_filter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/retry_filter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/trusted_filter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/type_filter.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/filters/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/host_manager.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/ironic_host_manager.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/manager.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/rpcapi.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/scheduler_options.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/weights/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/weights/metrics.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/scheduler/weights/ram.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/service.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/servicegroup/__init__.py
@@ -747,8 +747,50 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/version.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/baremetal_states.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/common.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/api.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/migration.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/api.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migrate_repo/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migrate_repo/migrate.cfg
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/002_drop_bm_deployments.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/003_add_uuid_to_bm_nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/004_add_instance_name_to_bm_nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/005_drop_unused_columns_from_nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/006_move_prov_mac_address.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/007_drop_prov_mac_address.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/008_remove_bm_pxe_ips_table.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/009_add_ephemeral_mb_to_bm_nodes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/010_add_preserve_ephemeral.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/migration.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/models.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/db/sqlalchemy/session.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/doc/README.rst
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/driver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/fake.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/iboot_pdu.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/ipmi.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/net-dhcp.ubuntu.template
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/net-static.ubuntu.template
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/pxe.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/pxe_config.template
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/tilera.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/tilera_pdu.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/vif_driver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/virtual_power_driver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/virtual_power_driver_settings.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/baremetal/volume_driver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/block_device.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/configdrive.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/diagnostics.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/disk/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/disk/api.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/disk/mount/__init__.py
@@ -763,16 +805,37 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/event.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/fake.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/firewall.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/hardware.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/imagecache.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/images.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/interfaces.template
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/ironic/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/ironic/client_wrapper.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/ironic/driver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/ironic/ironic_states.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/ironic/patcher.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/blockinfo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/config.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/designer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/dmcrypt.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/driver.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/firewall.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/imagebackend.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/imagecache.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/lvm.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/rbd_utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/vif.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/libvirt/volume.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/netutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/solariszones/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/solariszones/driver.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/solariszones/sysconfig.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/storage_users.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/virtapi.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/volumeutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/nova/virt/watchdog_actions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/vnc/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/vnc/xvp_proxy.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/volume/__init__.py
@@ -785,24 +848,53 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/weights.py
 file path=usr/lib/python$(PYVER)/vendor-packages/nova/wsgi.py
 dir  path=var/lib/nova owner=nova group=nova mode=0700
+#
 group groupname=nova gid=85
 user username=nova ftpuser=false gcos-field="OpenStack Nova" group=nova \
     home-dir=/var/lib/nova uid=85
+#
 license nova.license license="Apache v2.0"
 
+# force a group dependency on package delivering the optional gtf(1)
+depend type=group fmri=__TBD pkg.debug.depend.file=usr/bin/gtf
+
 # force a group dependency on package delivering the optional vncserver(1)
 depend type=group fmri=__TBD pkg.debug.depend.file=usr/bin/vncserver
 
+# force a group dependency on package delivering the optional xrandr(1)
+depend type=group fmri=__TBD pkg.debug.depend.file=usr/bin/xrandr
+
+# force a group dependency on package delivering the optional xrdb(1)
+depend type=group fmri=__TBD pkg.debug.depend.file=usr/bin/xrdb
+
 # force a group dependency on package delivering the optional xterm(1)
 depend type=group fmri=__TBD pkg.debug.depend.file=usr/bin/xterm
 
+# force a group dependency on package delivering the optional xwininfo(1)
+depend type=group fmri=__TBD pkg.debug.depend.file=usr/bin/xwininfo
+
 # force a group dependency on the optional anyjson; pkgdepend work is needed to
 # flush this out.
-depend type=group fmri=library/python/anyjson-26
+depend type=group fmri=library/python/anyjson-$(PYV)
+
+# force a group dependency on the optional python-ldap; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python/python-ldap-$(PYV)
+
+# force a group dependency on the optional python-memcached; pkgdepend work is
+# needed to flush this out.
+depend type=group fmri=library/python/python-memcached-$(PYV)
 
-# force a group dependency on the optional coverage; pkgdepend work is needed to
-# flush this out.
-depend type=group fmri=library/python/coverage-26
+# force a group dependency on the optional simplejson; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python/simplejson-$(PYV)
+
+# force a group dependency on package delivering the optional solaris(5) brand
+depend type=group fmri=system/zones/brand/brand-solaris
+
+# force a group dependency on package delivering the optional solaris-kz(5)
+# brand
+depend type=group fmri=system/zones/brand/brand-solaris-kz
 
 # force a dependency on package delivering archiveadm(1M)
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/archiveadm
@@ -822,81 +914,109 @@
 # force a dependency on package delivering zpool(1M)
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/zpool
 
+# force a dependency on package delivering usr/share/novnc/vnc_auto.html
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/share/novnc/vnc_auto.html
+
+# force a dependency on argparse; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/argparse-$(PYV)
+
 # force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/babel-26
+depend type=require fmri=library/python/babel-$(PYV)
 
 # force a dependency on boto; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/boto-26
+depend type=require fmri=library/python/boto-$(PYV)
 
 # force a dependency on cinderclient; pkgdepend work is needed to flush this
 # out.
-depend type=require fmri=library/python/cinderclient-26
+depend type=require fmri=library/python/cinderclient-$(PYV)
+
+# force a dependency on decorator; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/decorator-$(PYV)
 
 # force a dependency on glanceclient; pkgdepend work is needed to flush this
 # out.
-depend type=require fmri=library/python/glanceclient-26
+depend type=require fmri=library/python/glanceclient-$(PYV)
 
 # force a dependency on greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/greenlet-26
+depend type=require fmri=library/python/greenlet-$(PYV)
 
 # force a dependency on iso8601; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/iso8601-26
+depend type=require fmri=library/python/iso8601-$(PYV)
 
 # force a dependency on jinja2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/jinja2-26
+depend type=require fmri=library/python/jinja2-$(PYV)
 
 # force a dependency on jsonschema; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/jsonschema-26
+depend type=require fmri=library/python/jsonschema-$(PYV)
 
-# force a dependency on keystoneclient; used via a paste.deploy filter
-depend type=require fmri=library/python/keystoneclient-26
-
-# force a dependency on kombu; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/kombu-26
+# force a dependency on keystonemiddleware; used via a paste.deploy filter
+depend type=require fmri=library/python/keystonemiddleware-$(PYV)
 
 # force a dependency on lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/lxml-26
+depend type=require fmri=library/python/lxml-$(PYV)
 
 # force a dependency on netaddr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/netaddr-26
+depend type=require fmri=library/python/netaddr-$(PYV)
 
 # force a dependency on neutronclient; pkgdepend work is needed to flush this
 # out.
-depend type=require fmri=library/python/neutronclient-26
+depend type=require fmri=library/python/neutronclient-$(PYV)
+
+# force a dependency on oslo.db; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.db-$(PYV)
+
+# force a dependency on oslo.i18n; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.i18n-$(PYV)
+
+# force a dependency on oslo.messaging; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/oslo.messaging-$(PYV)
+
+# force a dependency on oslo.utils; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.utils-$(PYV)
 
 # force a dependency on paste; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/paste-26
+depend type=require fmri=library/python/paste-$(PYV)
 
 # force a dependency on paste.deploy; pkgdepend work is needed to flush this
 # out.
-depend type=require fmri=library/python/paste.deploy-26
+depend type=require fmri=library/python/paste.deploy-$(PYV)
 
 # force a dependency on pbr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pbr-26
+depend type=require fmri=library/python/pbr-$(PYV)
 
 # force a dependency on pyasn1; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pyasn1-26
-
-# force a dependency on python-ldap; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/python-ldap-26
+depend type=require fmri=library/python/pyasn1-$(PYV)
 
 # force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/requests-26
+depend type=require fmri=library/python/requests-$(PYV)
+
+# force a dependency on rfc3986; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/rfc3986-$(PYV)
 
 # force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/routes-26
+depend type=require fmri=library/python/routes-$(PYV)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-$(PYV)
 
 # force a dependency on six; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/six-26
-
-# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/sqlalchemy-26
+depend type=require fmri=library/python/six-$(PYV)
 
 # force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/stevedore-26
+depend type=require fmri=library/python/stevedore-$(PYV)
 
 # force a dependency on websockify; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/websockify-26
+depend type=require fmri=library/python/websockify-$(PYV)
+
+# force a dependency on system/install; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=system/install
+
+# force a dependency on system/library/install; pkgdepend work is needed to
+# flush this out.
+depend type=require fmri=system/library/install
 
 # force a dependency on rad-python; pkgdepend work is needed to flush this out.
 depend type=require fmri=system/management/rad/client/rad-python
@@ -906,7 +1026,3 @@
 
 # force a dependency on rad-zonemgr
 depend type=require fmri=system/management/rad/module/rad-zonemgr
-
-# force a dependency on novnc; It's not a Python module so pkgdepend can't
-# catch it automatically.
-depend type=require fmri=web/novnc