Move create_manila_accounts to post-config

In before, Manila devstack plugin create the service endpoint in
"extra" stage. This caused issue of other services that depends
on the manila endpoints that are not yet created. This commit
move the endpoint creation to "post-config" stage, which is the
practice of other OpenStack services

Change-Id: I3adfbf78d0792471a29c7ff979aad1418e6137d4
This commit is contained in:
Hongbin Lu 2017-03-24 21:20:12 -05:00
parent 5f53762f6f
commit c0c3aa035c

View File

@ -900,6 +900,8 @@ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
init_manila init_manila
echo_summary "Installing extra libraries" echo_summary "Installing extra libraries"
install_libraries install_libraries
echo_summary "Creating Manila entities for auth service"
create_manila_accounts
# Cinder config update # Cinder config update
if is_service_enabled cinder && [[ -n "$CINDER_OVERSUBSCRIPTION_RATIO" ]]; then if is_service_enabled cinder && [[ -n "$CINDER_OVERSUBSCRIPTION_RATIO" ]]; then
@ -911,9 +913,6 @@ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
iniset $CINDER_CONF DEFAULT max_over_subscription_ratio $CINDER_OVERSUBSCRIPTION_RATIO iniset $CINDER_CONF DEFAULT max_over_subscription_ratio $CINDER_OVERSUBSCRIPTION_RATIO
fi fi
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
echo_summary "Creating Manila entities for auth service"
create_manila_accounts
if is_service_enabled nova; then if is_service_enabled nova; then
echo_summary "Creating Manila service flavor" echo_summary "Creating Manila service flavor"
create_manila_service_flavor create_manila_service_flavor