deleted file mode 100644

@@ -1,39 +0,0 @@

-[pipeline:glance-api]

-#pipeline = versionnegotiation context apiv1app

-# NOTE: use the following pipeline for keystone

-pipeline = versionnegotiation authtoken context apiv1app

-

-# To enable Image Cache Management API replace pipeline with below:

-# pipeline = versionnegotiation context imagecache apiv1app

-# NOTE: use the following pipeline for keystone auth (with caching)

-# pipeline = versionnegotiation authtoken auth-context imagecache apiv1app

-

-[app:apiv1app]

-paste.app_factory = glance.common.wsgi:app_factory

-glance.app_factory = glance.api.v1.router:API

-

-[filter:versionnegotiation]

-paste.filter_factory = glance.common.wsgi:filter_factory

-glance.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter

-

-[filter:cache]

-paste.filter_factory = glance.common.wsgi:filter_factory

-glance.filter_factory = glance.api.middleware.cache:CacheFilter

-

-[filter:cachemanage]

-paste.filter_factory = glance.common.wsgi:filter_factory

-glance.filter_factory = glance.api.middleware.cache_manage:CacheManageFilter

-

-[filter:context]

-paste.filter_factory = glance.common.wsgi:filter_factory

-glance.filter_factory = glance.common.context:ContextMiddleware

-

-[filter:authtoken]

-paste.filter_factory = keystone.middleware.auth_token:filter_factory

-auth_host = %KEYSTONE_AUTH_HOST%

-auth_port = %KEYSTONE_AUTH_PORT%

-auth_protocol = %KEYSTONE_AUTH_PROTOCOL%

-auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/

-admin_tenant_name = %SERVICE_TENANT_NAME%

-admin_user = %SERVICE_USERNAME%

-admin_password = %SERVICE_PASSWORD%

deleted file mode 100644

@@ -1,139 +0,0 @@

-[DEFAULT]

-# Show more verbose log output (sets INFO log level output)

-verbose = True

-

-# Show debugging output in logs (sets DEBUG log level output)

-debug = True

-

-# Which backend store should Glance use by default is not specified

-# in a request to add a new image to Glance? Default: 'file'

-# Available choices are 'file', 'swift', and 's3'

-default_store = file

-

-# Address to bind the API server

-bind_host = 0.0.0.0

-

-# Port the bind the API server to

-bind_port = 9292

-

-# Address to find the registry server

-registry_host = 0.0.0.0

-

-# Port the registry server is listening on

-registry_port = 9191

-

-# Log to this file. Make sure you do not set the same log

-# file for both the API and registry servers!

-#log_file = %DEST%/glance/api.log

-

-# Send logs to syslog (/dev/log) instead of to file specified by `log_file`

-use_syslog = %SYSLOG%

-

-# ============ Notification System Options =====================

-

-# Notifications can be sent when images are create, updated or deleted.

-# There are three methods of sending notifications, logging (via the

-# log_file directive), rabbit (via a rabbitmq queue) or noop (no

-# notifications sent, the default)

-notifier_strategy = noop

-

-# Configuration options if sending notifications via rabbitmq (these are

-# the defaults)

-rabbit_host = localhost

-rabbit_port = 5672

-rabbit_use_ssl = false

-rabbit_userid = guest

-rabbit_password = guest

-rabbit_virtual_host = /

-rabbit_notification_topic = glance_notifications

-

-# ============ Filesystem Store Options ========================

-

-# Directory that the Filesystem backend store

-# writes image data to

-filesystem_store_datadir = %DEST%/glance/images/

-

-# ============ Swift Store Options =============================

-

-# Address where the Swift authentication service lives

-swift_store_auth_address = 127.0.0.1:8080/v1.0/

-

-# User to authenticate against the Swift authentication service

-swift_store_user = jdoe

-

-# Auth key for the user authenticating against the

-# Swift authentication service

-swift_store_key = a86850deb2742ec3cb41518e26aa2d89

-

-# Container within the account that the account should use

-# for storing images in Swift

-swift_store_container = glance

-

-# Do we create the container if it does not exist?

-swift_store_create_container_on_put = False

-

-# What size, in MB, should Glance start chunking image files

-# and do a large object manifest in Swift? By default, this is

-# the maximum object size in Swift, which is 5GB

-swift_store_large_object_size = 5120

-

-# When doing a large object manifest, what size, in MB, should

-# Glance write chunks to Swift? This amount of data is written

-# to a temporary disk buffer during the process of chunking

-# the image file, and the default is 200MB

-swift_store_large_object_chunk_size = 200

-

-# Whether to use ServiceNET to communicate with the Swift storage servers.

-# (If you aren't RACKSPACE, leave this False!)

-#

-# To use ServiceNET for authentication, prefix hostname of

-# `swift_store_auth_address` with 'snet-'.

-# Ex. https://example.com/v1.0/ -> https://snet-example.com/v1.0/

-swift_enable_snet = False

-

-# ============ S3 Store Options =============================

-

-# Address where the S3 authentication service lives

-s3_store_host = 127.0.0.1:8080/v1.0/

-

-# User to authenticate against the S3 authentication service

-s3_store_access_key = <20-char AWS access key>

-

-# Auth key for the user authenticating against the

-# S3 authentication service

-s3_store_secret_key = <40-char AWS secret key>

-

-# Container within the account that the account should use

-# for storing images in S3. Note that S3 has a flat namespace,

-# so you need a unique bucket name for your glance images. An

-# easy way to do this is append your AWS access key to "glance".

-# S3 buckets in AWS *must* be lowercased, so remember to lowercase

-# your AWS access key if you use it in your bucket name below!

-s3_store_bucket = <lowercased 20-char aws access key>glance

-

-# Do we create the bucket if it does not exist?

-s3_store_create_bucket_on_put = False

-

-# ============ Image Cache Options ========================

-

-image_cache_enabled = False

-

-# Directory that the Image Cache writes data to

-# Make sure this is also set in glance-pruner.conf

-image_cache_datadir = /var/lib/glance/image-cache/

-

-# Number of seconds after which we should consider an incomplete image to be

-# stalled and eligible for reaping

-image_cache_stall_timeout = 86400

-

-# ============ Delayed Delete Options =============================

-

-# Turn on/off delayed delete

-delayed_delete = False

-

-# Delayed delete time in seconds

-scrub_time = 43200

-

-# Directory that the scrubber will use to remind itself of what to delete

-# Make sure this is also set in glance-scrubber.conf

-scrubber_datadir = /var/lib/glance/scrubber

deleted file mode 100644

@@ -1,23 +0,0 @@

-[pipeline:glance-registry]

-#pipeline = context registryapp

-# NOTE: use the following pipeline for keystone

-pipeline = authtoken context registryapp

-

-[app:registryapp]

-paste.app_factory = glance.common.wsgi:app_factory

-glance.app_factory = glance.registry.api.v1:API

-

-[filter:context]

-context_class = glance.registry.context.RequestContext

-paste.filter_factory = glance.common.wsgi:filter_factory

-glance.filter_factory = glance.common.context:ContextMiddleware

-

-[filter:authtoken]

-paste.filter_factory = keystone.middleware.auth_token:filter_factory

-auth_host = %KEYSTONE_AUTH_HOST%

-auth_port = %KEYSTONE_AUTH_PORT%

-auth_protocol = %KEYSTONE_AUTH_PROTOCOL%

-auth_uri = %KEYSTONE_SERVICE_PROTOCOL%://%KEYSTONE_SERVICE_HOST%:%KEYSTONE_SERVICE_PORT%/

-admin_tenant_name = %SERVICE_TENANT_NAME%

-admin_user = %SERVICE_USERNAME%

-admin_password = %SERVICE_PASSWORD%

deleted file mode 100644

@@ -1,44 +0,0 @@

-[DEFAULT]

-# Show more verbose log output (sets INFO log level output)

-verbose = True

-

-# Show debugging output in logs (sets DEBUG log level output)

-debug = True

-

-# Address to bind the registry server

-bind_host = 0.0.0.0

-

-# Port the bind the registry server to

-bind_port = 9191

-

-# Log to this file. Make sure you do not set the same log

-# file for both the API and registry servers!

-#log_file = %DEST%/glance/registry.log

-

-# Where to store images

-filesystem_store_datadir = %DEST%/glance/images

-

-# Send logs to syslog (/dev/log) instead of to file specified by `log_file`

-use_syslog = %SYSLOG%

-

-# SQLAlchemy connection string for the reference implementation

-# registry server. Any valid SQLAlchemy connection string is fine.

-# See: http://www.sqlalchemy.org/docs/05/reference/sqlalchemy/connections.html#sqlalchemy.create_engine

-sql_connection = %SQL_CONN%

-

-# Period in seconds after which SQLAlchemy should reestablish its connection

-# to the database.

-#

-# MySQL uses a default `wait_timeout` of 8 hours, after which it will drop

-# idle connections. This can result in 'MySQL Gone Away' exceptions. If you

-# notice this, you can lower this value to ensure that SQLAlchemy reconnects

-# before MySQL can drop the connection.

-sql_idle_timeout = 3600

-

-# Limit the api to return `param_limit_max` items in a call to a container. If

-# a larger `limit` query param is provided, it will be reduced to this value.

-api_limit_max = 1000

-

-# If a `limit` query param is not provided in an api request, it will

-# default to `limit_param_default`

-limit_param_default = 25

@@ -855,45 +855,42 @@ if is_service_enabled g-reg; then

     mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'DROP DATABASE IF EXISTS glance;'

     mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE glance CHARACTER SET utf8;'

-    function glance_config {

-        sudo sed -e "

-            s,%KEYSTONE_API_PORT%,$KEYSTONE_API_PORT,g;

-            s,%KEYSTONE_AUTH_HOST%,$KEYSTONE_AUTH_HOST,g;

-            s,%KEYSTONE_AUTH_PORT%,$KEYSTONE_AUTH_PORT,g;

-            s,%KEYSTONE_AUTH_PROTOCOL%,$KEYSTONE_AUTH_PROTOCOL,g;

-            s,%KEYSTONE_SERVICE_HOST%,$KEYSTONE_SERVICE_HOST,g;

-            s,%KEYSTONE_SERVICE_PORT%,$KEYSTONE_SERVICE_PORT,g;

-            s,%KEYSTONE_SERVICE_PROTOCOL%,$KEYSTONE_SERVICE_PROTOCOL,g;

-            s,%SQL_CONN%,$BASE_SQL_CONN/glance?charset=utf8,g;

-            s,%SERVICE_TENANT_NAME%,$SERVICE_TENANT_NAME,g;

-            s,%SERVICE_USERNAME%,glance,g;

-            s,%SERVICE_PASSWORD%,$SERVICE_PASSWORD,g;

-            s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g;

-            s,%DEST%,$DEST,g;

-            s,%SYSLOG%,$SYSLOG,g;

-        " -i $1

-    }

-

     # Copy over our glance configurations and update them

     GLANCE_REGISTRY_CONF=$GLANCE_CONF_DIR/glance-registry.conf

-    cp $FILES/glance-registry.conf $GLANCE_REGISTRY_CONF

-    glance_config $GLANCE_REGISTRY_CONF

-

-    if [[ -e $FILES/glance-registry-paste.ini ]]; then

-        GLANCE_REGISTRY_PASTE_INI=$GLANCE_CONF_DIR/glance-registry-paste.ini

-        cp $FILES/glance-registry-paste.ini $GLANCE_REGISTRY_PASTE_INI

-        glance_config $GLANCE_REGISTRY_PASTE_INI

-    fi

+    cp $GLANCE_DIR/etc/glance-registry.conf $GLANCE_REGISTRY_CONF

+    iniset $GLANCE_REGISTRY_CONF DEFAULT debug True

+    inicomment $GLANCE_REGISTRY_CONF DEFAULT log_file

+    iniset $GLANCE_REGISTRY_CONF DEFAULT sql_connection $BASE_SQL_CONN/glance?charset=utf8

+    iniset $GLANCE_REGISTRY_CONF DEFAULT use_syslog $SYSLOG

+    iniset $GLANCE_REGISTRY_CONF paste_deploy flavor keystone

+

+    GLANCE_REGISTRY_PASTE_INI=$GLANCE_CONF_DIR/glance-registry-paste.ini

+    cp $GLANCE_DIR/etc/glance-registry-paste.ini $GLANCE_REGISTRY_PASTE_INI

+    iniset $GLANCE_REGISTRY_PASTE_INI filter:authtoken auth_host $KEYSTONE_AUTH_HOST

+    iniset $GLANCE_REGISTRY_PASTE_INI filter:authtoken auth_port $KEYSTONE_AUTH_PORT

+    iniset $GLANCE_REGISTRY_PASTE_INI filter:authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL

+    iniset $GLANCE_REGISTRY_PASTE_INI filter:authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/

+    iniset $GLANCE_REGISTRY_PASTE_INI filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME

+    iniset $GLANCE_REGISTRY_PASTE_INI filter:authtoken admin_user glance

+    iniset $GLANCE_REGISTRY_PASTE_INI filter:authtoken admin_password $SERVICE_PASSWORD

     GLANCE_API_CONF=$GLANCE_CONF_DIR/glance-api.conf

-    cp $FILES/glance-api.conf $GLANCE_API_CONF

-    glance_config $GLANCE_API_CONF

-

-    if [[ -e $FILES/glance-api-paste.ini ]]; then

-        GLANCE_API_PASTE_INI=$GLANCE_CONF_DIR/glance-api-paste.ini

-        cp $FILES/glance-api-paste.ini $GLANCE_API_PASTE_INI

-        glance_config $GLANCE_API_PASTE_INI

-    fi

+    cp $GLANCE_DIR/etc/glance-api.conf $GLANCE_API_CONF

+    iniset $GLANCE_API_CONF DEFAULT debug True

+    inicomment $GLANCE_API_CONF DEFAULT log_file

+    iniset $GLANCE_API_CONF DEFAULT use_syslog $SYSLOG

+    iniset $GLANCE_API_CONF DEFAULT filesystem_store_datadir $GLANCE_IMAGE_DIR/

+    iniset $GLANCE_API_CONF paste_deploy flavor keystone

+

+    GLANCE_API_PASTE_INI=$GLANCE_CONF_DIR/glance-api-paste.ini

+    cp $GLANCE_DIR/etc/glance-api-paste.ini $GLANCE_API_PASTE_INI

+    iniset $GLANCE_API_PASTE_INI filter:authtoken auth_host $KEYSTONE_AUTH_HOST

+    iniset $GLANCE_API_PASTE_INI filter:authtoken auth_port $KEYSTONE_AUTH_PORT

+    iniset $GLANCE_API_PASTE_INI filter:authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL

+    iniset $GLANCE_API_PASTE_INI filter:authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/

+    iniset $GLANCE_API_PASTE_INI filter:authtoken admin_tenant_name $SERVICE_TENANT_NAME

+    iniset $GLANCE_API_PASTE_INI filter:authtoken admin_user glance

+    iniset $GLANCE_API_PASTE_INI filter:authtoken admin_password $SERVICE_PASSWORD

 fi

 # Quantum