openstack/fuel-library
Code Issues Proposed changes

Admin user option

Browse Source
This commit is contained in:
Dmitry Pyzhov 2013-02-27 15:30:35 +04:00
parent bd4bb6dd7e
commit f5cab8f04e
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack/manifests/controller.pp
View File

@ -71,6 +71,7 @@ class openstack::controller (
$mysql_root_password = 'sql_pass',
$custom_mysql_setup_class= undef,
$admin_email = 'some_user@some_fake_email_address.foo',
$admin_user = 'admin',
$admin_password = 'ChangeMe',
$keystone_db_password = 'keystone_pass',
$keystone_admin_token = 'keystone_admin_token',
@ -226,6 +227,7 @@ class openstack::controller (
admin_token => $keystone_admin_token,
admin_tenant => $keystone_admin_tenant,
admin_email => $admin_email,
admin_user => $admin_user,
admin_password => $admin_password,
public_address => $public_address,
internal_address => $internal_address,

4
deployment/puppet/openstack/manifests/controller_ha.pp
View File

@ -113,7 +113,7 @@ class openstack::controller_ha (
$controller_public_addresses, $public_interface, $private_interface, $controller_internal_addresses,
$internal_virtual_ip, $public_virtual_ip, $internal_interface, $internal_address,
$floating_range, $fixed_range, $multi_host, $network_manager, $verbose, $network_config = {}, $num_networks = 1, $network_size = 255,
$auto_assign_floating_ip, $mysql_root_password, $admin_email, $admin_password, $keystone_admin_tenant='admin',
$auto_assign_floating_ip, $mysql_root_password, $admin_email, $admin_user = 'admin', $admin_password, $keystone_admin_tenant='admin',
$keystone_db_password, $keystone_admin_token, $glance_db_password, $glance_user_password,
$nova_db_password, $nova_user_password, $rabbit_password, $rabbit_user,
$rabbit_nodes, $memcached_servers, $export_resources, $glance_backend='file', $swift_proxies=undef,
@ -292,6 +292,7 @@ local0.* -/var/log/haproxy.log'
galera_node_address => $internal_address,
galera_nodes => $galera_nodes,
admin_email => $admin_email,
admin_user => $admin_user,
admin_password => $admin_password,
keystone_db_password => $keystone_db_password,
keystone_admin_token => $keystone_admin_token,
@ -337,6 +338,7 @@ local0.* -/var/log/haproxy.log'
}
class { 'openstack::auth_file':
admin_user => $admin_user,
admin_password => $admin_password,
admin_tenant => $keystone_admin_tenant,
keystone_admin_token => $keystone_admin_token,

2
deployment/puppet/openstack/manifests/keystone.pp
View File

@ -42,6 +42,7 @@ class openstack::keystone (
$db_password,
$admin_token,
$admin_email,
$admin_user = 'admin',
$admin_password,
$glance_user_password,
$nova_user_password,
@ -172,6 +173,7 @@ class openstack::keystone (
if ($enabled) {
# Setup the admin user
class { 'keystone::roles::admin':
admin => $admin_user,
email => $admin_email,
password => $admin_password,
admin_tenant => $admin_tenant,