openstack/devstack
Code Issues Proposed changes

Merge "Restart only nova-compute when deploying Ironic"

Browse Source
This commit is contained in:
Jenkins
2014-04-10 23:54:23 +00:00
committed by Gerrit Code Review
parent 372dadb9e4 5f060e62f7
commit c7d36b4a3e
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/ironic
View File

@@ -496,19 +496,6 @@ function prepare_baremetal_basic_ops {
fi fi
done done
SCREEN_NAME=${SCREEN_NAME:-stack}
SERVICE_DIR=${SERVICE_DIR:-${DEST}/status}
# stop all nova services
stop_nova || true
# remove any nova services failure status
find $SERVICE_DIR/$SCREEN_NAME -name 'n-*.failure' -exec rm -f '{}' \;
# start them again
start_nova_api
start_nova
TOKEN=$(keystone token-get | grep ' id ' | get_field 2) TOKEN=$(keystone token-get | grep ' id ' | get_field 2)
die_if_not_set $LINENO TOKEN "Keystone fail to get token" die_if_not_set $LINENO TOKEN "Keystone fail to get token"
@@ -520,6 +507,11 @@ function prepare_baremetal_basic_ops {
create_bridge_and_vms create_bridge_and_vms
enroll_vms enroll_vms
configure_tftpd configure_tftpd
# restart nova-compute to ensure its resource tracking is up to
# date with newly enrolled nodes
stop_nova_compute || true
start_nova_compute
} }
function cleanup_baremetal_basic_ops { function cleanup_baremetal_basic_ops {