x
/
mogan
Code Issues Proposed changes

Add default instance types and set ironic nodes property 

Change-Id: Ia726faaa862de5ea4e9e0ed45c5076a811b10b6d
This commit is contained in:
shihanzhang 2016-10-09 16:03:45 +08:00
parent 495ebb54f4
commit bc588bf82b
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
devstack/plugin.sh
View File

@ -140,12 +140,9 @@ function _install_nimble_dashboard {
function install_nimble_pythonclient {
if use_library_from_git "python-nimbleclient"; then
# add it when nimble nimble-pythonclient is ready
:
#git_clone ${NIMBLE_PYTHONCLIENT_REPO} ${NIMBLE_PYTHONCLIENT_DIR} ${NIMBLE_PYTHONCLIENT_BRANCH}
#setup_develop ${NIMBLE_PYTHONCLIENT_DIR}
fi
echo_summary "Installing python-nimbleclient"
git_clone ${NIMBLE_PYTHONCLIENT_REPO} ${NIMBLE_PYTHONCLIENT_DIR} ${NIMBLE_PYTHONCLIENT_BRANCH}
setup_develop ${NIMBLE_PYTHONCLIENT_DIR}
}
@ -183,6 +180,19 @@ function _nimble_cleanup_nimble_dashboard {
}
function create_instance_type {
openstack baremetal compute type create ${NIMBLE_DEFAULT_INSTANCE_TYPE} --description 'Nimble default instance type'
}
function update_ironic_node_type {
ironic_nodes=$(openstack baremetal node list -c UUID -f value)
for node in ${ironic_nodes};do
openstack baremetal node set --property instance_type=${NIMBLE_DEFAULT_INSTANCE_TYPE} ${node}
done
}
if is_service_enabled nimble; then
if [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing nimble"
@ -196,6 +206,10 @@ if is_service_enabled nimble; then
echo_summary "Initializing nimble"
init_nimble
start_nimble
echo_summary "Creating instance type"
create_instance_type
echo_summary "Updating ironic node properties"
update_ironic_node_type
fi
if [[ "$1" == "unstack" ]]; then

7
devstack/settings
View File

@ -11,9 +11,9 @@ NIMBLE_BRANCH=${NIMBLE_BRANCH:-master}
#NIMBLE_DASHBOARD_REPO=${NIMBLE_DASHBOARD_REPO:-${GIT_BASE}/openstack/nimble-dashboard.git}
#NIMBLE_DASHBOARD_BRANCH=${NIMBLE_DASHBOARD_BRANCH:-${NIMBLE_BRANCH}}
#NIMBLE_PYTHONCLIENT_REPO=${NIMBLE_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-nimbleclient.git}
#NIMBLE_PYTHONCLIENT_BRANCH=${NIMBLE_PYTHONCLIENT_BRANCH:-master}
#NIMBLE_PYTHONCLIENT_DIR=$DEST/python-nimbleclient
NIMBLE_PYTHONCLIENT_REPO=${NIMBLE_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-nimbleclient.git}
NIMBLE_PYTHONCLIENT_BRANCH=${NIMBLE_PYTHONCLIENT_BRANCH:-master}
NIMBLE_PYTHONCLIENT_DIR=${DEST}/python-nimbleclient
# Set up default directories
NIMBLE_DIR=$DEST/nimble
@ -27,3 +27,4 @@ NIMBLE_SERVICE_PORT=${NIMBLE_SERVICE_PORT:-6688}
NIMBLE_SERVICE_PROTOCOL=${NIMBLE_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
NIMBLE_ADMIN_USER=${NIMBLE_ADMIN_USER:-nimble}
NIMBLE_DEFAULT_INSTANCE_TYPE=${NIMBLE_DEFAULT_INSTANCE_TYPE:-small}