openstack/manila
Code Issues Proposed changes

Fix devstack plugin to not depend on private network

Browse Source 
A private network is only needed in the devstack plugin in the
case of generic driver, dhss=false. Therefore we move the command
that depends on it into the loop so things don't break when the
network doesn't exist if it's not needed.

Change-Id: If8074e6b7ce5d42430666f23484167d6a7262be5
This commit is contained in:
Ben Swartzlander 2017-01-24 09:57:34 -05:00
parent c1fc70b85c
commit 912360e807
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -284,7 +284,6 @@ function is_driver_enabled {
# create_service_share_servers - creates service Nova VMs, one per generic
# driver, and only if it is configured to mode without handling of share servers.
function create_service_share_servers {
private_net_id=$(openstack network show $PRIVATE_NETWORK_NAME -f value -c id)
created_admin_network=false
for BE in ${MANILA_ENABLED_BACKENDS//,/ }; do
driver_handles_share_servers=$(iniget $MANILA_CONF $BE driver_handles_share_servers)
@ -295,6 +294,7 @@ function create_service_share_servers {
vm_name='manila_service_share_server_'$BE
local vm_exists=$( openstack server list --all-projects | grep " $vm_name " )
if [[ -z $vm_exists ]]; then
private_net_id=$(openstack network show $PRIVATE_NETWORK_NAME -f value -c id)
openstack server create $vm_name \
--flavor $MANILA_SERVICE_VM_FLAVOR_NAME \
--image $MANILA_SERVICE_IMAGE_NAME \