openstack
/
manila
Code Issues Proposed changes

Fix devstack in non-neutron environments 

Modifications to neutron config files must be conditional
on neutron actually being enabled.

Change-Id: I89846cbc438210c71278a98f9ffa7fd02c6a718e
Closes-Bug: #1534592
This commit is contained in:
John Spray 2016-01-15 13:52:39 +00:00
parent 54d24838c0
commit c0a24f1074
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/plugin.sh
View File

@ -438,7 +438,9 @@ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
init_manila
echo_summary "Installing extra libraries"
install_libraries
iniset $Q_DHCP_CONF_FILE DEFAULT dnsmasq_local_resolv False
if is_service_enabled neutron; then
iniset $Q_DHCP_CONF_FILE DEFAULT dnsmasq_local_resolv False
fi
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
echo_summary "Creating Manila entities for auth service"
create_manila_accounts