stackforge/kickstack
Code Issues Proposed changes

Correctly set Glance API servers

Browse Source
This commit is contained in:
Florian Haas 2013-07-15 01:38:32 +00:00
parent 6676af82ce
commit 33d3c9277e
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/glance/api.pp
View File

@ -24,4 +24,10 @@ class kickstack::glance::api inherits kickstack {
service_password => $service_password, service_password => $service_password,
require => Class['::glance::api'] require => Class['::glance::api']
} }
kickstack::exportfact::export { 'glance_api_host':
value => $hostname,
tag => 'glance',
require => Class['::glance::api']
}
} }

6
manifests/node/compute.pp
View File

@ -1,7 +1,8 @@
class kickstack::node::compute inherits kickstack { class kickstack::node::compute inherits kickstack {
# Compute nodes require AMQP connectivity, # Compute nodes require AMQP connectivity,
# a nova Keystone endpoint, and an SQL connection # a nova Keystone endpoint, an SQL connection,
# and a glance API server
case $::kickstack::rpc { case $::kickstack::rpc {
'rabbitmq': { 'rabbitmq': {
@ -16,10 +17,11 @@ class kickstack::node::compute inherits kickstack {
$nova_sql_conn = getvar("${::kickstack::fact_prefix}nova_sql_connection") $nova_sql_conn = getvar("${::kickstack::fact_prefix}nova_sql_connection")
$nova_keystone_password = getvar("${::kickstack::fact_prefix}nova_keystone_password") $nova_keystone_password = getvar("${::kickstack::fact_prefix}nova_keystone_password")
$glance_api_host = getvar("${::kickstack::fact_prefix}glance_api_host")
if $amqp_host and $amqp_password { if $amqp_host and $amqp_password {
include kickstack::quantum::agent::l2 include kickstack::quantum::agent::l2
if $nova_sql_conn and $nova_keystone_password { if $nova_sql_conn and $nova_keystone_password and $glance_api_host {
include kickstack::nova::compute include kickstack::nova::compute
} }
} }

5
manifests/nova/config.pp
View File

@ -1,6 +1,7 @@
class kickstack::nova::config inherits kickstack { class kickstack::nova::config inherits kickstack {
$sql_conn = getvar("${fact_prefix}nova_sql_connection") $sql_conn = getvar("${fact_prefix}nova_sql_connection")
$glance_api_servers = getvar("${fact_prefix}glance_api_host")
case "$::kickstack::rpc" { case "$::kickstack::rpc" {
'rabbitmq': { 'rabbitmq': {
@ -17,7 +18,7 @@ class kickstack::nova::config inherits kickstack {
auth_strategy => 'keystone', auth_strategy => 'keystone',
verbose => $::kickstack::verbose, verbose => $::kickstack::verbose,
debug => $::kickstack::debug, debug => $::kickstack::debug,
glance_api_servers => false glance_api_servers => "${glance_api_servers}:9292"
} }
} }
'qpid': { 'qpid': {
@ -34,7 +35,7 @@ class kickstack::nova::config inherits kickstack {
auth_strategy => 'keystone', auth_strategy => 'keystone',
verbose => $::kickstack::verbose, verbose => $::kickstack::verbose,
debug => $::kickstack::debug, debug => $::kickstack::debug,
glance_api_servers => false glance_api_servers => "${glance_api_servers}:9292"
} }
} }
} }