stackforge/kickstack
Code Issues Proposed changes

Export glance_registry_host from glance-registry, configure glance-api to use it

Browse Source
This commit is contained in:
Florian Haas 2013-07-07 16:42:12 +00:00
parent 8fa5cf0802
commit 021e50b8f4
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/glance/api.pp
View File

@ -6,6 +6,7 @@ class kickstack::glance::api inherits kickstack {
# Keystone accordingly. If no fact has been set, generate a password. # Keystone accordingly. If no fact has been set, generate a password.
$service_password = getvar("${fact_prefix}glance_keystone_password") $service_password = getvar("${fact_prefix}glance_keystone_password")
$sql_conn = getvar("${fact_prefix}glance_sql_connection") $sql_conn = getvar("${fact_prefix}glance_sql_connection")
$reg_host = getvar("${fact_prefix}glance_registry_host")
class { '::glance::api': class { '::glance::api':
verbose => $kickstack::verbose, verbose => $kickstack::verbose,
@ -14,6 +15,7 @@ class kickstack::glance::api inherits kickstack {
keystone_user => 'glance', keystone_user => 'glance',
keystone_password => $service_password, keystone_password => $service_password,
sql_connection => $sql_conn, sql_connection => $sql_conn,
registry_host => $reg_host,
} }
} }

8
manifests/glance/registry.pp
View File

@ -15,4 +15,12 @@ class kickstack::glance::registry inherits kickstack {
keystone_password => "$service_password", keystone_password => "$service_password",
sql_connection => "$sql_conn", sql_connection => "$sql_conn",
} }
# Export the registry host name string for the service
kickstack::exportfact::export { "glance_registry_host":
value => "${hostname}",
tag => "glance",
require => Class['::glance::registry']
}
} }