Add attribute and configuration for show_image_direct_url

- Add default["openstack"]["image"]["api"]["show_image_direct_url"]
  which defaults to "False"
- Add option into glance-api.conf.erb
- Added test for show_image_direct_url setting
- Adjusted README to reference attribute

Change-Id: I83cd13db1d102118d696d371d94197044abf8e94
Closes-Bug: #1274960
This commit is contained in:
Andy McCrae 2014-01-31 14:44:04 +00:00
parent 6922dc838e
commit f7b7072d04
4 changed files with 17 additions and 0 deletions

View File

@ -106,6 +106,7 @@ Attributes for the Image service are in the ['openstack']['image'] namespace.
* `openstack['image']['service_tenant_name']` - Tenant name used by glance when interacting with keystone - used in the API and registry paste.ini files
* `openstack['image']['service_user']` - User name used by glance when interacting with keystone - used in the API and registry paste.ini files
* `openstack['image']['service_role']` - User role used by glance when interacting with keystone - used in the API and registry paste.ini files
* `openstack['image']['api']['show_image_direct_url']` - Allow glance to return URL referencing where data is stored on the backend. Default 'False'
* `openstack['image']['api']['auth']['cache_dir']` - Defaults to `/var/cache/glance/api`. Directory where `auth_token` middleware writes certificates for glance-api
* `openstack['image']['registry']['auth']['cache_dir']` - Defaults to `/var/cache/glance/registry`. Directory where `auth_token` middleware writes certificates for glance-registry
* `openstack['image']['upload_images']` - Default list of images to upload to the glance repository as part of the install

View File

@ -43,6 +43,9 @@ default['openstack']['image']['service_tenant_name'] = 'service'
default['openstack']['image']['service_user'] = 'glance'
default['openstack']['image']['service_role'] = 'admin'
# Return the URL that references where the data is stored on the backend.
default['openstack']['image']['api']['show_image_direct_url'] = 'False'
# Setting this to v2.0. See discussion on
# https://bugs.launchpad.net/openstack-chef/+bug/1207504
default['openstack']['image']['api']['auth']['version'] = 'v2.0'

View File

@ -122,6 +122,12 @@ describe 'openstack-image::api' do
expect(chef_run).to render_file(file.name).with_content(
/^flavor = keystone\+cachemanagement$/)
end
it 'sets show_image_direct_url appropriately' do
node.set['openstack']['image']['api']['show_image_direct_url'] = 'True'
expect(chef_run).to render_file(file.name).with_content(
/^show_image_direct_url = True$/)
end
end
describe 'qpid' do

View File

@ -35,6 +35,13 @@ sql_connection = <%= @sql_connection %>
# Role used to identify an authenticated user as administrator
#admin_role = admin
#
# Return the URL that references where the data is stored on
# the backend storage system. For example, if using the
# file system store a URL of 'file:///path/to/image' will
# be returned to the user in the 'direct_url' meta-data field.
# The default value is false.
show_image_direct_url = <%= node["openstack"]["image"]["api"]["show_image_direct_url"] %>
# ================= Syslog Options ============================