aboutsummaryrefslogtreecommitdiff
path: root/compose
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-20 23:06:10 -0700
committerSteven Dake <stdake@cisco.com>2015-08-21 02:10:31 -0700
commit6e3127d0432a25124b3068e03d6e05fac8a73e63 (patch)
tree72d82c52b43107b15e5fcdd4ebb01ed0c8843a81 /compose
parentbbcf22cc1298dd0ad4f0826c9e1186298c64569e (diff)
downloadkolla-6e3127d0432a25124b3068e03d6e05fac8a73e63.tar.gz
kolla-6e3127d0432a25124b3068e03d6e05fac8a73e63.zip
Run pandoc to convert the documentation
This converts all MD formatted docs that were renamed to RST to preserve git history into actual RST documentation. Some minor edits were made but in general the purpose of this patch is to *only* convert the documentation not rework the documentation. I do plan on reworking the documentation in further patch sets. All links were tested and a test rendering is available: http://github.com/sdake/kolla Change-Id: I3df430b14df1ede15407c7f4ba7afcbdc6f9d757
Diffstat (limited to 'compose')
-rw-r--r--compose/README.rst29
1 files changed, 4 insertions, 25 deletions
diff --git a/compose/README.rst b/compose/README.rst
index 6300ff5b9..f570b88fb 100644
--- a/compose/README.rst
+++ b/compose/README.rst
@@ -1,29 +1,8 @@
Docker compose
==============
-These scripts and docker compose files can be used to stand up a simple
-installation of openstack. Running the 'tools/genenv' script creates an
-'openstack.env' suitable for running on a single host system as well as an
-'openrc' to allow access to the installation.
+All compose support in Kolla has been completely removed as of liberty-3.
-Once you have run that you can either manually start the containers using the
-'docker-compose' command or try the 'tools/kolla-compose start' script which tries to
-start them all in a reasonable order, waiting at key points for services to
-become available. Once stood up you can issue the typical openstack commands
-to use the installation. If using nova networking use:
-
-```
-# source openrc
-# tools/init-runonce
-# nova boot --flavor m1.medium --key_name mykey --image puffy_clouds instance_name
-# ssh cirros@<ip>
-```
-
-Else if using neutron networking use:
-
-```
-# source openrc
-# tools/init-runonce
-# nova boot --flavor m1.medium --key_name mykey --image puffy_clouds instance_name --nic net-id:<net id>
-# ssh cirros@<ip>
-```
+The files in this directory are only for reference by the TripleO project.
+As they stand today, they likely don't work. There is a blueprint to port
+them to support the CONFIG_EXTERNAL config strategy.