diff --git a/devstack/README.rst b/devstack/README.rst index 46f1d86715..32597551da 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -11,11 +11,12 @@ needs to download an atomic fedora 21 qcow image. If you already have this image you can copy it to /opt/stack/devstack/files/fedora-21-atomic.qcow2 to save you this time. -To install magnum into devstack, Add this repo as an external repository: :: +To install magnum into devstack, add the following settings to enable magnum plugin: :: - > cat local.conf + cat > /opt/stack/devstack/local.conf << END [[local|localrc]] - enable_plugin magnum https://github.com/openstack/magnum + enable_plugin magnum https://github.com/openstack/magnum master + END Run devstack as normal: :: diff --git a/devstack/settings b/devstack/settings index 6c90ae0301..6c2ffd897f 100644 --- a/devstack/settings +++ b/devstack/settings @@ -31,10 +31,9 @@ enable_service h-api-cfn enable_service h-api-cw # Enable Magnum services -enable_service magnum enable_service m-api enable_service m-cond # Log all output to files LOGFILE=$HOME/devstack.log -SCREEN_LOGDIR=$HOME/logs \ No newline at end of file +SCREEN_LOGDIR=$HOME/logs diff --git a/doc/source/dev/dev-quickstart.rst b/doc/source/dev/dev-quickstart.rst index 3e1c7fa4d2..e0924fc2d2 100644 --- a/doc/source/dev/dev-quickstart.rst +++ b/doc/source/dev/dev-quickstart.rst @@ -120,21 +120,25 @@ Clone DevStack:: sudo chown $USER /opt/stack git clone https://github.com/openstack-dev/devstack.git /opt/stack/devstack - git clone https://github.com/openstack/magnum /opt/stack/magnum Copy devstack/localrc with minimal settings required to enable Heat and Neutron, refer to http://docs.openstack.org/developer/devstack/guides/neutron.html for more detailed neutron configuration. -Be sure to update network and other config as appropriate for your setup.:: +To install magnum into devstack, add following settings to local.conf. You need to +make customized setting according to your environment requirement, refer devstack +guide for details.:: - cp /opt/stack/magnum/devstack/settings /opt/stack/devstack/localrc - -To install magnum into devstack, Add this repo as an external repository: :: - - > cat local.conf + cat > /opt/stack/devstack/local.conf << END [[local|localrc]] enable_plugin magnum https://github.com/openstack/magnum + DATABASE_PASSWORD=password + RABBIT_PASSWORD=password + SERVICE_TOKEN=password + SERVICE_PASSWORD=password + ADMIN_PASSWORD=password + PUBLIC_INTERFACE=eth1 + END Run DevStack::