openstack/ceilometer
Code Issues Proposed changes

Merge "devstack: allow ceilometer-api and keystone to run on different hosts"

Browse Source
This commit is contained in:
Jenkins 2016-07-06 04:20:33 +00:00 committed by Gerrit Code Review
commit 09e92e68d0
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devstack/plugin.sh
View File

@ -163,8 +163,12 @@ function _ceilometer_prepare_virt_drivers {
# Create ceilometer related accounts in Keystone # Create ceilometer related accounts in Keystone
function _ceilometer_create_accounts { function ceilometer_create_accounts {
if is_service_enabled ceilometer-api; then if is_service_enabled ceilometer-api; then
# At this time, the /etc/openstack/clouds.yaml is available,
# we could leverage that by setting OS_CLOUD
OLD_OS_CLOUD=$OS_CLOUD
export OS_CLOUD='devstack-admin'
create_service_user "ceilometer" "admin" create_service_user "ceilometer" "admin"
@ -179,6 +183,8 @@ function _ceilometer_create_accounts {
# Ceilometer needs ResellerAdmin role to access Swift account stats. # Ceilometer needs ResellerAdmin role to access Swift account stats.
get_or_add_user_project_role "ResellerAdmin" "ceilometer" $SERVICE_PROJECT_NAME get_or_add_user_project_role "ResellerAdmin" "ceilometer" $SERVICE_PROJECT_NAME
fi fi
export OS_CLOUD=$OLD_OS_CLOUD
fi fi
} }
@ -349,8 +355,6 @@ function configure_ceilometer {
# init_ceilometer() - Initialize etc. # init_ceilometer() - Initialize etc.
function init_ceilometer { function init_ceilometer {
# Get ceilometer keystone settings in place
_ceilometer_create_accounts
# Create cache dir # Create cache dir
sudo install -d -o $STACK_USER $CEILOMETER_AUTH_CACHE_DIR sudo install -d -o $STACK_USER $CEILOMETER_AUTH_CACHE_DIR
rm -f $CEILOMETER_AUTH_CACHE_DIR/* rm -f $CEILOMETER_AUTH_CACHE_DIR/*
@ -456,6 +460,8 @@ if is_service_enabled ceilometer; then
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
echo_summary "Configuring Ceilometer" echo_summary "Configuring Ceilometer"
configure_ceilometer configure_ceilometer
# Get ceilometer keystone settings in place
ceilometer_create_accounts
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
echo_summary "Initializing Ceilometer" echo_summary "Initializing Ceilometer"
# Tidy base for ceilometer # Tidy base for ceilometer

2
devstack/settings
View File

@ -23,7 +23,7 @@ GNOCCHI_ARCHIVE_POLICY=${GNOCCHI_ARCHIVE_POLICY:-low}
# Ceilometer connection info. # Ceilometer connection info.
CEILOMETER_SERVICE_PROTOCOL=http CEILOMETER_SERVICE_PROTOCOL=http
CEILOMETER_SERVICE_HOST=$SERVICE_HOST CEILOMETER_SERVICE_HOST=${CEILOMETER_SERVICE_HOST:-${SERVICE_HOST}}
CEILOMETER_SERVICE_PORT=${CEILOMETER_SERVICE_PORT:-8777} CEILOMETER_SERVICE_PORT=${CEILOMETER_SERVICE_PORT:-8777}
CEILOMETER_USE_MOD_WSGI=${CEILOMETER_USE_MOD_WSGI:-${ENABLE_HTTPD_MOD_WSGI_SERVICES}} CEILOMETER_USE_MOD_WSGI=${CEILOMETER_USE_MOD_WSGI:-${ENABLE_HTTPD_MOD_WSGI_SERVICES}}