Rename nimble to mogan (4)
This changes devstack plugin some other related things Change-Id: I60913691a89b767f34a04192244eee7ce4af7996
This commit is contained in:
Zhenguo Niu
parent
4fd1aab5b3
commit
7575d1b96e
@ -14,4 +14,4 @@ Pull requests submitted through GitHub will be ignored.
|
||||
|
||||
Bugs should be filed on Launchpad, not GitHub:
|
||||
|
||||
https://bugs.launchpad.net/nimble
|
||||
https://bugs.launchpad.net/mogan
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
nimble Style Commandments
|
||||
Mogan Style Commandments
|
||||
===============================================
|
||||
|
||||
Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
|
||||
|
||||
@ -197,7 +197,7 @@ except Exception:
|
||||
# html_file_suffix = ''
|
||||
|
||||
# Output file base name for HTML help builder.
|
||||
htmlhelp_basename = 'nimbledoc'
|
||||
htmlhelp_basename = 'mogandoc'
|
||||
|
||||
|
||||
# -- Options for LaTeX output -------------------------------------------------
|
||||
|
||||
@ -11,6 +11,6 @@ Enabling in Devstack
|
||||
|
||||
> cat local.conf
|
||||
[[local|localrc]]
|
||||
enable_plugin mogan https://git.openstack.org/openstack/mogan
|
||||
enable_plugin nimble https://git.openstack.org/openstack/nimble
|
||||
|
||||
3. run ``stack.sh``
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
# ``stack.sh`` calls the entry points in this order:
|
||||
#
|
||||
# install_nimble
|
||||
# install_python_nimbleclient
|
||||
# configure_nimble
|
||||
# start_nimble
|
||||
# stop_nimble
|
||||
# cleanup_nimble
|
||||
# install_mogan
|
||||
# install_python_moganclient
|
||||
# configure_mogan
|
||||
# start_mogan
|
||||
# stop_mogan
|
||||
# cleanup_mogan
|
||||
|
||||
# Save trace setting
|
||||
XTRACE=$(set +o | grep xtrace)
|
||||
@ -15,25 +15,25 @@ set -o xtrace
|
||||
# --------
|
||||
|
||||
# Support entry points installation of console scripts
|
||||
if [[ -d ${NIMBLE_DIR}/bin ]]; then
|
||||
NIMBLE_BIN_DIR=${NIMBLE_DIR}/bin
|
||||
if [[ -d ${MOGAN_DIR}/bin ]]; then
|
||||
MOGAN_BIN_DIR=${MOGAN_DIR}/bin
|
||||
else
|
||||
NIMBLE_BIN_DIR=$(get_python_exec_prefix)
|
||||
MOGAN_BIN_DIR=$(get_python_exec_prefix)
|
||||
fi
|
||||
|
||||
# create_nimble_accounts - Set up common required nimble accounts
|
||||
# create_mogan_accounts - Set up common required mogan accounts
|
||||
#
|
||||
# Project User Roles
|
||||
# ------------------------------
|
||||
# service nimble admin
|
||||
function create_nimble_accounts {
|
||||
create_service_user "nimble" "admin"
|
||||
get_or_create_service "nimble" "baremetal_compute" "Baremetal Compute"
|
||||
# service mogan admin
|
||||
function create_mogan_accounts {
|
||||
create_service_user "mogan" "admin"
|
||||
get_or_create_service "mogan" "baremetal_compute" "Baremetal Compute"
|
||||
get_or_create_endpoint "baremetal_compute" \
|
||||
"$REGION_NAME" \
|
||||
"${NIMBLE_SERVICE_PROTOCOL}://${NIMBLE_SERVICE_HOST}:${NIMBLE_SERVICE_PORT}/v1" \
|
||||
"${NIMBLE_SERVICE_PROTOCOL}://${NIMBLE_SERVICE_HOST}:${NIMBLE_SERVICE_PORT}/v1" \
|
||||
"${NIMBLE_SERVICE_PROTOCOL}://${NIMBLE_SERVICE_HOST}:${NIMBLE_SERVICE_PORT}/v1"
|
||||
"${MOGAN_SERVICE_PROTOCOL}://${MOGAN_SERVICE_HOST}:${MOGAN_SERVICE_PORT}/v1" \
|
||||
"${MOGAN_SERVICE_PROTOCOL}://${MOGAN_SERVICE_HOST}:${MOGAN_SERVICE_PORT}/v1" \
|
||||
"${MOGAN_SERVICE_PROTOCOL}://${MOGAN_SERVICE_HOST}:${MOGAN_SERVICE_PORT}/v1"
|
||||
}
|
||||
|
||||
|
||||
@ -47,161 +47,161 @@ function mkdir_chown_stack {
|
||||
# Entry points
|
||||
# ------------
|
||||
|
||||
# configure_nimble - Set config files, create data dirs, etc
|
||||
function configure_nimble {
|
||||
mkdir_chown_stack "${NIMBLE_CONF_DIR}"
|
||||
# configure_mogan - Set config files, create data dirs, etc
|
||||
function configure_mogan {
|
||||
mkdir_chown_stack "${MOGAN_CONF_DIR}"
|
||||
|
||||
iniset ${NIMBLE_CONF_FILE} DEFAULT debug ${NIMBLE_DEBUG}
|
||||
iniset ${MOGAN_CONF_FILE} DEFAULT debug ${MOGAN_DEBUG}
|
||||
|
||||
NIMBLE_POLICY_FILE=${NIMBLE_CONF_DIR}/policy.json
|
||||
MOGAN_POLICY_FILE=${MOGAN_CONF_DIR}/policy.json
|
||||
|
||||
# Nimble Configuration
|
||||
# Mogan Configuration
|
||||
#-------------------------
|
||||
|
||||
# Setup keystone_authtoken section
|
||||
iniset ${NIMBLE_CONF_FILE} keystone_authtoken auth_uri ${KEYSTONE_SERVICE_URI}
|
||||
iniset ${NIMBLE_CONF_FILE} keystone_authtoken project_domain_name ${SERVICE_DOMAIN_NAME}
|
||||
iniset ${NIMBLE_CONF_FILE} keystone_authtoken project_name ${SERVICE_PROJECT_NAME}
|
||||
iniset ${NIMBLE_CONF_FILE} keystone_authtoken user_domain_name ${SERVICE_DOMAIN_NAME}
|
||||
iniset ${NIMBLE_CONF_FILE} keystone_authtoken username ${NIMBLE_ADMIN_USER}
|
||||
iniset ${NIMBLE_CONF_FILE} keystone_authtoken password ${SERVICE_PASSWORD}
|
||||
iniset ${NIMBLE_CONF_FILE} keystone_authtoken auth_url ${KEYSTONE_AUTH_URI}
|
||||
iniset ${NIMBLE_CONF_FILE} keystone_authtoken auth_type "password"
|
||||
iniset ${MOGAN_CONF_FILE} keystone_authtoken auth_uri ${KEYSTONE_SERVICE_URI}
|
||||
iniset ${MOGAN_CONF_FILE} keystone_authtoken project_domain_name ${SERVICE_DOMAIN_NAME}
|
||||
iniset ${MOGAN_CONF_FILE} keystone_authtoken project_name ${SERVICE_PROJECT_NAME}
|
||||
iniset ${MOGAN_CONF_FILE} keystone_authtoken user_domain_name ${SERVICE_DOMAIN_NAME}
|
||||
iniset ${MOGAN_CONF_FILE} keystone_authtoken username ${MOGAN_ADMIN_USER}
|
||||
iniset ${MOGAN_CONF_FILE} keystone_authtoken password ${SERVICE_PASSWORD}
|
||||
iniset ${MOGAN_CONF_FILE} keystone_authtoken auth_url ${KEYSTONE_AUTH_URI}
|
||||
iniset ${MOGAN_CONF_FILE} keystone_authtoken auth_type "password"
|
||||
|
||||
# Config the transport url
|
||||
iniset_rpc_backend nimble $NIMBLE_CONF_FILE
|
||||
iniset_rpc_backend mogan $MOGAN_CONF_FILE
|
||||
|
||||
# Configure the database.
|
||||
iniset ${NIMBLE_CONF_FILE} database connection `database_connection_url nimble`
|
||||
iniset ${MOGAN_CONF_FILE} database connection `database_connection_url mogan`
|
||||
|
||||
# Setup ironic section
|
||||
iniset ${NIMBLE_CONF_FILE} ironic admin_tenant_name ${SERVICE_PROJECT_NAME}
|
||||
iniset ${NIMBLE_CONF_FILE} ironic admin_username "ironic"
|
||||
iniset ${NIMBLE_CONF_FILE} ironic admin_password ${SERVICE_PASSWORD}
|
||||
iniset ${NIMBLE_CONF_FILE} ironic admin_url "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}:${KEYSTONE_SERVICE_PORT}/v2.0"
|
||||
iniset ${NIMBLE_CONF_FILE} ironic api_endpoint "${KEYSTONE_AUTH_PROTOCOL}://${SERVICE_HOST}:${IRONIC_SERVICE_PORT}"
|
||||
iniset ${MOGAN_CONF_FILE} ironic admin_tenant_name ${SERVICE_PROJECT_NAME}
|
||||
iniset ${MOGAN_CONF_FILE} ironic admin_username "ironic"
|
||||
iniset ${MOGAN_CONF_FILE} ironic admin_password ${SERVICE_PASSWORD}
|
||||
iniset ${MOGAN_CONF_FILE} ironic admin_url "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_AUTH_HOST}:${KEYSTONE_SERVICE_PORT}/v2.0"
|
||||
iniset ${MOGAN_CONF_FILE} ironic api_endpoint "${KEYSTONE_AUTH_PROTOCOL}://${SERVICE_HOST}:${IRONIC_SERVICE_PORT}"
|
||||
|
||||
# Setup neutron section
|
||||
iniset ${NIMBLE_CONF_FILE} neutron url "${NEUTRON_SERVICE_PROTOCOL}://${SERVICE_HOST}:${NEUTRON_SERVICE_PORT}"
|
||||
iniset ${MOGAN_CONF_FILE} neutron url "${NEUTRON_SERVICE_PROTOCOL}://${SERVICE_HOST}:${NEUTRON_SERVICE_PORT}"
|
||||
|
||||
# Setup glance section
|
||||
iniset ${NIMBLE_CONF_FILE} glance glance_api_servers "${GLANCE_SERVICE_PROTOCOL}://${SERVICE_HOST}:${GLANCE_SERVICE_PORT}"
|
||||
iniset ${MOGAN_CONF_FILE} glance glance_api_servers "${GLANCE_SERVICE_PROTOCOL}://${SERVICE_HOST}:${GLANCE_SERVICE_PORT}"
|
||||
|
||||
# Setup keystone section
|
||||
iniset ${NIMBLE_CONF_FILE} keystone region_name ${REGION_NAME}
|
||||
iniset ${MOGAN_CONF_FILE} keystone region_name ${REGION_NAME}
|
||||
|
||||
# Path of policy.json file.
|
||||
iniset ${NIMBLE_CONF_FILE} oslo_policy policy_file ${NIMBLE_POLICY_FILE}
|
||||
iniset ${MOGAN_CONF_FILE} oslo_policy policy_file ${MOGAN_POLICY_FILE}
|
||||
|
||||
if [ "$LOG_COLOR" == "True" ] && [ "$SYSLOG" == "False" ]; then
|
||||
setup_colorized_logging ${NIMBLE_CONF_FILE} DEFAULT tenant user
|
||||
setup_colorized_logging ${MOGAN_CONF_FILE} DEFAULT tenant user
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# init_nimble - Initialize the database
|
||||
function init_nimble {
|
||||
# (re)create Nimble database
|
||||
recreate_database nimble utf8
|
||||
${NIMBLE_BIN_DIR}/nimble-dbsync --config-file ${NIMBLE_CONF_FILE} upgrade
|
||||
# init_mogan - Initialize the database
|
||||
function init_mogan {
|
||||
# (re)create Mogan database
|
||||
recreate_database mogan utf8
|
||||
${MOGAN_BIN_DIR}/mogan-dbsync --config-file ${MOGAN_CONF_FILE} upgrade
|
||||
}
|
||||
|
||||
|
||||
# install_nimble - Collect source and prepare
|
||||
function install_nimble {
|
||||
# install_mogan - Collect source and prepare
|
||||
function install_mogan {
|
||||
# make sure all needed service were enabled
|
||||
local req_services="key glance neutron ironic"
|
||||
for srv in $req_services; do
|
||||
if ! is_service_enabled "$srv"; then
|
||||
die $LINENO "$srv should be enabled for Nimble."
|
||||
die $LINENO "$srv should be enabled for Mogan."
|
||||
fi
|
||||
done
|
||||
|
||||
setup_develop ${NIMBLE_DIR}
|
||||
setup_develop ${MOGAN_DIR}
|
||||
|
||||
if is_service_enabled horizon; then
|
||||
_install_nimble_dashboard
|
||||
_install_mogan_dashboard
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
function _install_nimble_dashboard {
|
||||
# add it when nimble dashboard is ready
|
||||
function _install_mogan_dashboard {
|
||||
# add it when mogan dashboard is ready
|
||||
:
|
||||
#git_clone ${NIMBLE_DASHBOARD_REPO} ${NIMBLE_DASHBOARD_DIR} ${NIMBLE_DASHBOARD_BRANCH}
|
||||
#setup_develop ${NIMBLE_DASHBOARD_DIR}
|
||||
# add it when nimble dashboard is ready
|
||||
#ln -fs ${NIMBLE_DASHBOARD_DIR}/_xx_nimble.py.example ${HORIZON_DIR}/openstack_dashboard/local/enabled/_xx_nimble.py
|
||||
#git_clone ${MOGAN_DASHBOARD_REPO} ${MOGAN_DASHBOARD_DIR} ${MOGAN_DASHBOARD_BRANCH}
|
||||
#setup_develop ${MOGAN_DASHBOARD_DIR}
|
||||
# add it when mogan dashboard is ready
|
||||
#ln -fs ${MOGAN_DASHBOARD_DIR}/_xx_mogan.py.example ${HORIZON_DIR}/openstack_dashboard/local/enabled/_xx_mogan.py
|
||||
}
|
||||
|
||||
|
||||
function install_nimble_pythonclient {
|
||||
echo_summary "Installing python-nimbleclient"
|
||||
git_clone ${NIMBLE_PYTHONCLIENT_REPO} ${NIMBLE_PYTHONCLIENT_DIR} ${NIMBLE_PYTHONCLIENT_BRANCH}
|
||||
setup_develop ${NIMBLE_PYTHONCLIENT_DIR}
|
||||
function install_mogan_pythonclient {
|
||||
echo_summary "Installing python-moganclient"
|
||||
git_clone ${MOGAN_PYTHONCLIENT_REPO} ${MOGAN_PYTHONCLIENT_DIR} ${MOGAN_PYTHONCLIENT_BRANCH}
|
||||
setup_develop ${MOGAN_PYTHONCLIENT_DIR}
|
||||
}
|
||||
|
||||
|
||||
# start_nimble - Start running processes, including screen
|
||||
function start_nimble {
|
||||
if is_service_enabled nimble-api && is_service_enabled nimble-engine ; then
|
||||
echo_summary "Installing all nimble services in separate processes"
|
||||
run_process nimble-api "${NIMBLE_BIN_DIR}/nimble-api --config-file ${NIMBLE_CONF_DIR}/nimble.conf"
|
||||
if ! wait_for_service ${SERVICE_TIMEOUT} ${NIMBLE_SERVICE_PROTOCOL}://${NIMBLE_SERVICE_HOST}:${NIMBLE_SERVICE_PORT}; then
|
||||
die $LINENO "nimble-api did not start"
|
||||
# start_mogan - Start running processes, including screen
|
||||
function start_mogan {
|
||||
if is_service_enabled mogan-api && is_service_enabled mogan-engine ; then
|
||||
echo_summary "Installing all mogan services in separate processes"
|
||||
run_process mogan-api "${MOGAN_BIN_DIR}/mogan-api --config-file ${MOGAN_CONF_DIR}/mogan.conf"
|
||||
if ! wait_for_service ${SERVICE_TIMEOUT} ${MOGAN_SERVICE_PROTOCOL}://${MOGAN_SERVICE_HOST}:${MOGAN_SERVICE_PORT}; then
|
||||
die $LINENO "mogan-api did not start"
|
||||
fi
|
||||
run_process nimble-engine "${NIMBLE_BIN_DIR}/nimble-engine --config-file ${NIMBLE_CONF_DIR}/nimble.conf"
|
||||
run_process mogan-engine "${MOGAN_BIN_DIR}/mogan-engine --config-file ${MOGAN_CONF_DIR}/mogan.conf"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# stop_nimble - Stop running processes
|
||||
function stop_nimble {
|
||||
# Kill the Nimble screen windows
|
||||
for serv in nimble-api nimble-engine; do
|
||||
# stop_mogan - Stop running processes
|
||||
function stop_mogan {
|
||||
# Kill the Mogan screen windows
|
||||
for serv in mogan-api mogan-engine; do
|
||||
stop_process $serv
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
function cleanup_nimble {
|
||||
function cleanup_mogan {
|
||||
if is_service_enabled horizon; then
|
||||
_nimble_cleanup_nimble_dashboard
|
||||
_mogan_cleanup_mogan_dashboard
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
function _nimble_cleanup_nimble_dashboard {
|
||||
rm -f ${HORIZON_DIR}/openstack_dashboard/local/enabled/_xx_nimble.py
|
||||
function _mogan_cleanup_mogan_dashboard {
|
||||
rm -f ${HORIZON_DIR}/openstack_dashboard/local/enabled/_xx_mogan.py
|
||||
}
|
||||
|
||||
|
||||
function create_instance_type {
|
||||
openstack baremetal flavor create ${NIMBLE_DEFAULT_INSTANCE_TYPE} --description 'Nimble default instance type'
|
||||
openstack baremetal flavor create ${MOGAN_DEFAULT_INSTANCE_TYPE} --description 'Mogan 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}
|
||||
openstack baremetal node set --property instance_type=${MOGAN_DEFAULT_INSTANCE_TYPE} ${node}
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
if is_service_enabled nimble; then
|
||||
if is_service_enabled mogan; then
|
||||
if [[ "$1" == "stack" && "$2" == "install" ]]; then
|
||||
echo_summary "Installing nimble"
|
||||
install_nimble
|
||||
install_nimble_pythonclient
|
||||
echo_summary "Installing mogan"
|
||||
install_mogan
|
||||
install_mogan_pythonclient
|
||||
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
|
||||
echo_summary "Configuring nimble"
|
||||
configure_nimble
|
||||
create_nimble_accounts
|
||||
echo_summary "Configuring mogan"
|
||||
configure_mogan
|
||||
create_mogan_accounts
|
||||
elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
|
||||
echo_summary "Initializing nimble"
|
||||
init_nimble
|
||||
start_nimble
|
||||
echo_summary "Initializing mogan"
|
||||
init_mogan
|
||||
start_mogan
|
||||
echo_summary "Creating instance type"
|
||||
create_instance_type
|
||||
echo_summary "Updating ironic node properties"
|
||||
@ -209,14 +209,14 @@ if is_service_enabled nimble; then
|
||||
fi
|
||||
|
||||
if [[ "$1" == "unstack" ]]; then
|
||||
echo_summary "Shutting down nimble"
|
||||
stop_nimble
|
||||
echo_summary "Shutting down mogan"
|
||||
stop_mogan
|
||||
fi
|
||||
|
||||
if [[ "$1" == "clean" ]]; then
|
||||
echo_summary "Cleaning nimble"
|
||||
#add it when nimble dashboard
|
||||
#cleanup_nimble
|
||||
echo_summary "Cleaning mogan"
|
||||
#add it when mogan dashboard
|
||||
#cleanup_mogan
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@ -1,30 +1,30 @@
|
||||
# Devstack settings
|
||||
|
||||
# We have to add Nimble to enabled services for run_process to work
|
||||
# We have to add Mogan to enabled services for run_process to work
|
||||
# Now we just support to run services in separate processes and screens:
|
||||
# enable_service nimble nimble-api nimble-engine
|
||||
enable_service nimble nimble-api nimble-engine
|
||||
# enable_service mogan mogan-api mogan-engine
|
||||
enable_service mogan mogan-api mogan-engine
|
||||
|
||||
# Set up default repos
|
||||
NIMBLE_REPO=${NIMBLE_REPO:-${GIT_BASE}/openstack/nimble.git}
|
||||
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}}
|
||||
MOGAN_REPO=${MOGAN_REPO:-${GIT_BASE}/openstack/nimble.git}
|
||||
MOGAN_BRANCH=${MOGAN_BRANCH:-master}
|
||||
#MOGAN_DASHBOARD_REPO=${MOGAN_DASHBOARD_REPO:-${GIT_BASE}/openstack/nimble-dashboard.git}
|
||||
#MOGAN_DASHBOARD_BRANCH=${MOGAN_DASHBOARD_BRANCH:-${MOGAN_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
|
||||
MOGAN_PYTHONCLIENT_REPO=${MOGAN_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-nimbleclient.git}
|
||||
MOGAN_PYTHONCLIENT_BRANCH=${MOGAN_PYTHONCLIENT_BRANCH:-master}
|
||||
MOGAN_PYTHONCLIENT_DIR=${DEST}/python-nimbleclient
|
||||
|
||||
# Set up default directories
|
||||
NIMBLE_DIR=$DEST/nimble
|
||||
NIMBLE_DASHBOARD_DIR=$DEST/nimble-dashboard
|
||||
NIMBLE_CONF_DIR=${NIMBLE_CONF_DIR:-/etc/nimble}
|
||||
NIMBLE_CONF_FILE=${NIMBLE_CONF_DIR}/nimble.conf
|
||||
NIMBLE_DEBUG=${NIMBLE_DEBUG:-True}
|
||||
MOGAN_DIR=$DEST/nimble
|
||||
MOGAN_DASHBOARD_DIR=$DEST/nimble-dashboard
|
||||
MOGAN_CONF_DIR=${MOGAN_CONF_DIR:-/etc/mogan}
|
||||
MOGAN_CONF_FILE=${MOGAN_CONF_DIR}/mogan.conf
|
||||
MOGAN_DEBUG=${MOGAN_DEBUG:-True}
|
||||
|
||||
NIMBLE_SERVICE_HOST=${NIMBLE_SERVICE_HOST:-$SERVICE_HOST}
|
||||
NIMBLE_SERVICE_PORT=${NIMBLE_SERVICE_PORT:-6688}
|
||||
NIMBLE_SERVICE_PROTOCOL=${NIMBLE_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
|
||||
MOGAN_SERVICE_HOST=${MOGAN_SERVICE_HOST:-$SERVICE_HOST}
|
||||
MOGAN_SERVICE_PORT=${MOGAN_SERVICE_PORT:-6688}
|
||||
MOGAN_SERVICE_PROTOCOL=${MOGAN_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
|
||||
|
||||
NIMBLE_ADMIN_USER=${NIMBLE_ADMIN_USER:-nimble}
|
||||
NIMBLE_DEFAULT_INSTANCE_TYPE=${NIMBLE_DEFAULT_INSTANCE_TYPE:-small}
|
||||
MOGAN_ADMIN_USER=${MOGAN_ADMIN_USER:-mogan}
|
||||
MOGAN_DEFAULT_INSTANCE_TYPE=${MOGAN_DEFAULT_INSTANCE_TYPE:-small}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
Developer Quick-Start
|
||||
=====================
|
||||
|
||||
This is a quick walkthrough to get you started developing code for Nimble.
|
||||
This is a quick walkthrough to get you started developing code for Mogan.
|
||||
This assumes you are already familiar with submitting code reviews to
|
||||
an OpenStack project.
|
||||
|
||||
@ -139,7 +139,7 @@ upgrade it individually, if you need to::
|
||||
Running Unit Tests Locally
|
||||
==========================
|
||||
|
||||
If you haven't already, Nimble source code should be pulled directly from git::
|
||||
If you haven't already, Mogan source code should be pulled directly from git::
|
||||
|
||||
# from your home or source directory
|
||||
cd ~
|
||||
@ -149,7 +149,7 @@ If you haven't already, Nimble source code should be pulled directly from git::
|
||||
Running Unit and Style Tests
|
||||
----------------------------
|
||||
|
||||
All unit tests should be run using tox. To run Nimble's entire test suite::
|
||||
All unit tests should be run using tox. To run Mogan's entire test suite::
|
||||
|
||||
# to run the py27, py34, py35 unit tests, and the style tests
|
||||
tox
|
||||
@ -211,14 +211,14 @@ the target name::
|
||||
tox -egenconfig
|
||||
|
||||
|
||||
Deploying Nimble with DevStack
|
||||
==============================
|
||||
Deploying Mogan with DevStack
|
||||
=============================
|
||||
|
||||
DevStack may be configured to deploy Nimble, It is easy to develop Nimble
|
||||
with the devstack environment. Nimble depends on Ironic, Neutron, and Glance
|
||||
DevStack may be configured to deploy Mogan, It is easy to develop Mogan
|
||||
with the devstack environment. Mogan depends on Ironic, Neutron, and Glance
|
||||
to create and schedule virtual machines to simulate bare metal servers.
|
||||
It is highly recommended to deploy on an expendable virtual machine and not
|
||||
on your personal work station. Deploying Nimble with DevStack requires a
|
||||
on your personal work station. Deploying Mogan with DevStack requires a
|
||||
machine running Ubuntu 14.04 (or later) or Fedora 20 (or later). Make sure
|
||||
your machine is fully up to date and has the latest packages installed before
|
||||
beginning this process.
|
||||
@ -239,14 +239,14 @@ Switch to the stack user and clone DevStack::
|
||||
sudo su - stack
|
||||
git clone https://git.openstack.org/openstack-dev/devstack.git devstack
|
||||
|
||||
Create devstack/local.conf with minimal settings required to enable Nimble
|
||||
Create devstack/local.conf with minimal settings required to enable Mogan
|
||||
|
||||
.. note::
|
||||
As Ironic tempest configuration depends on baremetal flavor, we have to
|
||||
temporarily disable tempest in the devstack config file to make it work
|
||||
with Ironic.
|
||||
It's ok to enable Horizon, Nova and Cinder services, they don't impact
|
||||
Nimble at all, disable them in the demo configuration to only deploy the
|
||||
Mogan at all, disable them in the demo configuration to only deploy the
|
||||
dependent services
|
||||
|
||||
::
|
||||
@ -266,8 +266,8 @@ Create devstack/local.conf with minimal settings required to enable Nimble
|
||||
# Enable Ironic plugin
|
||||
enable_plugin ironic git://git.openstack.org/openstack/ironic
|
||||
|
||||
# Enable Nimble plugin
|
||||
enable_plugin nimble git://git.openstack.org/openstack/nimble
|
||||
# Enable Mogan plugin
|
||||
enable_plugin mogan git://git.openstack.org/openstack/nimble
|
||||
|
||||
# Enable Neutron which is required by Ironic and disable nova-network.
|
||||
disable_service n-net
|
||||
@ -335,8 +335,8 @@ Create devstack/local.conf with minimal settings required to enable Nimble
|
||||
|
||||
GIT_BASE=https://git.openstack.org
|
||||
|
||||
# Enable Nimble plugin
|
||||
enable_plugin nimble https://git.openstack.org/openstack/nimble
|
||||
# Enable Mogan plugin
|
||||
enable_plugin mogan https://git.openstack.org/openstack/nimble
|
||||
|
||||
Run stack.sh::
|
||||
|
||||
@ -350,7 +350,7 @@ Source credentials, and spawn an instance as the ``demo`` user::
|
||||
image=$(openstack image show $DEFAULT_IMAGE_NAME -f value -c id)
|
||||
|
||||
# spawn instance
|
||||
As our nimbleclient is not ready now, will add this soon...
|
||||
As our moganclient is not ready now, will add this soon...
|
||||
|
||||
Building developer documentation
|
||||
================================
|
||||
@ -368,19 +368,19 @@ commands to build the documentation set:
|
||||
tox -edocs
|
||||
|
||||
#Now use your browser to open the top-level index.html located at:
|
||||
nimble/doc/build/html/index.html
|
||||
mogan/doc/build/html/index.html
|
||||
|
||||
|
||||
- On a remote machine::
|
||||
|
||||
# Go to the directory that contains the docs
|
||||
cd ~/nimble/doc/source/
|
||||
cd ~/mogan/doc/source/
|
||||
|
||||
# Build the docs
|
||||
tox -edocs
|
||||
|
||||
# Change directory to the newly built HTML files
|
||||
cd ~/nimble/doc/build/html/
|
||||
cd ~/mogan/doc/build/html/
|
||||
|
||||
# Create a server using python on port 8000
|
||||
python -m SimpleHTTPServer 8000
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
# all access will be forbidden
|
||||
"deny": "!"
|
||||
# Full read/write API access
|
||||
"is_admin": "rule:admin_api or (rule:is_member and role:nimble_admin)"
|
||||
"is_admin": "rule:admin_api or (rule:is_member and role:mogan_admin)"
|
||||
# Admin or owner API access
|
||||
"admin_or_owner": "is_admin:True or project_id:%(project_id)s"
|
||||
# Admin or user API access
|
||||
30
setup.cfg
30
setup.cfg
@ -1,6 +1,6 @@
|
||||
[metadata]
|
||||
name = nimble
|
||||
summary = Standalone Baremetal Service with Ironic
|
||||
name = mogan
|
||||
summary = Baremetal Compute Service
|
||||
description-file =
|
||||
README.rst
|
||||
author = OpenStack
|
||||
@ -22,7 +22,7 @@ classifier =
|
||||
|
||||
[files]
|
||||
packages =
|
||||
nimble
|
||||
mogan
|
||||
|
||||
[entry_points]
|
||||
mogan.engine.scheduler.filters =
|
||||
@ -32,21 +32,21 @@ mogan.engine.scheduler.filters =
|
||||
JsonFilter = mogan.engine.scheduler.filters.json_filter:JsonFilter
|
||||
|
||||
oslo.config.opts =
|
||||
nimble = mogan.conf.opts:list_opts
|
||||
mogan = mogan.conf.opts:list_opts
|
||||
|
||||
oslo.policy.policies =
|
||||
nimble.api = mogan.common.policy:list_policies
|
||||
mogan.api = mogan.common.policy:list_policies
|
||||
|
||||
console_scripts =
|
||||
nimble-api = mogan.cmd.api:main
|
||||
nimble-engine = mogan.cmd.engine:main
|
||||
nimble-dbsync = mogan.cmd.dbsync:main
|
||||
mogan-api = mogan.cmd.api:main
|
||||
mogan-engine = mogan.cmd.engine:main
|
||||
mogan-dbsync = mogan.cmd.dbsync:main
|
||||
|
||||
mogan.database.migration_backend =
|
||||
sqlalchemy = mogan.db.sqlalchemy.migration
|
||||
|
||||
tempest.test_plugins =
|
||||
nimble_tests = mogan.tests.tempest.plugin:MoganTempestPlugin
|
||||
mogan_tests = mogan.tests.tempest.plugin:MoganTempestPlugin
|
||||
|
||||
[build_sphinx]
|
||||
source-dir = doc/source
|
||||
@ -57,18 +57,18 @@ all_files = 1
|
||||
upload-dir = doc/build/html
|
||||
|
||||
[compile_catalog]
|
||||
directory = nimble/locale
|
||||
domain = nimble
|
||||
directory = mogan/locale
|
||||
domain = mogan
|
||||
|
||||
[update_catalog]
|
||||
domain = nimble
|
||||
output_dir = nimble/locale
|
||||
input_file = nimble/locale/nimble.pot
|
||||
domain = mogan
|
||||
output_dir = mogan/locale
|
||||
input_file = mogan/locale/mogan.pot
|
||||
|
||||
[extract_messages]
|
||||
keywords = _ gettext ngettext l_ lazy_gettext
|
||||
mapping_file = babel.cfg
|
||||
output_file = nimble/locale/nimble.pot
|
||||
output_file = mogan/locale/mogan.pot
|
||||
|
||||
[build_releasenotes]
|
||||
all_files = 1
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[DEFAULT]
|
||||
output_file = etc/nimble/nimble.conf.sample
|
||||
output_file = etc/mogan/mogan.conf.sample
|
||||
wrap_width = 62
|
||||
namespace = nimble
|
||||
namespace = mogan
|
||||
namespace = oslo.db
|
||||
namespace = oslo.messaging
|
||||
namespace = oslo.middleware.cors
|
||||
6
tox.ini
6
tox.ini
@ -41,7 +41,7 @@ commands = python setup.py test --coverage --testr-args='{posargs}'
|
||||
[testenv:docs]
|
||||
commands =
|
||||
python setup.py build_sphinx
|
||||
oslo-config-generator --config-file=tools/config/nimble-config-generator.conf
|
||||
oslo-config-generator --config-file=tools/config/mogan-config-generator.conf
|
||||
|
||||
[testenv:releasenotes]
|
||||
commands =
|
||||
@ -66,13 +66,13 @@ commands = oslo_debug_helper {posargs}
|
||||
sitepackages = False
|
||||
envdir = {toxworkdir}/venv
|
||||
commands =
|
||||
oslo-config-generator --config-file=tools/config/nimble-config-generator.conf
|
||||
oslo-config-generator --config-file=tools/config/mogan-config-generator.conf
|
||||
|
||||
[testenv:genpolicy]
|
||||
sitepackages = False
|
||||
envdir = {toxworkdir}/venv
|
||||
commands =
|
||||
oslopolicy-sample-generator --namespace=nimble.api --output-file=etc/nimble/policy.json.sample
|
||||
oslopolicy-sample-generator --namespace=mogan.api --output-file=etc/mogan/policy.json.sample
|
||||
|
||||
[testenv:api-ref]
|
||||
# This environment is called from CI scripts to test and publish
|
||||
|
||||
Loading…
Reference in New Issue
Block a user