stackforge/puppet-openstack
Code Issues Proposed changes

Merge pull request #99 from jtopjian/jtopjian-essex_mods

Browse Source 
Keystone admin tenant and mysql root password
This commit is contained in:
Dan Bode
2012-08-20 14:01:49 -07:00
parent 8abed24b08 97d719f7e6
commit bcb76de993
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/all.pp
View File

@@ -62,7 +62,7 @@ class openstack::all(
$network_manager = 'nova.network.manager.FlatDHCPManager', $network_manager = 'nova.network.manager.FlatDHCPManager',
$network_config = {}, $network_config = {},
# middleware credentials # middleware credentials
$mysql_root_password = 'sql_pass', $mysql_root_password = undef,
$rabbit_password = 'rabbit_pw', $rabbit_password = 'rabbit_pw',
$rabbit_user = 'nova', $rabbit_user = 'nova',
# opestack credentials # opestack credentials
@@ -70,6 +70,7 @@ class openstack::all(
$admin_password = 'ChangeMe', $admin_password = 'ChangeMe',
$keystone_db_password = 'keystone_pass', $keystone_db_password = 'keystone_pass',
$keystone_admin_token = 'keystone_admin_token', $keystone_admin_token = 'keystone_admin_token',
$keystone_admin_tenant = 'openstack',
$nova_db_password = 'nova_pass', $nova_db_password = 'nova_pass',
$nova_user_password = 'nova_pass', $nova_user_password = 'nova_pass',
$glance_db_password = 'glance_pass', $glance_db_password = 'glance_pass',
@@ -98,7 +99,7 @@ class openstack::all(
class { 'mysql::server': class { 'mysql::server':
config_hash => { config_hash => {
# the priv grant fails on precise if I set a root password # 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' 'bind_address' => '127.0.0.1'
} }
} }
@@ -123,8 +124,9 @@ class openstack::all(
} }
# set up keystone admin users # set up keystone admin users
class { 'keystone::roles::admin': class { 'keystone::roles::admin':
email => $admin_email, email => $admin_email,
password => $admin_password, password => $admin_password,
admin_tenant => $keystone_admin_tenant,
} }
# set up the keystone service and endpoint # set up the keystone service and endpoint
class { 'keystone::endpoint': } class { 'keystone::endpoint': }

10
manifests/controller.pp
View File

@@ -54,11 +54,12 @@ class openstack::controller(
$internal_address, $internal_address,
$admin_address = $internal_address, $admin_address = $internal_address,
# connection information # connection information
$mysql_root_password = 'sql_pass', $mysql_root_password = undef,
$admin_email = 'some_user@some_fake_email_address.foo', $admin_email = 'some_user@some_fake_email_address.foo',
$admin_password = 'ChangeMe', $admin_password = 'ChangeMe',
$keystone_db_password = 'keystone_pass', $keystone_db_password = 'keystone_pass',
$keystone_admin_token = 'keystone_admin_token', $keystone_admin_token = 'keystone_admin_token',
$keystone_admin_tenant = 'openstack',
$glance_db_password = 'glance_pass', $glance_db_password = 'glance_pass',
$glance_user_password = 'glance_pass', $glance_user_password = 'glance_pass',
$nova_db_password = 'nova_pass', $nova_db_password = 'nova_pass',
@@ -119,7 +120,7 @@ class openstack::controller(
config_hash => { config_hash => {
# the priv grant fails on precise if I set a root password # the priv grant fails on precise if I set a root password
# TODO I should make sure that this works # TODO I should make sure that this works
# 'root_password' => $mysql_root_password, 'root_password' => $mysql_root_password,
'bind_address' => '0.0.0.0' 'bind_address' => '0.0.0.0'
}, },
enabled => $enabled, enabled => $enabled,
@@ -164,8 +165,9 @@ class openstack::controller(
if ($enabled) { if ($enabled) {
# set up keystone admin users # set up keystone admin users
class { 'keystone::roles::admin': class { 'keystone::roles::admin':
email => $admin_email, email => $admin_email,
password => $admin_password, password => $admin_password,
admin_tenant => $keystone_admin_tenant,
} }
# set up the keystone service and endpoint # set up the keystone service and endpoint
class { 'keystone::endpoint': class { 'keystone::endpoint':