stackforge/puppet-openstack
Code Issues Proposed changes

compute.pp's admin_password should sync with $nova_user_password of controller.pp.

Browse Source
This commit is contained in:
Wong Hoi Sing Edison
2012-06-19 21:43:54 +08:00
parent 8997682d65
commit 69e46afb41
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/site.pp
View File

@@ -129,6 +129,7 @@ node /openstack_compute/ {
network_manager => 'nova.network.manager.FlatDHCPManager', network_manager => 'nova.network.manager.FlatDHCPManager',
multi_host => false, multi_host => false,
sql_connection => $sql_connection, sql_connection => $sql_connection,
nova_user_password => $nova_user_password,
rabbit_host => $controller_node_internal, rabbit_host => $controller_node_internal,
rabbit_password => $rabbit_password, rabbit_password => $rabbit_password,
rabbit_user => $rabbit_user, rabbit_user => $rabbit_user,

4
manifests/compute.pp
View File

@@ -23,6 +23,7 @@
# [sql_connection] SQL connection information. Optional. Defaults to false # [sql_connection] SQL connection information. Optional. Defaults to false
# which indicates that exported resources will be used to determine connection # which indicates that exported resources will be used to determine connection
# information. # information.
# [nova_user_password] Nova service password.
# [rabbit_host] RabbitMQ host. False indicates it should be collected. # [rabbit_host] RabbitMQ host. False indicates it should be collected.
# Optional. Defaults to false, # Optional. Defaults to false,
# [rabbit_password] RabbitMQ password. Optional. Defaults to 'rabbit_pw', # [rabbit_password] RabbitMQ password. Optional. Defaults to 'rabbit_pw',
@@ -55,6 +56,7 @@ class openstack::compute(
# my address # my address
# conection information # conection information
$sql_connection = false, $sql_connection = false,
$nova_user_password = 'nova_pass',
$rabbit_host = false, $rabbit_host = false,
$rabbit_password = 'rabbit_pw', $rabbit_password = 'rabbit_pw',
$rabbit_user = 'nova', $rabbit_user = 'nova',
@@ -105,7 +107,7 @@ class openstack::compute(
enabled => true, enabled => true,
admin_tenant_name => 'services', admin_tenant_name => 'services',
admin_user => 'nova', admin_user => 'nova',
admin_password => $nova_service_password, admin_password => $nova_user_password,
} }
} else { } else {
$enable_network_service = false $enable_network_service = false