From 67bc8e8ab9cb0a80ff82ea1c4b2bc84e2e802034 Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Wed, 8 Oct 2014 12:07:46 +0100 Subject: [PATCH] Cleanup create_accounts functions lib/nova and lib/ceilometer had function calls not in the desired form. Change-Id: I6b848e51654a48fe2df6084efdb0f67fd5e180f0 --- lib/ceilometer | 5 ++--- lib/nova | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/ceilometer b/lib/ceilometer index 9bb31218a0..c997de77e1 100644 --- a/lib/ceilometer +++ b/lib/ceilometer @@ -73,13 +73,12 @@ function is_ceilometer_enabled { } # create_ceilometer_accounts() - Set up common required ceilometer accounts - +# # Project User Roles # ------------------------------------------------------------------ # SERVICE_TENANT_NAME ceilometer admin # SERVICE_TENANT_NAME ceilometer ResellerAdmin (if Swift is enabled) - -create_ceilometer_accounts() { +function create_ceilometer_accounts { local service_tenant=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }") local admin_role=$(openstack role list | awk "/ admin / { print \$2 }") diff --git a/lib/nova b/lib/nova index fa57432187..cd9544ba66 100644 --- a/lib/nova +++ b/lib/nova @@ -330,14 +330,12 @@ function configure_nova { } # create_nova_accounts() - Set up common required nova accounts - +# # Project User Roles # ------------------------------------------------------------------ # SERVICE_TENANT_NAME nova admin # SERVICE_TENANT_NAME nova ResellerAdmin (if Swift is enabled) - -# Migrated from keystone_data.sh -create_nova_accounts() { +function create_nova_accounts { local service_tenant=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }") local admin_role=$(openstack role list | awk "/ admin / { print \$2 }")