openstack
/
magnum
Code Issues Proposed changes

Fix the localrc issue 

1.Since the local.conf need to live on devstack directory
Refine the cat command to be obvious

2.Also fix one issue, as devstack would use localrc directly
if localrc file exists, but localrc not have enable_plugin
setting. This would cause devstack install without magnum enable.
So we use local.conf as the default configuration kick point to
make magnum can be installed with devstack

Closes-Bug: #1441977
Change-Id: Ib06cd38ed9744d42e664ff92d486c29e7932851f
This commit is contained in:
Kennan 2015-04-09 09:31:39 +08:00
parent 00f3c2ab67
commit 5114844325
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/README.rst
View File

@ -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 you can copy it to /opt/stack/devstack/files/fedora-21-atomic.qcow2 to save you
this time. 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]] [[local|localrc]]
enable_plugin magnum https://github.com/openstack/magnum enable_plugin magnum https://github.com/openstack/magnum master
END
Run devstack as normal: :: Run devstack as normal: ::

3
devstack/settings
View File

@ -31,10 +31,9 @@ enable_service h-api-cfn
enable_service h-api-cw enable_service h-api-cw
# Enable Magnum services # Enable Magnum services
enable_service magnum
enable_service m-api enable_service m-api
enable_service m-cond enable_service m-cond
# Log all output to files # Log all output to files
LOGFILE=$HOME/devstack.log LOGFILE=$HOME/devstack.log
SCREEN_LOGDIR=$HOME/logs SCREEN_LOGDIR=$HOME/logs

18
doc/source/dev/dev-quickstart.rst
View File

@ -120,21 +120,25 @@ Clone DevStack::
sudo chown $USER /opt/stack sudo chown $USER /opt/stack
git clone https://github.com/openstack-dev/devstack.git /opt/stack/devstack 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 Copy devstack/localrc with minimal settings required to enable Heat
and Neutron, refer to http://docs.openstack.org/developer/devstack/guides/neutron.html and Neutron, refer to http://docs.openstack.org/developer/devstack/guides/neutron.html
for more detailed neutron configuration. 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 cat > /opt/stack/devstack/local.conf << END
To install magnum into devstack, Add this repo as an external repository: ::
> cat local.conf
[[local|localrc]] [[local|localrc]]
enable_plugin magnum https://github.com/openstack/magnum 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:: Run DevStack::