From 97d719f7e6946c9413549cdb6c9b2482dad4c728 Mon Sep 17 00:00:00 2001 From: Joe Topjian Date: Mon, 20 Aug 2012 11:53:38 -0600 Subject: [PATCH] Keystone admin tenant and mysql root password Added ability to set the keystone admin tenant and the mysql root password. --- manifests/all.pp | 10 ++++++---- manifests/controller.pp | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/manifests/all.pp b/manifests/all.pp index 9543db2..6c4200d 100644 --- a/manifests/all.pp +++ b/manifests/all.pp @@ -62,7 +62,7 @@ class openstack::all( $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 @@ -70,6 +70,7 @@ class openstack::all( $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 openstack::all( 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 @@ class openstack::all( } # 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': } diff --git a/manifests/controller.pp b/manifests/controller.pp index d9bf7bc..0257018 100644 --- a/manifests/controller.pp +++ b/manifests/controller.pp @@ -54,11 +54,12 @@ class openstack::controller( $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 @@ class openstack::controller( 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 @@ class openstack::controller( 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':