openstack
/
charm-glance
Code Issues Proposed changes

Add configuration option for region

This commit is contained in:
James Page 2013-01-22 10:41:26 -06:00
parent cfeaaf8738
commit e800d570d3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.yaml
View File

@ -22,6 +22,10 @@ options:
default: glance
type: string
description: Glance database name.
region:
default: RegionOne
type: string
description: OpenStack Region
# HA configuration settings
vip:
type: string

2
hooks/glance-relations
View File

@ -195,7 +195,7 @@ function keystone_joined {
url="http://$(unit-get private-address):$port/v1"
fi
relation-set service="glance" \
region="RegionOne" public_url=$url admin_url=$url internal_url=$url
region="$(config-get region)" public_url=$url admin_url=$url internal_url=$url
}
function keystone_changed {