--- a/components/openstack/glance/glance.p5m Fri Mar 20 03:13:26 2015 -0700
+++ b/components/openstack/glance/glance.p5m Thu Mar 19 14:41:20 2015 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -28,7 +28,7 @@
set name=pkg.summary value="OpenStack Glance (Image Service)"
set name=pkg.description \
value="OpenStack Glance provides services for discovering, registering, and retrieving virtual machine images. Glance has a RESTful API that allows querying of VM image metadata as well as retrieval of the actual image. VM images made available through Glance can be stored in a variety of locations from simple file systems to object-storage systems like OpenStack Swift."
-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="Glance, the OpenStack image service"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
@@ -39,9 +39,11 @@
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/055 \
- value=PSARC/2014/207
+ value=PSARC/2014/207 value=PSARC/2015/110
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
dir path=etc/glance owner=glance group=glance mode=0700
file etc/glance-api-paste.ini path=etc/glance/glance-api-paste.ini \
owner=glance group=glance mode=0644 overlay=allow preserve=renamenew
@@ -55,10 +57,67 @@
owner=glance group=glance mode=0644 overlay=allow preserve=renamenew
file files/glance-scrubber.conf path=etc/glance/glance-scrubber.conf \
owner=glance group=glance mode=0644 overlay=allow preserve=renamenew
+file etc/glance-swift.conf.sample path=etc/glance/glance-swift.conf \
+ owner=glance group=glance mode=0644 overlay=allow preserve=renamenew
file etc/logging.cnf.sample path=etc/glance/logging.conf owner=glance \
group=glance mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/README path=etc/glance/metadefs/README
+file etc/metadefs/compute-aggr-disk-filter.json \
+ path=etc/glance/metadefs/compute-aggr-disk-filter.json owner=glance \
+ group=glance mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-aggr-iops-filter.json \
+ path=etc/glance/metadefs/compute-aggr-iops-filter.json owner=glance \
+ group=glance mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-aggr-num-instances.json \
+ path=etc/glance/metadefs/compute-aggr-num-instances.json owner=glance \
+ group=glance mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-guest-shutdown.json \
+ path=etc/glance/metadefs/compute-guest-shutdown.json owner=glance \
+ group=glance mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-host-capabilities.json \
+ path=etc/glance/metadefs/compute-host-capabilities.json owner=glance \
+ group=glance mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-hypervisor.json \
+ path=etc/glance/metadefs/compute-hypervisor.json owner=glance \
+ group=glance mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-instance-data.json \
+ path=etc/glance/metadefs/compute-instance-data.json owner=glance \
+ group=glance mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-libvirt.json \
+ path=etc/glance/metadefs/compute-libvirt.json owner=glance group=glance \
+ mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-quota.json \
+ path=etc/glance/metadefs/compute-quota.json owner=glance group=glance \
+ mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-randomgen.json \
+ path=etc/glance/metadefs/compute-randomgen.json owner=glance group=glance \
+ mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-trust.json \
+ path=etc/glance/metadefs/compute-trust.json owner=glance group=glance \
+ mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-vcputopology.json \
+ path=etc/glance/metadefs/compute-vcputopology.json owner=glance \
+ group=glance mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-vmware.json \
+ path=etc/glance/metadefs/compute-vmware.json owner=glance group=glance \
+ mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-watchdog.json \
+ path=etc/glance/metadefs/compute-watchdog.json owner=glance group=glance \
+ mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/compute-xenapi.json \
+ path=etc/glance/metadefs/compute-xenapi.json owner=glance group=glance \
+ mode=0644 overlay=allow preserve=renamenew
+file etc/metadefs/glance-common-image-props.json \
+ path=etc/glance/metadefs/glance-common-image-props.json owner=glance \
+ group=glance mode=0644 overlay=allow preserve=renamenew
file etc/policy.json path=etc/glance/policy.json owner=glance group=glance \
mode=0644 overlay=allow preserve=renamenew
+file etc/property-protections-policies.conf.sample \
+ path=etc/glance/property-protections-policies.conf owner=glance \
+ group=glance mode=0644 overlay=allow preserve=renamenew
+file etc/property-protections-roles.conf.sample \
+ path=etc/glance/property-protections-roles.conf owner=glance group=glance \
+ mode=0644 overlay=allow preserve=renamenew
file etc/schema-image.json path=etc/glance/schema-image.json owner=glance \
group=glance
file files/glance.auth_attr \
@@ -67,14 +126,17 @@
path=etc/security/exec_attr.d/cloud:openstack:glance group=sys
file files/glance.prof_attr \
path=etc/security/prof_attr.d/cloud:openstack:glance group=sys
+file files/glance.user_attr path=etc/user_attr.d/cloud:openstack:glance \
+ group=sys
file path=lib/svc/manifest/application/openstack/glance-api.xml
file path=lib/svc/manifest/application/openstack/glance-db.xml
file path=lib/svc/manifest/application/openstack/glance-registry.xml
-file files/glance-scrubber.xml \
- path=lib/svc/manifest/application/openstack/glance-scrubber.xml
+file path=lib/svc/manifest/application/openstack/glance-scrubber.xml
+file path=lib/svc/manifest/application/openstack/glance-upgrade.xml
file files/glance-api path=lib/svc/method/glance-api
file files/glance-registry path=lib/svc/method/glance-registry
file files/glance-scrubber path=lib/svc/method/glance-scrubber
+file files/glance-upgrade path=lib/svc/method/glance-upgrade
file path=usr/bin/glance-cache-manage
file path=usr/bin/glance-cache-prefetcher
file path=usr/bin/glance-manage
@@ -91,6 +153,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/glance-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
file path=usr/lib/python$(PYVER)/vendor-packages/glance-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/glance-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/glance-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
file path=usr/lib/python$(PYVER)/vendor-packages/glance-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
file path=usr/lib/python$(PYVER)/vendor-packages/glance-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/glance/__init__.py
@@ -118,20 +181,41 @@
file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/image_members.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/image_tags.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/images.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/metadef_namespaces.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/metadef_objects.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/metadef_properties.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/metadef_resource_types.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/model/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/model/metadef_namespace.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/model/metadef_object.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/model/metadef_property_item_type.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/model/metadef_property_type.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/model/metadef_resource_type.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/router.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/schemas.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/v2/tasks.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/api/versions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/async/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/async/eventlet_executor.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/api.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/api.py \
+ pkg.depend.bypass-generate=.*/glance_store.* \
+ pkg.depend.bypass-generate=.*/osprofiler.*
file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/cache_cleaner.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/cache_manage.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/cache_prefetcher.py
+file \
+ path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/cache_prefetcher.py \
+ pkg.depend.bypass-generate=.*/glance_store.*
file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/cache_pruner.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/control.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/manage.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/registry.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/replicator.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/scrubber.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/manage.py \
+ pkg.depend.bypass-generate=.*/oslo/db.*
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/registry.py \
+ pkg.depend.bypass-generate=.*/osprofiler.*
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/replicator.py \
+ pkg.depend.bypass-generate=.*/six.*
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/cmd/scrubber.py \
+ pkg.depend.bypass-generate=.*/glance_store.*
file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/auth.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/client.py
@@ -139,13 +223,23 @@
pkg.depend.bypass-generate=.*/paste.*
file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/crypt.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/exception.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/ordereddict.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/location_strategy/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/location_strategy/location_order.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/location_strategy/store_type.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/property_utils.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/rpc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/scripts/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/scripts/image_import/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/scripts/image_import/main.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/scripts/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/store_utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/swift_store_utils.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/utils.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/wsgi.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/common/wsme_utils.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/context.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/metadata.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/migration.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/registry/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/registry/api.py
@@ -153,6 +247,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/simple/api.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/api.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/metadata.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/metadef_api/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/metadef_api/namespace.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/metadef_api/object.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/metadef_api/property.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/metadef_api/resource_type.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/metadef_api/resource_type_association.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/metadef_api/utils.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/README
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/manage.py
@@ -197,12 +299,22 @@
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/versions/027_checksum_index.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/versions/028_owner_index.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/versions/029_location_meta_data_pickle_to_string.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/versions/030_add_tasks_table.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/versions/031_remove_duplicated_locations.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/versions/032_add_task_info_table.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/versions/033_add_location_status.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/versions/034_add_virtual_size.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/versions/035_add_metadef_tables.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/versions/036_rename_metadef_schema_columns.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migrate_repo/versions/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/migration.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/models.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/db/sqlalchemy/models_metadef.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/domain/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/domain/proxy.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/gateway.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/hacking/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/hacking/checks.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/i18n.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/image_cache/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/image_cache/base.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/image_cache/cleaner.py
@@ -213,65 +325,11 @@
file path=usr/lib/python$(PYVER)/vendor-packages/glance/image_cache/drivers/xattr.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/image_cache/prefetcher.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/image_cache/pruner.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/ar/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/bg_BG/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/bs/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/ca/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/cs/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/da/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/de/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/en_AU/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/en_GB/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/en_US/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/es/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/es_MX/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/fi_FI/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/fil/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/fr/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/hi/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/hr/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/hu/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/id/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/it/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/it_IT/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/ja/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/ka_GE/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/kn/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/ko/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/ko_KR/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/ms/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/nb/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/ne/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/nl_NL/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/pl_PL/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/pt/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/pt_BR/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/ro/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/ru/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/ru_RU/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/sk/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/sl_SI/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/sw_KE/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/tl/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/tl_PH/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/tr/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/tr_TR/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/uk/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/vi_VN/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/zh_CN/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/zh_HK/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/locale/zh_TW/LC_MESSAGES/glance.po
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/notifier/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/notifier/notify_kombu.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/notifier/notify_log.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/notifier/notify_noop.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/notifier/notify_qpid.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/notifier/strategy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/location.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/notifier.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/README
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/context.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/eventlet_backdoor.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/excutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/fileutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/gettextutils.py
@@ -280,23 +338,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/local.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/lockutils.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/log.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/loopingcall.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/network_utils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/notifier/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/notifier/api.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/notifier/log_notifier.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/notifier/no_op_notifier.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/notifier/rabbit_notifier.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/notifier/rpc_notifier.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/notifier/rpc_notifier2.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/notifier/test_notifier.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/policy.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/processutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/service.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/strutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/threadgroup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/test.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/timeutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/uuidutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/openstack/common/units.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/opts.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/quota/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/registry/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/registry/api/__init__.py
@@ -313,83 +362,116 @@
file path=usr/lib/python$(PYVER)/vendor-packages/glance/registry/client/v2/api.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/registry/client/v2/client.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/schema.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/store/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/store/base.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/store/cinder.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/store/filesystem.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/store/gridfs.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/store/http.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/store/location.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/store/rbd.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/store/s3.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/store/scrubber.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/store/sheepdog.py
-file path=usr/lib/python$(PYVER)/vendor-packages/glance/store/swift.py
+file path=usr/lib/python$(PYVER)/vendor-packages/glance/scrubber.py
file path=usr/lib/python$(PYVER)/vendor-packages/glance/version.py
dir path=var/lib/glance owner=glance group=glance mode=0700
dir path=var/log/glance owner=glance group=glance mode=0700
+#
group groupname=glance gid=82
user username=glance ftpuser=false gcos-field="Openstack Glance" group=glance \
home-dir=/var/lib/glance uid=82
+#
license glance.license license="Apache v2.0"
# 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 dnspython; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python/dnspython-$(PYV)
-# force a group dependency on the optional swiftclient; pkgdepend work is needed
+# force a group dependency on the optional pysendfile; pkgdepend work is needed
# to flush this out.
-depend type=group fmri=library/python/swiftclient-26
+depend type=group fmri=library/python/pysendfile-$(PYV)
+
+# 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 dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/argparse-26
-
-# 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/argparse-$(PYV)
-# force a dependency on cinderclient; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python/cinderclient-26
+# force a dependency on babel; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/babel-$(PYV)
-# force a dependency on greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/greenlet-26
+# force a dependency on glance_store; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/glance_store-$(PYV)
# force a dependency on httplib2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/httplib2-26
+depend type=require fmri=library/python/httplib2-$(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 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; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/keystoneclient-$(PYV)
+
+# force a dependency on keystonemiddleware; used via a paste.deploy filter
+depend type=require fmri=library/python/keystonemiddleware-$(PYV)
+
+# force a dependency on netaddr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/netaddr-$(PYV)
+
+# force a dependency on ordereddict; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/ordereddict-$(PYV)
-# force a dependency on keystoneclient; used via a paste.deploy filter
-depend type=require fmri=library/python/keystoneclient-26
+# 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 kombu; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/kombu-26
+# 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 osprofiler; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/osprofiler-$(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 posix_ipc; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/posix_ipc-$(PYV)
# force a dependency on pyopenssl; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/pyopenssl-26
+depend type=require fmri=library/python/pyopenssl-$(PYV)
+
+# force a dependency on retrying; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/retrying-$(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 six; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/six-26
+depend type=require fmri=library/python/six-$(PYV)
# 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/sqlalchemy-$(PYV)
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-$(PYV)
# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/webob-26
+depend type=require fmri=library/python/webob-$(PYV)
+
+# force a dependency on wsme; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/wsme-$(PYV)
+
+# force a dependency on xattr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/xattr-$(PYV)