Merge "always create ceilometer user"

devstack/plugin.sh

@@ -163,7 +163,6 @@ function _ceilometer_prepare_virt_drivers {
 
 # Create ceilometer related accounts in Keystone
 function ceilometer_create_accounts {
-    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
@@ -171,12 +170,14 @@ function ceilometer_create_accounts {
 
     create_service_user "ceilometer" "admin"
 
+    if is_service_enabled ceilometer-api; then
         get_or_create_service "ceilometer" "metering" "OpenStack Telemetry Service"
         get_or_create_endpoint "metering" \
             "$REGION_NAME" \
             "$(ceilometer_service_url)" \
             "$(ceilometer_service_url)" \
             "$(ceilometer_service_url)"
+    fi
 
     if is_service_enabled swift; then
         # Ceilometer needs ResellerAdmin role to access Swift account stats.
@@ -184,7 +185,6 @@ function ceilometer_create_accounts {
     fi
 
     export OS_CLOUD=$OLD_OS_CLOUD
-    fi
 }
 
 # Activities to do before ceilometer has been installed.