stackforge/puppet-openstack
Code Issues Proposed changes

Force users to set the mysql root password

Browse Source 
Fixes bug 1191068

Change-Id: Ic05bbe3648e9e606290218da4215415cb211d09d
This commit is contained in:
Logan McNaughton
2013-07-16 20:17:03 +00:00
parent 7d11996b7b
commit d52895d5ad
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/all.pp
View File

@@ -115,6 +115,7 @@ class openstack::all (
$nova_db_password, $nova_db_password,
$nova_user_password, $nova_user_password,
$secret_key, $secret_key,
$mysql_root_password,
# cinder and quantum password are not required b/c they are # cinder and quantum password are not required b/c they are
# optional. Not sure what to do about this. # optional. Not sure what to do about this.
$quantum_user_password = false, $quantum_user_password = false,
@@ -124,7 +125,6 @@ class openstack::all (
# Database # Database
$db_host = '127.0.0.1', $db_host = '127.0.0.1',
$db_type = 'mysql', $db_type = 'mysql',
$mysql_root_password = 'sql_pass',
$mysql_account_security = true, $mysql_account_security = true,
$mysql_bind_address = '0.0.0.0', $mysql_bind_address = '0.0.0.0',
$allowed_hosts = '%', $allowed_hosts = '%',

2
manifests/controller.pp
View File

@@ -109,6 +109,7 @@ class openstack::controller (
$nova_db_password, $nova_db_password,
$nova_user_password, $nova_user_password,
$secret_key, $secret_key,
$mysql_root_password,
# cinder and quantum password are not required b/c they are # cinder and quantum password are not required b/c they are
# optional. Not sure what to do about this. # optional. Not sure what to do about this.
$quantum_user_password = false, $quantum_user_password = false,
@@ -119,7 +120,6 @@ class openstack::controller (
# Database # Database
$db_host = '127.0.0.1', $db_host = '127.0.0.1',
$db_type = 'mysql', $db_type = 'mysql',
$mysql_root_password = 'sql_pass',
$mysql_account_security = true, $mysql_account_security = true,
$mysql_bind_address = '0.0.0.0', $mysql_bind_address = '0.0.0.0',
$sql_idle_timeout = undef, $sql_idle_timeout = undef,

1
spec/classes/openstack_all_spec.rb
View File

@@ -17,6 +17,7 @@ describe 'openstack::all' do
:nova_db_password => 'nova_pass', :nova_db_password => 'nova_pass',
:nova_user_password => 'nova_pass', :nova_user_password => 'nova_pass',
:secret_key => 'secret_key', :secret_key => 'secret_key',
:mysql_root_password => 'sql_pass',
} }
end end

1
spec/classes/openstack_controller_spec.rb
View File

@@ -22,6 +22,7 @@ describe 'openstack::controller' do
:cinder_db_password => 'cinder_pass', :cinder_db_password => 'cinder_pass',
:cinder_user_password => 'cinder_pass', :cinder_user_password => 'cinder_pass',
:secret_key => 'secret_key', :secret_key => 'secret_key',
:mysql_root_password => 'sql_pass',
:quantum => false, :quantum => false,
:vncproxy_host => '10.0.0.1', :vncproxy_host => '10.0.0.1',
:nova_admin_tenant_name => 'services', :nova_admin_tenant_name => 'services',