openstack/devstack
Code Issues Proposed changes

Merge "Reuse existing libvirt setup functions for Ironic"

Browse Source
This commit is contained in:
Jenkins 2014-03-21 14:54:24 +00:00 committed by Gerrit Code Review
commit 116023f8e4
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ironic
View File

@ -288,20 +288,12 @@ function configure_ironic_dirs {
mkdir -p $IRONIC_TFTPBOOT_DIR/pxelinux.cfg mkdir -p $IRONIC_TFTPBOOT_DIR/pxelinux.cfg
} }
function ironic_ensure_libvirt_group {
groups $STACK_USER | grep -q $LIBVIRT_GROUP || adduser $STACK_USER $LIBVIRT_GROUP
}
function create_bridge_and_vms { function create_bridge_and_vms {
ironic_ensure_libvirt_group
# Call libvirt setup scripts in a new shell to ensure any new group membership # Call libvirt setup scripts in a new shell to ensure any new group membership
sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/setup-network" sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/setup-network"
sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/create-nodes \ sudo su $STACK_USER -c "$IRONIC_SCRIPTS_DIR/create-nodes \
$IRONIC_VM_SPECS_CPU $IRONIC_VM_SPECS_RAM $IRONIC_VM_SPECS_DISK \ $IRONIC_VM_SPECS_CPU $IRONIC_VM_SPECS_RAM $IRONIC_VM_SPECS_DISK \
amd64 $IRONIC_VM_COUNT $IRONIC_VM_NETWORK_BRIDGE $IRONIC_VM_EMULATOR" >> $IRONIC_VM_MACS_CSV_FILE amd64 $IRONIC_VM_COUNT $IRONIC_VM_NETWORK_BRIDGE $IRONIC_VM_EMULATOR" >> $IRONIC_VM_MACS_CSV_FILE
} }
function enroll_vms { function enroll_vms {

5
lib/nova_plugins/hypervisor-ironic
View File

@ -18,6 +18,7 @@
MY_XTRACE=$(set +o | grep xtrace) MY_XTRACE=$(set +o | grep xtrace)
set +o xtrace set +o xtrace
source $TOP_DIR/lib/nova_plugins/functions-libvirt
# Defaults # Defaults
# -------- # --------
@ -33,6 +34,7 @@ function cleanup_nova_hypervisor {
# configure_nova_hypervisor - Set config files, create data dirs, etc # configure_nova_hypervisor - Set config files, create data dirs, etc
function configure_nova_hypervisor { function configure_nova_hypervisor {
configure_libvirt
iniset $NOVA_CONF ironic sql_connection `database_connection_url nova_bm` iniset $NOVA_CONF ironic sql_connection `database_connection_url nova_bm`
LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.firewall.NoopFirewallDriver"} LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.firewall.NoopFirewallDriver"}
iniset $NOVA_CONF DEFAULT compute_driver ironic.nova.virt.ironic.IronicDriver iniset $NOVA_CONF DEFAULT compute_driver ironic.nova.virt.ironic.IronicDriver
@ -50,8 +52,7 @@ function configure_nova_hypervisor {
# install_nova_hypervisor() - Install external components # install_nova_hypervisor() - Install external components
function install_nova_hypervisor { function install_nova_hypervisor {
# This function intentionally left blank install_libvirt
:
} }
# start_nova_hypervisor - Start any required external services # start_nova_hypervisor - Start any required external services