Merge "Support devstack install without nova"

This commit is contained in:
Jenkins 2016-02-13 11:44:40 +00:00 committed by Gerrit Code Review
commit f16ff3ee7e
1 changed files with 13 additions and 9 deletions

View File

@ -559,11 +559,13 @@ elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
echo_summary "Creating Manila entities for auth service"
create_manila_accounts
echo_summary "Creating Manila service flavor"
create_manila_service_flavor
if is_service_enabled nova; then
echo_summary "Creating Manila service flavor"
create_manila_service_flavor
echo_summary "Creating Manila service security group"
create_manila_service_secgroup
echo_summary "Creating Manila service security group"
create_manila_service_secgroup
fi
# Skip image downloads when disabled.
# This way vendor Manila driver CI tests can skip
@ -575,12 +577,14 @@ elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
echo_summary "Skipping download of Manila service image"
fi
echo_summary "Creating Manila service keypair"
create_manila_service_keypair
if is_service_enabled nova; then
echo_summary "Creating Manila service keypair"
create_manila_service_keypair
echo_summary "Creating Manila service VMs for generic driver \
backends for which handlng of share servers is disabled."
create_service_share_servers
echo_summary "Creating Manila service VMs for generic driver \
backends for which handlng of share servers is disabled."
create_service_share_servers
fi
echo_summary "Configure Samba server"
configure_samba