stackforge/puppet-openstack
Code Issues Proposed changes

stop exporting resources.

Browse Source 
This commit removes embedded logic that was
exporting resources. Service discovery should be
performed from the site manifest using query
against puppet db.
This commit is contained in:
Joe Topjian
2012-10-24 11:18:04 -07:00
committed by Dan Bode
parent 867b783b8a
commit ea22f02ab3
3 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/compute.pp
View File

@@ -23,7 +23,7 @@ class openstack::compute (
# Required Rabbit # Required Rabbit
$rabbit_password, $rabbit_password,
# DB # DB
$sql_connection = false, $sql_connection,
# Network # Network
$quantum = true, $quantum = true,
$public_address = $internal_address, $public_address = $internal_address,
@@ -37,7 +37,7 @@ class openstack::compute (
# Nova # Nova
$purge_nova_config = true, $purge_nova_config = true,
# Rabbit # Rabbit
$rabbit_host = false, $rabbit_host = '127.0.0.1',
$rabbit_user = 'nova', $rabbit_user = 'nova',
# Glance # Glance
$glance_api_servers = false, $glance_api_servers = false,
@@ -70,10 +70,6 @@ class openstack::compute (
} }
} }
$final_sql_connection = $sql_connection
$glance_connection = $glance_api_servers
$rabbit_connection = $rabbit_host
class { 'nova': class { 'nova':
sql_connection => $sql_connection, sql_connection => $sql_connection,
rabbit_userid => $rabbit_user, rabbit_userid => $rabbit_user,

3
manifests/controller.pp
View File

@@ -31,7 +31,6 @@
# [network_config] Hash that can be used to pass implementation specifc # [network_config] Hash that can be used to pass implementation specifc
# network settings. Optioal. Defaults to {} # network settings. Optioal. Defaults to {}
# [verbose] Whether to log services at verbose. # [verbose] Whether to log services at verbose.
# [export_resources] Rather to export resources.
# Horizon related config - assumes puppetlabs-horizon code # Horizon related config - assumes puppetlabs-horizon code
# [secret_key] secret key to encode cookies, … # [secret_key] secret key to encode cookies, …
# [cache_server_ip] local memcached instance ip # [cache_server_ip] local memcached instance ip
@@ -125,7 +124,6 @@ class openstack::controller (
$horizon_app_links = undef, $horizon_app_links = undef,
# General # General
$verbose = 'False', $verbose = 'False',
$export_resources = true,
# if the cinder management components should be installed # if the cinder management components should be installed
$cinder = false, $cinder = false,
$cinder_user_password = 'cinder_user_pass', $cinder_user_password = 'cinder_user_pass',
@@ -257,7 +255,6 @@ class openstack::controller (
# General # General
verbose => $verbose, verbose => $verbose,
enabled => $enabled, enabled => $enabled,
exported_resources => $export_resources,
} }
######### Cinder Controller Services ######## ######### Cinder Controller Services ########

22
manifests/nova/controller.pp
View File

@@ -58,7 +58,6 @@ class openstack::nova::controller (
$keystone_host = '127.0.0.1', $keystone_host = '127.0.0.1',
$verbose = 'False', $verbose = 'False',
$enabled = true, $enabled = true,
$exported_resources = true
) { ) {
# Configure the db string # Configure the db string
@@ -73,25 +72,10 @@ class openstack::nova::controller (
} else { } else {
$real_glance_api_servers = $glance_api_servers $real_glance_api_servers = $glance_api_servers
} }
if ($exported_resources) {
# export all of the things that will be needed by the clients
@@nova_config { 'rabbit_host': value => $internal_address }
Nova_config <| title == 'rabbit_host' |>
@@nova_config { 'sql_connection': value => $nova_db } $sql_connection = $nova_db
Nova_config <| title == 'sql_connection' |> $glance_connection = $real_glance_api_servers
$rabbit_connection = $internal_address
@@nova_config { 'glance_api_servers': value => $real_glance_api_servers }
Nova_config <| title == 'glance_api_servers' |>
$sql_connection = false
$glance_connection = false
$rabbit_connection = false
} else {
$sql_connection = $nova_db
$glance_connection = $real_glance_api_servers
$rabbit_connection = $internal_address
}
# Install / configure rabbitmq # Install / configure rabbitmq
class { 'nova::rabbitmq': class { 'nova::rabbitmq':