Merge "Enable the use scheduler creating share from snapshot flag"
This commit is contained in:
commit
10d5cbf639
@ -251,6 +251,8 @@ function configure_manila {
|
||||
|
||||
# Set the replica_state_update_interval
|
||||
iniset $MANILA_CONF DEFAULT replica_state_update_interval $MANILA_REPLICA_STATE_UPDATE_INTERVAL
|
||||
# Set the use_scheduler_creating_share_from_snapshot
|
||||
iniset $MANILA_CONF DEFAULT use_scheduler_creating_share_from_snapshot $MANILA_USE_SCHEDULER_CREATING_SHARE_FROM_SNAPSHOT
|
||||
|
||||
if is_service_enabled neutron; then
|
||||
configure_keystone_authtoken_middleware $MANILA_CONF neutron neutron
|
||||
|
@ -126,6 +126,7 @@ MANILA_SERVICE_KEYPAIR_NAME=${MANILA_SERVICE_KEYPAIR_NAME:-"manila-service"}
|
||||
MANILA_SERVICE_INSTANCE_USER=${MANILA_SERVICE_INSTANCE_USER:-"manila"}
|
||||
MANILA_SERVICE_IMAGE_URL=${MANILA_SERVICE_IMAGE_URL:-"http://tarballs.openstack.org/manila-image-elements/images/manila-service-image-master.qcow2"}
|
||||
MANILA_SERVICE_IMAGE_NAME=${MANILA_SERVICE_IMAGE_NAME:-"manila-service-image-master"}
|
||||
MANILA_USE_SCHEDULER_CREATING_SHARE_FROM_SNAPSHOT=${MANILA_USE_SCHEDULER_CREATING_SHARE_FROM_SNAPSHOT:-"False"}
|
||||
|
||||
# Third party CI Vendors should set this to false to skip the service image download
|
||||
MANILA_SERVICE_IMAGE_ENABLED=$(trueorfalse True MANILA_SERVICE_IMAGE_ENABLED)
|
||||
|
Loading…
x
Reference in New Issue
Block a user