aboutsummaryrefslogtreecommitdiff
path: root/compose
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-21 19:47:25 +0000
committerGerrit Code Review <review@openstack.org>2015-08-21 19:47:25 +0000
commit576bdb0b76bb4555d748f479f34aa1c6da3b1a32 (patch)
treec2fc9708a23ee39469e740d40782e686413dea22 /compose
parenta804be0f731c726e49ba0c42ad951957cc5ad1dc (diff)
parent6e3127d0432a25124b3068e03d6e05fac8a73e63 (diff)
downloadkolla-576bdb0b76bb4555d748f479f34aa1c6da3b1a32.tar.gz
kolla-576bdb0b76bb4555d748f479f34aa1c6da3b1a32.zip
Merge "Run pandoc to convert the documentation"
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.