"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "devstack/plugin.sh" between
manila-8.1.2.tar.gz and manila-8.1.3.tar.gz

About: OpenStack Manila provides “Shared Filesystems as a service”.
The "Stein" series (maintained release).

plugin.sh  (manila-8.1.2):plugin.sh  (manila-8.1.3)
skipping to change at line 835 skipping to change at line 835
# for more details # for more details
if [ $(trueorfalse False MANILA_USE_UWSGI) == True ] && [ $(trueorfalse Fals e MANILA_USE_MOD_WSGI) == True ]; then if [ $(trueorfalse False MANILA_USE_UWSGI) == True ] && [ $(trueorfalse Fals e MANILA_USE_MOD_WSGI) == True ]; then
MSG="Both MANILA_USE_UWSGI and MANILA_USE_MOD_WSGI are set to True. MSG="Both MANILA_USE_UWSGI and MANILA_USE_MOD_WSGI are set to True.
Using UWSGI as the preferred option Using UWSGI as the preferred option
Set MANILA_USE_UWSGI to False to deploy manila api with MOD_WSGI" Set MANILA_USE_UWSGI to False to deploy manila api with MOD_WSGI"
warn $LINENO $MSG warn $LINENO $MSG
fi fi
if [ $(trueorfalse False MANILA_USE_UWSGI) == True ]; then if [ $(trueorfalse False MANILA_USE_UWSGI) == True ]; then
echo "Deploying with UWSGI" echo "Deploying with UWSGI"
run_process m-api "$MANILA_BIN_DIR/uwsgi --ini $MANILA_UWSGI_CONF --proc name-prefix manila-api" run_process m-api "$(which uwsgi) --ini $MANILA_UWSGI_CONF --procname-pr efix manila-api"
elif [ $(trueorfalse False MANILA_USE_MOD_WSGI) == True ]; then elif [ $(trueorfalse False MANILA_USE_MOD_WSGI) == True ]; then
echo "Deploying with MOD_WSGI" echo "Deploying with MOD_WSGI"
install_apache_wsgi install_apache_wsgi
enable_apache_site manila-api enable_apache_site manila-api
restart_apache_server restart_apache_server
tail_log m-api /var/log/$APACHE_NAME/manila_api.log tail_log m-api /var/log/$APACHE_NAME/manila_api.log
else else
echo "Deploying with built-in server" echo "Deploying with built-in server"
run_process m-api "$MANILA_BIN_DIR/manila-api --config-file $MANILA_CONF " run_process m-api "$MANILA_BIN_DIR/manila-api --config-file $MANILA_CONF "
fi fi
skipping to change at line 917 skipping to change at line 917
MANILA_TEMPEST_PLUGIN_BRANCH=${MANILA_TEMPEST_PLUGIN_BRANCH:-master} MANILA_TEMPEST_PLUGIN_BRANCH=${MANILA_TEMPEST_PLUGIN_BRANCH:-master}
MANILA_TEMPEST_PLUGIN_DIR=$DEST/manila-tempest-plugin MANILA_TEMPEST_PLUGIN_DIR=$DEST/manila-tempest-plugin
git_clone $MANILA_TEMPEST_PLUGIN_REPO $MANILA_TEMPEST_PLUGIN_DIR $MANILA_TEM PEST_PLUGIN_BRANCH git_clone $MANILA_TEMPEST_PLUGIN_REPO $MANILA_TEMPEST_PLUGIN_DIR $MANILA_TEM PEST_PLUGIN_BRANCH
setup_develop $MANILA_TEMPEST_PLUGIN_DIR setup_develop $MANILA_TEMPEST_PLUGIN_DIR
} }
# update_tempest - Function used for updating Tempest config if Tempest service enabled # update_tempest - Function used for updating Tempest config if Tempest service enabled
function update_tempest { function update_tempest {
if is_service_enabled tempest; then if is_service_enabled tempest; then
if [[ "$(trueorfalse False MANILA_SETUP_IPV6)" == "True" ]]; then
# The public network was created by us, so set it explicitly in
# tempest.conf
public_net_id=$(openstack network list --name $PUBLIC_NETWORK_NAME -
f value -c ID )
iniset $TEMPEST_CONFIG network public_network_id $public_net_id
fi
TEMPEST_CONFIG=${TEMPEST_CONFIG:-$TEMPEST_DIR/etc/tempest.conf} TEMPEST_CONFIG=${TEMPEST_CONFIG:-$TEMPEST_DIR/etc/tempest.conf}
ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-"admin"} ADMIN_TENANT_NAME=${ADMIN_TENANT_NAME:-"admin"}
ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"} ADMIN_DOMAIN_NAME=${ADMIN_DOMAIN_NAME:-"Default"}
ADMIN_PASSWORD=${ADMIN_PASSWORD:-"secretadmin"} ADMIN_PASSWORD=${ADMIN_PASSWORD:-"secretadmin"}
if [ $(trueorfalse False MANILA_USE_SERVICE_INSTANCE_PASSWORD) == True ] ; then if [ $(trueorfalse False MANILA_USE_SERVICE_INSTANCE_PASSWORD) == True ] ; then
iniset $TEMPEST_CONFIG share image_password $MANILA_SERVICE_INSTANCE _PASSWORD iniset $TEMPEST_CONFIG share image_password $MANILA_SERVICE_INSTANCE _PASSWORD
fi fi
iniset $TEMPEST_CONFIG share image_with_share_tools $MANILA_SERVICE_IMAG E_NAME iniset $TEMPEST_CONFIG share image_with_share_tools $MANILA_SERVICE_IMAG E_NAME
iniset $TEMPEST_CONFIG auth admin_username ${ADMIN_USERNAME:-"admin"} iniset $TEMPEST_CONFIG auth admin_username ${ADMIN_USERNAME:-"admin"}
skipping to change at line 1010 skipping to change at line 1018
if [ $(trueorfalse True RUN_MANILA_HOST_ASSISTED_MIGRATION_TESTS) == Tru e ]; then if [ $(trueorfalse True RUN_MANILA_HOST_ASSISTED_MIGRATION_TESTS) == Tru e ]; then
if is_ubuntu; then if is_ubuntu; then
install_package nfs-common install_package nfs-common
else else
install_package nfs-utils install_package nfs-utils
fi fi
fi fi
fi fi
} }
function allow_host_ports_for_share_mounting {
if [[ $MANILA_ENABLED_SHARE_PROTOCOLS =~ NFS ]]; then
# 111 and 2049 are for rpcbind and NFS
# Other ports are for NFSv3 statd, mountd and lockd daemons
MANILA_TCP_PORTS=(2049 111 32803 892 875 662)
MANILA_UDP_PORTS=(111 32769 892 875 662)
fi
if [[ $MANILA_ENABLED_SHARE_PROTOCOLS =~ CEPHFS ]]; then
# clients need access to the ceph daemons
MANILA_TCP_PORTS=(${MANILA_TCP_PORTS[*]} 6789 6800:7300)
fi
if [[ -v MANILA_TCP_PORTS || -v MANILA_UDP_PORTS ]]; then
for ipcmd in iptables ip6tables; do
sudo $ipcmd -N manila-storage
sudo $ipcmd -I INPUT 1 -j manila-storage
for port in ${MANILA_TCP_PORTS[*]}; do
sudo $ipcmd -A manila-storage -m tcp -p tcp --dport $port -j ACC
EPT
done
for port in ${MANILA_UDP_PORTS[*]}; do
sudo $ipcmd -A manila-storage -m udp -p udp --dport $port -j ACC
EPT
done
done
fi
}
function setup_ipv6 { function setup_ipv6 {
# save IPv6 default route to add back later after enabling forwarding # This will fail with multiple default routes and is not needed in CI
local default_route=$(ip -6 route | grep default | cut -d ' ' -f1,2,3,4,5) # but may be useful when developing with devstack locally
if [ $(trueorfalse False MANILA_RESTORE_IPV6_DEFAULT_ROUTE) == True ]; then
# save IPv6 default route to add back later after enabling forwarding
local default_route=$(ip -6 route | grep default | cut -d ' ' -f1,2,3,4,
5)
fi
# make sure those system values are set # make sure those system values are set
sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0 sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=0
sudo sysctl -w net.ipv6.conf.all.accept_ra=2 sudo sysctl -w net.ipv6.conf.all.accept_ra=2
sudo sysctl -w net.ipv6.conf.all.forwarding=1 sudo sysctl -w net.ipv6.conf.all.forwarding=1
# Disable in-band as our communication is only internal # Disable in-band as our communication is only internal
sudo ovs-vsctl set Bridge $PUBLIC_BRIDGE other_config:disable-in-band=true sudo ovs-vsctl set Bridge $PUBLIC_BRIDGE other_config:disable-in-band=true
# Create address scopes and subnet pools # Create address scopes and subnet pools
skipping to change at line 1128 skipping to change at line 1167
elif is_fedora; then elif is_fedora; then
# Disable SELinux rule that conflicts with Zebra # Disable SELinux rule that conflicts with Zebra
sudo setsebool -P zebra_write_config 1 sudo setsebool -P zebra_write_config 1
fi fi
sudo systemctl enable $QUAGGA_SERVICES sudo systemctl enable $QUAGGA_SERVICES
sudo systemctl restart $QUAGGA_SERVICES sudo systemctl restart $QUAGGA_SERVICES
# log the systemd status # log the systemd status
sudo systemctl status $QUAGGA_SERVICES sudo systemctl status $QUAGGA_SERVICES
# add default IPv6 route back # This will fail with mutltiple default routes and is not needed in CI
if ! [[ -z $default_route ]]; then # but may be useful when developing with devstack locally
# "replace" should ignore "RTNETLINK answers: File exists" if [ $(trueorfalse False MANILA_RESTORE_IPV6_DEFAULT_ROUTE) == True ]; then
# error if the route wasn't flushed by the bgp setup we did earlier. # add default IPv6 route back
sudo ip -6 route replace $default_route if ! [[ -z $default_route ]]; then
# "replace" should ignore "RTNETLINK answers: File exists"
# error if the route wasn't flushed by the bgp setup we did earlier.
sudo ip -6 route replace $default_route
fi
fi fi
} }
function setup_bgp_for_ipv6 {
public_gateway_ipv6=$(openstack subnet show ipv6-public-subnet -c gateway_ip
-f value)
neutron bgp-speaker-create --ip-version 6 --local-as 100 bgpspeaker
neutron bgp-speaker-network-add bgpspeaker $PUBLIC_NETWORK_NAME
neutron bgp-peer-create --peer-ip $public_gateway_ipv6 --remote-as 200 bgppe
er
neutron bgp-speaker-peer-add bgpspeaker bgppeer
}
# Main dispatcher # Main dispatcher
if [[ "$1" == "stack" && "$2" == "install" ]]; then if [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing Manila Client" echo_summary "Installing Manila Client"
install_manilaclient install_manilaclient
echo_summary "Installing Manila" echo_summary "Installing Manila"
install_manila install_manila
set_cinder_quotas set_cinder_quotas
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
echo_summary "Configuring Manila" echo_summary "Configuring Manila"
configure_manila configure_manila
skipping to change at line 1235 skipping to change at line 1286
backends for which handlng of share servers is disabled." backends for which handlng of share servers is disabled."
create_service_share_servers create_service_share_servers
fi fi
if [ "$SHARE_DRIVER" == "manila.share.drivers.generic.GenericShareDriver" ]; then if [ "$SHARE_DRIVER" == "manila.share.drivers.generic.GenericShareDriver" ]; then
echo_summary "Starting rest of Manila services - scheduler, share and da ta" echo_summary "Starting rest of Manila services - scheduler, share and da ta"
start_rest_of_manila start_rest_of_manila
fi fi
########################################################################### ###########################################################################
echo_summary "Fetching and installing manila-tempest-plugin system-wide" if [ $(trueorfalse False MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE) == True ]
install_manila_tempest_plugin ; then
echo_summary "Fetching and installing manila-tempest-plugin system-wide"
install_manila_tempest_plugin
export DEPRECATED_TEXT="$DEPRECATED_TEXT\nInstalling
manila-tempest-plugin can be done with the help of its own DevStack
plugin by adding: \n\n\t'enable_plugin manila-tempest-plugin
https://opendev.org/openstack/manila-tempest-plugin'.\n\nManila's
DevStack plugin will stop installing it automatically."
fi
echo_summary "Update Tempest config" echo_summary "Update Tempest config"
update_tempest update_tempest
if [[ "$(trueorfalse False MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST)" == "True"
]]; then
echo_summary "Allowing IPv4 and IPv6 access to NAS ports on the host"
allow_host_ports_for_share_mounting
fi
if [[ "$(trueorfalse False MANILA_SETUP_IPV6)" == "True" ]]; then
# Now that all plugins are loaded, setup BGP
echo_summary "Setting up BGP speaker to advertise routes to project netw
orks"
setup_bgp_for_ipv6
fi
fi fi
if [[ "$1" == "unstack" ]]; then if [[ "$1" == "unstack" ]]; then
cleanup_manila cleanup_manila
fi fi
if [[ "$1" == "clean" ]]; then if [[ "$1" == "clean" ]]; then
cleanup_manila cleanup_manila
sudo rm -rf /etc/manila sudo rm -rf /etc/manila
fi fi
 End of changes. 8 change blocks. 
10 lines changed or deleted 90 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)