From bae0639545be8c6f8d3c28b35d523fef86063383 Mon Sep 17 00:00:00 2001 From: Tetiana Lashchova Date: Fri, 1 Apr 2016 16:55:39 +0300 Subject: [PATCH] [Murano Docs] Install murano-agent by cloud-init Change-Id: Id62bdf151fab49e48c4962ccd01d56d55d279ae4 --- doc/source/draft/admin-guide/murano_agent.rst | 10 ++++++---- doc/source/image_builders/index.rst | 3 +++ doc/source/image_builders/upload.rst | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/source/draft/admin-guide/murano_agent.rst b/doc/source/draft/admin-guide/murano_agent.rst index 936639f9..52e3b18f 100644 --- a/doc/source/draft/admin-guide/murano_agent.rst +++ b/doc/source/draft/admin-guide/murano_agent.rst @@ -24,13 +24,15 @@ minimum units of the installation workflow. Murano-agent on a new VM ~~~~~~~~~~~~~~~~~~~~~~~~ -Currently, most of the application deployments are possible only on images with +Earlier most of the application deployments were possible only on images with pre-installed murano agent. You can refer to -`corresponding documentation `_ +:ref:`corresponding documentation ` on building an image with murano-agent. -To make deployment with murano easier, the murano team is working on the -murano-agent automatic installation with cloud-init. +Currently murano-agent can be automatically installed by cloud-init. To deploy +an application on an image with pre-installed cloud-init you should mark the +image with Murano specific metadata. More information about preparing images +can be found :ref:`here `. Interaction with murano-engine ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/source/image_builders/index.rst b/doc/source/image_builders/index.rst index 13c25a51..489676b3 100644 --- a/doc/source/image_builders/index.rst +++ b/doc/source/image_builders/index.rst @@ -12,6 +12,9 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +.. + +.. _building_images: ===================== Building Murano Image diff --git a/doc/source/image_builders/upload.rst b/doc/source/image_builders/upload.rst index 12d49aaf..bd0514d4 100644 --- a/doc/source/image_builders/upload.rst +++ b/doc/source/image_builders/upload.rst @@ -12,8 +12,9 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +.. - +.. _upload_images: ======================== Upload image into glance