From c3b4b18f890f977a95be09e23b54187f9bdef6ff Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Tue, 7 Feb 2012 15:40:29 -0800 Subject: [PATCH] Some small re-arrangements + help message update. --- README.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e6fb1bb9..609d4764 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,9 @@ This will typically produce: -h, --help show this help message and exit -c COMPONENT, --component=COMPONENT openstack component: [db, glance, horizon, keystone, - keystone-client, nova, nova-client, novnc, quantum, - quantum-client, rabbit, swift, swift_keystone] + keystone-client, melange, melange-client, nova, nova- + client, novnc, quantum, quantum-client, rabbit, swift, + swift-keystone] Install/uninstall/start/stop options: -a ACTION, --action=ACTION @@ -48,11 +49,10 @@ This will typically produce: Uninstall/stop options: -f, --force force ACTION even if no trace file found (default: True) - # Stack prerequisites -* linux (tested on ubuntu 11.10 and rhel 6.2 (TBD)) +* linux (tested on ubuntu 11.10 and rhel 6.2) * python 2.6 or 2.7 (not tested with python 3.0) For ubuntu 11.10: @@ -71,7 +71,6 @@ For rhel 6.2: $ git clone git://github.com/yahoo/Openstack-DevstackPy.git DevstackPy $ cd DevstackPy - # Actions *Stack* can do the following: @@ -83,6 +82,10 @@ For rhel 6.2: Typically the interaction would be that you install a set of components and then start them. +# Simple setup + +https://github.com/yahoo/Openstack-DevstackPy/wiki/Simple-Setup + # Config For those of you that are brave enough to change *stack* here are some starting points. @@ -91,7 +94,6 @@ For those of you that are brave enough to change *stack* here are some starting Check out *conf/stack.ini* for various configuration settings applied (branches, git repositories...). Check out the header of that file for how the customized configuration values are parsed and what they may result in. - ### conf/ Check out *conf/* for various component specific settings and files. @@ -118,10 +120,6 @@ Note that these files are in a modified json format which allows for simple comm 1. Get and install the above prerequisites. 1. *git clone git://github.com/yahoo/Openstack-DevstackPy.git* -## Simple setup - -https://github.com/yahoo/Openstack-DevstackPy/wiki/Simple-Setup - # Customizing You can override environment variables used in *stack* by editing *stack.ini* or by sourcing a file that contains your environment overrides before your run *stack*.