openstack/devstack
Code Issues Proposed changes

Merge "ERRORs in ceilometer-acentral log after succesful tempest run"

Browse Source
This commit is contained in:
Jenkins 2014-01-25 20:46:04 +00:00 committed by Gerrit Code Review
commit ee5e5dca98
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
files/keystone_data.sh
View File

@ -6,7 +6,6 @@
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# service glance admin # service glance admin
# service heat service # if enabled # service heat service # if enabled
# service ceilometer admin # if enabled
# Tempest Only: # Tempest Only:
# alt_demo alt_demo Member # alt_demo alt_demo Member
# #
@ -113,30 +112,11 @@ if [[ "$ENABLED_SERVICES" =~ "g-api" ]]; then
fi fi
# Ceilometer # Ceilometer
if [[ "$ENABLED_SERVICES" =~ "ceilometer" ]]; then if [[ "$ENABLED_SERVICES" =~ "ceilometer" ]] && [[ "$ENABLED_SERVICES" =~ "s-proxy" || "$ENABLED_SERVICES" =~ "swift" ]]; then
keystone user-create --name=ceilometer \
--pass="$SERVICE_PASSWORD" \
--tenant $SERVICE_TENANT_NAME \
--email=ceilometer@example.com
keystone user-role-add --tenant $SERVICE_TENANT_NAME \
--user ceilometer \
--role admin
# Ceilometer needs ResellerAdmin role to access swift account stats. # Ceilometer needs ResellerAdmin role to access swift account stats.
keystone user-role-add --tenant $SERVICE_TENANT_NAME \ keystone user-role-add --tenant $SERVICE_TENANT_NAME \
--user ceilometer \ --user ceilometer \
--role ResellerAdmin --role ResellerAdmin
if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then
keystone service-create \
--name=ceilometer \
--type=metering \
--description="Ceilometer Service"
keystone endpoint-create \
--region RegionOne \
--service ceilometer \
--publicurl "http://$SERVICE_HOST:8777" \
--adminurl "http://$SERVICE_HOST:8777" \
--internalurl "http://$SERVICE_HOST:8777"
fi
fi fi
# EC2 # EC2