openstack/devstack
Code Issues Proposed changes

Merge "Cleanup create_accounts functions"

Browse Source
This commit is contained in:
Jenkins 2014-10-14 21:00:36 +00:00 committed by Gerrit Code Review
commit e9c70ab409
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ceilometer
View File

@ -73,13 +73,12 @@ function is_ceilometer_enabled {
} }
# create_ceilometer_accounts() - Set up common required ceilometer accounts # create_ceilometer_accounts() - Set up common required ceilometer accounts
#
# Project User Roles # Project User Roles
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# SERVICE_TENANT_NAME ceilometer admin # SERVICE_TENANT_NAME ceilometer admin
# SERVICE_TENANT_NAME ceilometer ResellerAdmin (if Swift is enabled) # SERVICE_TENANT_NAME ceilometer ResellerAdmin (if Swift is enabled)
function create_ceilometer_accounts {
create_ceilometer_accounts() {
local service_tenant=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }") local service_tenant=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }")
local admin_role=$(openstack role list | awk "/ admin / { print \$2 }") local admin_role=$(openstack role list | awk "/ admin / { print \$2 }")

6
lib/nova
View File

@ -330,14 +330,12 @@ function configure_nova {
} }
# create_nova_accounts() - Set up common required nova accounts # create_nova_accounts() - Set up common required nova accounts
#
# Project User Roles # Project User Roles
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# SERVICE_TENANT_NAME nova admin # SERVICE_TENANT_NAME nova admin
# SERVICE_TENANT_NAME nova ResellerAdmin (if Swift is enabled) # SERVICE_TENANT_NAME nova ResellerAdmin (if Swift is enabled)
function create_nova_accounts {
# Migrated from keystone_data.sh
create_nova_accounts() {
local service_tenant=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }") local service_tenant=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }")
local admin_role=$(openstack role list | awk "/ admin / { print \$2 }") local admin_role=$(openstack role list | awk "/ admin / { print \$2 }")