summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-05-19 13:23:29 (GMT)
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-05-19 13:33:11 (GMT)
commit02f36cba45c0ab2aa3b057d6d894e47e5130e355 (patch)
tree9b6b2d6672d65280bc6e9cd25074dcce346c7d58
parent43d7f69de9347754cb3f789874e5bc8602ea97ce (diff)
downloaddefinitions-baserock/franred/fix-nova-issues-in-kilo.tar.gz
OpenStack: Install default configuration for glancebaserock/franred/fix-nova-issues-in-kilo
Change-Id: If4f38bddc997f841ff50394dff3d9cf450d0f8a8
-rw-r--r--openstack/manifest4
-rw-r--r--openstack/usr/share/openstack/glance/glance-api-paste.ini77
-rw-r--r--openstack/usr/share/openstack/glance/glance-registry-paste.ini30
-rw-r--r--openstack/usr/share/openstack/glance/policy.json52
-rw-r--r--openstack/usr/share/openstack/glance/schema-image.json28
-rw-r--r--strata/openstack-services.morph1
-rw-r--r--strata/openstack-services/glance.morph10
7 files changed, 11 insertions, 191 deletions
diff --git a/openstack/manifest b/openstack/manifest
index 5683a7e..df46930 100644
--- a/openstack/manifest
+++ b/openstack/manifest
@@ -26,10 +26,6 @@ template 0100644 0 0 /etc/tempest/tempest.conf
0100644 0 0 /usr/share/openstack/glance/glance-registry.conf
0100644 0 0 /usr/share/openstack/glance/glance-scrubber.conf
0100644 0 0 /usr/share/openstack/glance/glance-cache.conf
-0100644 0 0 /usr/share/openstack/glance/schema-image.json
-0100644 0 0 /usr/share/openstack/glance/policy.json
-0100644 0 0 /usr/share/openstack/glance/glance-api-paste.ini
-0100644 0 0 /usr/share/openstack/glance/glance-registry-paste.ini
0100644 0 0 /usr/share/openstack/horizon.yml
0040755 0 0 /usr/share/openstack/ironic
0100644 0 0 /usr/share/openstack/ironic.yml
diff --git a/openstack/usr/share/openstack/glance/glance-api-paste.ini b/openstack/usr/share/openstack/glance/glance-api-paste.ini
deleted file mode 100644
index 86a4cdb..0000000
--- a/openstack/usr/share/openstack/glance/glance-api-paste.ini
+++ /dev/null
@@ -1,77 +0,0 @@
-# Use this pipeline for no auth or image caching - DEFAULT
-[pipeline:glance-api]
-pipeline = versionnegotiation osprofiler unauthenticated-context rootapp
-
-# Use this pipeline for image caching and no auth
-[pipeline:glance-api-caching]
-pipeline = versionnegotiation osprofiler unauthenticated-context cache rootapp
-
-# Use this pipeline for caching w/ management interface but no auth
-[pipeline:glance-api-cachemanagement]
-pipeline = versionnegotiation osprofiler unauthenticated-context cache cachemanage rootapp
-
-# Use this pipeline for keystone auth
-[pipeline:glance-api-keystone]
-pipeline = versionnegotiation osprofiler authtoken context rootapp
-
-# Use this pipeline for keystone auth with image caching
-[pipeline:glance-api-keystone+caching]
-pipeline = versionnegotiation osprofiler authtoken context cache rootapp
-
-# Use this pipeline for keystone auth with caching and cache management
-[pipeline:glance-api-keystone+cachemanagement]
-pipeline = versionnegotiation osprofiler authtoken context cache cachemanage rootapp
-
-# Use this pipeline for authZ only. This means that the registry will treat a
-# user as authenticated without making requests to keystone to reauthenticate
-# the user.
-[pipeline:glance-api-trusted-auth]
-pipeline = versionnegotiation osprofiler context rootapp
-
-# Use this pipeline for authZ only. This means that the registry will treat a
-# user as authenticated without making requests to keystone to reauthenticate
-# the user and uses cache management
-[pipeline:glance-api-trusted-auth+cachemanagement]
-pipeline = versionnegotiation osprofiler context cache cachemanage rootapp
-
-[composite:rootapp]
-paste.composite_factory = glance.api:root_app_factory
-/: apiversions
-/v1: apiv1app
-/v2: apiv2app
-
-[app:apiversions]
-paste.app_factory = glance.api.versions:create_resource
-
-[app:apiv1app]
-paste.app_factory = glance.api.v1.router:API.factory
-
-[app:apiv2app]
-paste.app_factory = glance.api.v2.router:API.factory
-
-[filter:versionnegotiation]
-paste.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter.factory
-
-[filter:cache]
-paste.filter_factory = glance.api.middleware.cache:CacheFilter.factory
-
-[filter:cachemanage]
-paste.filter_factory = glance.api.middleware.cache_manage:CacheManageFilter.factory
-
-[filter:context]
-paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory
-
-[filter:unauthenticated-context]
-paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
-
-[filter:authtoken]
-paste.filter_factory = keystonemiddleware.auth_token:filter_factory
-delay_auth_decision = true
-
-[filter:gzip]
-paste.filter_factory = glance.api.middleware.gzip:GzipMiddleware.factory
-
-[filter:osprofiler]
-paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
-hmac_keys = SECRET_KEY
-enabled = yes
diff --git a/openstack/usr/share/openstack/glance/glance-registry-paste.ini b/openstack/usr/share/openstack/glance/glance-registry-paste.ini
deleted file mode 100644
index df403f6..0000000
--- a/openstack/usr/share/openstack/glance/glance-registry-paste.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-# Use this pipeline for no auth - DEFAULT
-[pipeline:glance-registry]
-pipeline = osprofiler unauthenticated-context registryapp
-
-# Use this pipeline for keystone auth
-[pipeline:glance-registry-keystone]
-pipeline = osprofiler authtoken context registryapp
-
-# Use this pipeline for authZ only. This means that the registry will treat a
-# user as authenticated without making requests to keystone to reauthenticate
-# the user.
-[pipeline:glance-registry-trusted-auth]
-pipeline = osprofiler context registryapp
-
-[app:registryapp]
-paste.app_factory = glance.registry.api:API.factory
-
-[filter:context]
-paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory
-
-[filter:unauthenticated-context]
-paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
-
-[filter:authtoken]
-paste.filter_factory = keystonemiddleware.auth_token:filter_factory
-
-[filter:osprofiler]
-paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
-hmac_keys = SECRET_KEY
-enabled = yes
diff --git a/openstack/usr/share/openstack/glance/policy.json b/openstack/usr/share/openstack/glance/policy.json
deleted file mode 100644
index 325f00b..0000000
--- a/openstack/usr/share/openstack/glance/policy.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "context_is_admin": "role:admin",
- "default": "",
-
- "add_image": "",
- "delete_image": "",
- "get_image": "",
- "get_images": "",
- "modify_image": "",
- "publicize_image": "role:admin",
- "copy_from": "",
-
- "download_image": "",
- "upload_image": "",
-
- "delete_image_location": "",
- "get_image_location": "",
- "set_image_location": "",
-
- "add_member": "",
- "delete_member": "",
- "get_member": "",
- "get_members": "",
- "modify_member": "",
-
- "manage_image_cache": "role:admin",
-
- "get_task": "",
- "get_tasks": "",
- "add_task": "",
- "modify_task": "",
-
- "get_metadef_namespace": "",
- "get_metadef_namespaces":"",
- "modify_metadef_namespace":"",
- "add_metadef_namespace":"",
-
- "get_metadef_object":"",
- "get_metadef_objects":"",
- "modify_metadef_object":"",
- "add_metadef_object":"",
-
- "list_metadef_resource_types":"",
- "get_metadef_resource_type":"",
- "add_metadef_resource_type_association":"",
-
- "get_metadef_property":"",
- "get_metadef_properties":"",
- "modify_metadef_property":"",
- "add_metadef_property":""
-
-}
diff --git a/openstack/usr/share/openstack/glance/schema-image.json b/openstack/usr/share/openstack/glance/schema-image.json
deleted file mode 100644
index 5aafd6b..0000000
--- a/openstack/usr/share/openstack/glance/schema-image.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "kernel_id": {
- "type": "string",
- "pattern": "^([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}$",
- "description": "ID of image stored in Glance that should be used as the kernel when booting an AMI-style image."
- },
- "ramdisk_id": {
- "type": "string",
- "pattern": "^([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}$",
- "description": "ID of image stored in Glance that should be used as the ramdisk when booting an AMI-style image."
- },
- "instance_uuid": {
- "type": "string",
- "description": "ID of instance used to create this image."
- },
- "architecture": {
- "description": "Operating system architecture as specified in http://docs.openstack.org/trunk/openstack-compute/admin/content/adding-images.html",
- "type": "string"
- },
- "os_distro": {
- "description": "Common name of operating system distribution as specified in http://docs.openstack.org/trunk/openstack-compute/admin/content/adding-images.html",
- "type": "string"
- },
- "os_version": {
- "description": "Operating system version as specified by the distributor",
- "type": "string"
- }
-}
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index 29b351b..71cc59f 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -399,6 +399,7 @@ chunks:
ref: 2174bdcae6e46f5f68f5b8ea984a695db9f41bcf
unpetrify-ref: v2.4.1
- name: glance
+ morph: strata/openstack-services/glance.morph
repo: upstream:openstack/glance
ref: 93b0d5fce3a41e4a3a549f98f78b6681cbc3ea95
unpetrify-ref: 2015.1.0
diff --git a/strata/openstack-services/glance.morph b/strata/openstack-services/glance.morph
new file mode 100644
index 0000000..d9e548f
--- /dev/null
+++ b/strata/openstack-services/glance.morph
@@ -0,0 +1,10 @@
+name: glance
+kind: chunk
+build-system: python-distutils
+post-install-commands:
+# Install some default configuration files
+- mkdir -p "$DESTDIR"/etc/glance
+- install -m 644 etc/glance-api-paste.ini "$DESTDIR"/etc/glance/
+- install -m 644 etc/glance-registry-paste.ini "$DESTDIR"/etc/glance/
+- install -m 644 etc/policy.json "$DESTDIR"/etc/glance/
+- install -m 644 etc/schema-image.json "$DESTDIR"/etc/glance