Update dev-quickstart doc to match new devstack model
Magnum has been converted to new devstack plugin model, so we need to update the dev-quickstart doc. This patch also fix a content repeat issue in devstack plugin script. Change-Id: Ibcb93a7e83a5c7f3a3f3727b957b1c45beeed5ae Closes-Bug: #1441514
This commit is contained in:
parent
00377f6a4a
commit
41aa2c92ad
|
@ -12,8 +12,12 @@ if is_service_enabled m-api m-cond; then
|
||||||
if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then
|
if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then
|
||||||
echo_summary "Before Installing magnum"
|
echo_summary "Before Installing magnum"
|
||||||
mkdir -p $SCREEN_LOGDIR
|
mkdir -p $SCREEN_LOGDIR
|
||||||
echo "python-kubernetes>=0.2" >> ${REQUIREMENTS_DIR}/global-requirements.txt
|
if [[ -z `grep 'python-kubernetes' ${REQUIREMENTS_DIR}/global-requirements.txt` ]]; then
|
||||||
echo "docker-py>=0.5.1" >> ${REQUIREMENTS_DIR}/global-requirements.txt
|
echo "python-kubernetes>=0.2" >> ${REQUIREMENTS_DIR}/global-requirements.txt
|
||||||
|
fi
|
||||||
|
if [[ -z `grep 'docker-py' ${REQUIREMENTS_DIR}/global-requirements.txt` ]]; then
|
||||||
|
echo "docker-py>=0.5.1" >> ${REQUIREMENTS_DIR}/global-requirements.txt
|
||||||
|
fi
|
||||||
elif [[ "$1" == "stack" && "$2" == "install" ]]; then
|
elif [[ "$1" == "stack" && "$2" == "install" ]]; then
|
||||||
echo_summary "Installing magnum"
|
echo_summary "Installing magnum"
|
||||||
install_magnum
|
install_magnum
|
||||||
|
@ -55,4 +59,4 @@ if is_service_enabled m-api m-cond; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Restore xtrace
|
# Restore xtrace
|
||||||
$XTRACE
|
$XTRACE
|
||||||
|
|
|
@ -128,12 +128,13 @@ for more detailed neutron configuration.
|
||||||
|
|
||||||
Be sure to update network and other config as appropriate for your setup.::
|
Be sure to update network and other config as appropriate for your setup.::
|
||||||
|
|
||||||
cp /opt/stack/magnum/contrib/devstack/localrc.example /opt/stack/devstack/localrc
|
cp /opt/stack/magnum/devstack/settings /opt/stack/devstack/localrc
|
||||||
|
|
||||||
Prepare DevStack for Magnum::
|
To install magnum into devstack, Add this repo as an external repository: ::
|
||||||
|
|
||||||
cd /opt/stack/magnum
|
> cat local.conf
|
||||||
./contrib/devstack/prepare_devstack.sh
|
[[local|localrc]]
|
||||||
|
enable_plugin magnum https://github.com/openstack/magnum
|
||||||
|
|
||||||
Run DevStack::
|
Run DevStack::
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue