stackforge-attic/murano-docs
Code Issues Proposed changes

Merge "Update image registration info" into release-0.2

Browse Source
This commit is contained in:
Jenkins
2013-08-22 12:11:00 +00:00
committed by Gerrit Code Review
parent ae1d57ffc1 5d95893719
commit 487f153c19
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/murano-deployment-guide/src/docbkx/murano-deployment-guide.xml
View File

@@ -1051,7 +1051,7 @@
Replace IMAGE_METADATA with the following property: Replace IMAGE_METADATA with the following property:
<emphasis>murano_image_info="{'title': 'Windows 2012 Core edition', 'id': NAME }"</emphasis>, <emphasis>murano_image_info="{'title': 'Windows 2012 Core edition', 'id': NAME }"</emphasis>,
where <emphasis>title </emphasis>- full image description for user and where <emphasis>title </emphasis>- full image description for user and
<emphasis>id</emphasis> is an image name. <emphasis>id</emphasis> is one of an image service names: ws-2012-std, ws-2012-core, ws-2008r2-std, ws-2008r2
<warning> <warning>
<para>Setting <emphasis>murano_image_info</emphasis> property is <para>Setting <emphasis>murano_image_info</emphasis> property is
required to pick up image from Murano Dashboard.</para> required to pick up image from Murano Dashboard.</para>
@@ -1072,7 +1072,7 @@
<listitem> <listitem>
<para> <para>
Replace IMAGE_METADATA with murano_image_info property, e.g.<emphasis> Replace IMAGE_METADATA with murano_image_info property, e.g.<emphasis>
murano_image_info="{'title': 'Windows 2012 Core edition','id': 'win2k12core'}"</emphasis>, murano_image_info='{"title": "Windows 2012 Core edition","id": "ws-2012-std"}'</emphasis>,
</para> </para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>

20
src/murano-manual/src/docbkx/content/installation-guide.xml
View File

@@ -215,17 +215,9 @@ ca_file = /path/to/cafile
</programlisting> </programlisting>
<para> For more information how to configure SSL take a look at <link linkend="ssl"> SSL configuration chapter </link></para> <para> For more information how to configure SSL take a look at <link linkend="ssl"> SSL configuration chapter </link></para>
</listitem> </listitem>
<listitem>
<para>Edit one more configuration file:</para>
<programlisting>
<![CDATA[
vi murano-api.conf
]]>
</programlisting>
</listitem>
<listitem> <listitem>
<para>Configure keystone auth_token in <para>Configure keystone auth_token in
<emphasis>[filter:authtoken]</emphasis> <emphasis>[keystone_authtoken]</emphasis>
section. section.
For more information see For more information see
<link xlink:href="http://docs.openstack.org/developer/keystone/configuringservices.html"> <link xlink:href="http://docs.openstack.org/developer/keystone/configuringservices.html">
@@ -234,15 +226,7 @@ vi murano-api.conf
</para> </para>
<programlisting> <programlisting>
<![CDATA[ <![CDATA[
[pipeline:murano-api] [keystone_authtoken]
pipeline = authtoken context apiv1app
[app:apiv1app]
paste.app_factory = muranoapi.api.v1.router:API.factory
[filter:context]
paste.filter_factory = muranoapi.api.middleware.context:ContextMiddleware.factory
[filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
auth_host = localhost auth_host = localhost
auth_port = 35357 auth_port = 35357
auth_protocol = http auth_protocol = http