From 1aea25bb649f33a7bd18ca4197cf5caa85b9269b Mon Sep 17 00:00:00 2001 From: Summer Long Date: Wed, 19 Feb 2014 12:20:56 +1000 Subject: [PATCH] Added sample files for the Image Service Added glance-api-paste.ini, glance-api.conf, glance-policy.json, glance-registry-paste.ini,glance-registry.conf, and glance-scrubber.conf file references (glance project). Placed under new section. Change-Id: Ib5e6d3e640af8c23972d7f763d1ab081f5a00fbb Partial-Bug: #1281348 --- doc/config-reference/ch_imageservice.xml | 55 ++++++++++--------- ...age-service-sample-configuration-files.xml | 55 +++++++++++++++++++ 2 files changed, 83 insertions(+), 27 deletions(-) create mode 100644 doc/config-reference/image-service/section_image-service-sample-configuration-files.xml diff --git a/doc/config-reference/ch_imageservice.xml b/doc/config-reference/ch_imageservice.xml index fa93f9306e..2ec061c3ad 100644 --- a/doc/config-reference/ch_imageservice.xml +++ b/doc/config-reference/ch_imageservice.xml @@ -8,41 +8,42 @@ xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook"> Image Service - Compute relies on an external image service to store virtual + Compute relies on an external image service to store virtual machine images and maintain a catalog of available images. By default, Compute is configured to use the OpenStack Image Service (Glance), which is currently the only supported image service. - + - If your installation requires euca2ools to register new + If your installation requires euca2ools to register new images, you must run the nova-objectstore service. This service provides an Amazon S3 front-end for Glance, which is required by euca2ools. - - You can modify many options in the OpenStack Image Service. + + You can modify many options in the OpenStack Image Service. The following tables provide a comprehensive list. - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/config-reference/image-service/section_image-service-sample-configuration-files.xml b/doc/config-reference/image-service/section_image-service-sample-configuration-files.xml new file mode 100644 index 0000000000..b52a90e849 --- /dev/null +++ b/doc/config-reference/image-service/section_image-service-sample-configuration-files.xml @@ -0,0 +1,55 @@ +
+ Image Service sample configuration files + All the files in this section can be found in the /etc/glance/ + directory. +
+ glance-api.conf + The configuration file for the Image Service API is found in the + glance-api.conf file. + This file must be modified after installation. + +
+
+ glance-registry.conf + Configuration for the Image Service's registry, which + stores the metadata about images, is found in the + glance-registry.conf file. + This file must be modified after installation. + +
+
+ glance-api-paste.ini + Configuration for the Image Service's API middleware pipeline is found in the + glance-api-paste.ini file. + You should not need to modify this file. + +
+
+ glance-registry-paste.ini + The Image Service's middleware pipeline for its registry is found in the + glance-registry-paste.ini file. + +
+
+ glance-scrubber.conf + glance-scrubber is a utility for the Image Service that cleans + up images that have been deleted; its configuration is stored in the + glance-scrubber.conf file. + Multiple instances of glance-scrubber can be run in a single + deployment, but only one of them can be designated as the + cleanup_scrubber in the + glance-scrubber.conf file. The + cleanup_scrubber coordinates other + glance-scrubber instances by maintaining the master queue + of images that need to be removed. + +
+
+ policy.json + The /etc/glance/policy.json file defines additional access controls + that apply to the Image Service. + +
+