openstack/devstack
Code Issues Proposed changes

Clean up operation with no Nova services enabled

Browse Source 
Change-Id: Ib9054bacc34e923c05f0bc699afd514eaa3cad01
This commit is contained in:
Dean Troyer 2012-10-22 15:24:46 -05:00
parent c7ac694090
commit 86a796941e
1 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stack.sh
View File

@ -1757,7 +1757,6 @@ if is_service_enabled nova; then
# Rebuild the config file from scratch # Rebuild the config file from scratch
create_nova_conf create_nova_conf
init_nova init_nova
fi
# Additional Nova configuration that is dependent on other services # Additional Nova configuration that is dependent on other services
if is_service_enabled quantum; then if is_service_enabled quantum; then
@ -1781,7 +1780,7 @@ if is_service_enabled quantum; then
fi fi
add_nova_opt "libvirt_vif_driver=$NOVA_VIF_DRIVER" add_nova_opt "libvirt_vif_driver=$NOVA_VIF_DRIVER"
add_nova_opt "linuxnet_interface_driver=$LINUXNET_VIF_DRIVER" add_nova_opt "linuxnet_interface_driver=$LINUXNET_VIF_DRIVER"
else elif is_service_enabled n-net; then
add_nova_opt "network_manager=nova.network.manager.$NET_MAN" add_nova_opt "network_manager=nova.network.manager.$NET_MAN"
add_nova_opt "public_interface=$PUBLIC_INTERFACE" add_nova_opt "public_interface=$PUBLIC_INTERFACE"
add_nova_opt "vlan_interface=$VLAN_INTERFACE" add_nova_opt "vlan_interface=$VLAN_INTERFACE"
@ -1850,6 +1849,7 @@ else
LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"} LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
add_nova_opt "firewall_driver=$LIBVIRT_FIREWALL_DRIVER" add_nova_opt "firewall_driver=$LIBVIRT_FIREWALL_DRIVER"
fi fi
fi
# Launch Services # Launch Services