Permalink
Browse files

Merge pull request #99 from jtopjian/jtopjian-essex_mods

Keystone admin tenant and mysql root password
  • Loading branch information...
2 parents 8abed24 + 97d719f commit bcb76de993f1d48c6ec750c15ca770fcf4c8e462 @bodepd bodepd committed Aug 20, 2012
Showing with 12 additions and 8 deletions.
  1. +6 −4 manifests/all.pp
  2. +6 −4 manifests/controller.pp
View
@@ -62,14 +62,15 @@
$network_manager = 'nova.network.manager.FlatDHCPManager',
$network_config = {},
# middleware credentials
- $mysql_root_password = 'sql_pass',
+ $mysql_root_password = undef,
$rabbit_password = 'rabbit_pw',
$rabbit_user = 'nova',
# opestack credentials
$admin_email = 'someuser@some_fake_email_address.foo',
$admin_password = 'ChangeMe',
$keystone_db_password = 'keystone_pass',
$keystone_admin_token = 'keystone_admin_token',
+ $keystone_admin_tenant = 'openstack',
$nova_db_password = 'nova_pass',
$nova_user_password = 'nova_pass',
$glance_db_password = 'glance_pass',
@@ -98,7 +99,7 @@
class { 'mysql::server':
config_hash => {
# the priv grant fails on precise if I set a root password
- # 'root_password' => $mysql_root_password,
+ 'root_password' => $mysql_root_password,
'bind_address' => '127.0.0.1'
}
}
@@ -123,8 +124,9 @@
}
# set up keystone admin users
class { 'keystone::roles::admin':
- email => $admin_email,
- password => $admin_password,
+ email => $admin_email,
+ password => $admin_password,
+ admin_tenant => $keystone_admin_tenant,
}
# set up the keystone service and endpoint
class { 'keystone::endpoint': }
View
@@ -54,11 +54,12 @@
$internal_address,
$admin_address = $internal_address,
# connection information
- $mysql_root_password = 'sql_pass',
+ $mysql_root_password = undef,
$admin_email = 'some_user@some_fake_email_address.foo',
$admin_password = 'ChangeMe',
$keystone_db_password = 'keystone_pass',
$keystone_admin_token = 'keystone_admin_token',
+ $keystone_admin_tenant = 'openstack',
$glance_db_password = 'glance_pass',
$glance_user_password = 'glance_pass',
$nova_db_password = 'nova_pass',
@@ -119,7 +120,7 @@
config_hash => {
# the priv grant fails on precise if I set a root password
# TODO I should make sure that this works
- # 'root_password' => $mysql_root_password,
+ 'root_password' => $mysql_root_password,
'bind_address' => '0.0.0.0'
},
enabled => $enabled,
@@ -164,8 +165,9 @@
if ($enabled) {
# set up keystone admin users
class { 'keystone::roles::admin':
- email => $admin_email,
- password => $admin_password,
+ email => $admin_email,
+ password => $admin_password,
+ admin_tenant => $keystone_admin_tenant,
}
# set up the keystone service and endpoint
class { 'keystone::endpoint':

0 comments on commit bcb76de

Please sign in to comment.