From 5bc0ca9b0712e324ee5051cbb6a59df24d57d49b Mon Sep 17 00:00:00 2001 From: Kirill Zaitsev Date: Tue, 20 Oct 2015 18:11:49 +0300 Subject: [PATCH] [doc] Improve devstack plugin installation docs Improve layout, add links to devstack, mention cfapi service. Replace github references with git.openstack.org references. Also removes unnecessary enable_service instructions in cfapi docs, to be consistent with plugin documentation Change-Id: I0235db31fe8dd80ada1a627a9d02e61d1236488f Related-Bug: #1506232 --- devstack/README.rst | 21 +++++++++++++++---- ...configure_cloud_foundry_service_broker.rst | 4 ++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/devstack/README.rst b/devstack/README.rst index 6587fcedb..88a606dce 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -2,12 +2,25 @@ Enabling in Devstack ==================== -1. Download DevStack +#. Download DevStack_:: -2. Add this repo as an external repository and enable needed services:: + git clone https://git.openstack.org/openstack-dev/devstack + cd devstack + +#. Edit local.conf to enable murano devstack plugin:: > cat local.conf [[local|localrc]] - enable_plugin murano https://github.com/openstack/murano + enable_plugin murano git://git.openstack.org/openstack/murano -3. run ``stack.sh`` +#. If you want Murano Cloud Foundry Broker API service enabled, add the + following line to local.conf:: + + enable_service murano-cfapi + +#. Install DevStack:: + + ./stack.sh + + +.. _DevStack: http://docs.openstack.org/developer/devstack/ diff --git a/doc/source/draft/admin-guide/configure_cloud_foundry_service_broker.rst b/doc/source/draft/admin-guide/configure_cloud_foundry_service_broker.rst index 7687f82b1..6d1c530bd 100644 --- a/doc/source/draft/admin-guide/configure_cloud_foundry_service_broker.rst +++ b/doc/source/draft/admin-guide/configure_cloud_foundry_service_broker.rst @@ -59,8 +59,8 @@ You need simply update your :file:`local.conf` with the following: .. code-block:: ini [[local|localrc]] - enable_plugin murano https://github.com/openstack/murano - enable_service murano murano-api murano-engine murano-cfapi + enable_plugin murano git://git.openstack.org/openstack/murano + enable_service murano-cfapi How to use service broker -------------------------