Moved content shared with config guide to common directory.
Identified shared by the openstack-config guide and one or more other guides and moved to the 'common' directory. Impacted href and fileref values were also updated. Guides involved were: * openstack-compute-admin * openstack-install * openstack-config Change-Id: I5074a65e925ebdaed7a8dff95619287c97be7562
|
Before Width: | Height: | Size: 156 KiB After Width: | Height: | Size: 156 KiB |
|
Before Width: | Height: | Size: 139 KiB After Width: | Height: | Size: 139 KiB |
|
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 65 KiB |
|
Before Width: | Height: | Size: 74 KiB After Width: | Height: | Size: 74 KiB |
@@ -57,7 +57,7 @@
|
||||
installation.</para>
|
||||
|
||||
<programlisting>
|
||||
<xi:include parse="text" href="../openstack-install/samples/nova.conf"/>
|
||||
<xi:include parse="text" href="../common/samples/nova.conf"/>
|
||||
</programlisting>
|
||||
|
||||
<para>Create a <literal>nova</literal> group, so you can set permissions on the
|
||||
@@ -416,14 +416,14 @@ $ <userinput>sudo service nova-compute restart</userinput></screen>
|
||||
<para>This example <filename>nova.conf</filename> file is from an
|
||||
internal Rackspace test system used for demonstrations.</para>
|
||||
<programlisting>
|
||||
<xi:include parse="text" href="../openstack-install/samples/nova.conf"/>
|
||||
<xi:include parse="text" href="../common/samples/nova.conf"/>
|
||||
</programlisting>
|
||||
<figure xml:id="Nova_conf_KVM_Flat">
|
||||
<title>KVM, Flat, MySQL, and Glance, OpenStack or EC2 API</title>
|
||||
|
||||
<mediaobject>
|
||||
<imageobject>
|
||||
<imagedata fileref="figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.png"
|
||||
<imagedata fileref="../common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.png"
|
||||
contentwidth="6in"/>
|
||||
</imageobject>
|
||||
</mediaobject>
|
||||
@@ -466,7 +466,7 @@ xenapi_remap_vbd_dev=true
|
||||
|
||||
<mediaobject>
|
||||
<imageobject>
|
||||
<imagedata fileref="figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.png"
|
||||
<imagedata fileref="../common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.png"
|
||||
scale="60"/>
|
||||
</imageobject>
|
||||
</mediaobject>
|
||||
|
||||
@@ -64,7 +64,7 @@ ram_weight_multiplier=1.0
|
||||
<mediaobject>
|
||||
<imageobject>
|
||||
<imagedata
|
||||
fileref="figures/filteringWorkflow1.png "
|
||||
fileref="../common/figures/filteringWorkflow1.png "
|
||||
scale="80"/>
|
||||
</imageobject>
|
||||
</mediaobject>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
in <filename>cinder.conf</filename> when you install manually. </para>
|
||||
<para>Here is a simple example <filename>cinder.conf</filename> file.</para>
|
||||
<programlisting>
|
||||
<xi:include parse="text" href="../openstack-install/samples/cinder.conf"/>
|
||||
<xi:include parse="text" href="../common/samples/cinder.conf"/>
|
||||
</programlisting>
|
||||
</section>
|
||||
</chapter>
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
installation.</para>
|
||||
|
||||
<programlisting>
|
||||
<xi:include parse="text" href="../openstack-install/samples/nova.conf"/>
|
||||
<xi:include parse="text" href="../common/samples/nova.conf"/>
|
||||
</programlisting>
|
||||
|
||||
<para>Create a <literal>nova</literal> group, so you can set permissions on the
|
||||
@@ -426,14 +426,14 @@ $ <userinput>sudo service nova-compute restart</userinput></screen>
|
||||
<para>This example <filename>nova.conf</filename> file is from an
|
||||
internal Rackspace test system used for demonstrations.</para>
|
||||
<programlisting>
|
||||
<xi:include parse="text" href="../openstack-install/samples/nova.conf"/>
|
||||
<xi:include parse="text" href="../common/samples/nova.conf"/>
|
||||
</programlisting>
|
||||
<figure xml:id="Nova_conf_KVM_Flat">
|
||||
<title>KVM, Flat, MySQL, and Glance, OpenStack or EC2 API</title>
|
||||
|
||||
<mediaobject>
|
||||
<imageobject>
|
||||
<imagedata fileref="../openstack-compute-admin/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.png"
|
||||
<imagedata fileref="../common/figures/SCH_5004_V00_NUAC-Network_mode_KVM_Flat_OpenStack.png"
|
||||
contentwidth="6in"/>
|
||||
</imageobject>
|
||||
</mediaobject>
|
||||
@@ -476,7 +476,7 @@ xenapi_remap_vbd_dev=true
|
||||
|
||||
<mediaobject>
|
||||
<imageobject>
|
||||
<imagedata fileref="../openstack-compute-admin/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.png"
|
||||
<imagedata fileref="../common/figures/SCH_5005_V00_NUAC-Network_mode_XEN_Flat_OpenStack.png"
|
||||
scale="60"/>
|
||||
</imageobject>
|
||||
</mediaobject>
|
||||
|
||||
@@ -73,7 +73,7 @@ compute_fill_first_cost_fn_weight=-1.0
|
||||
<mediaobject>
|
||||
<imageobject>
|
||||
<imagedata
|
||||
fileref="../openstack-compute-admin/figures/filteringWorkflow1.png "
|
||||
fileref="../common/figures/filteringWorkflow1.png "
|
||||
scale="80"/>
|
||||
</imageobject>
|
||||
</mediaobject>
|
||||
@@ -503,7 +503,7 @@ ram_allocation_ratio=1.5
|
||||
<mediaobject>
|
||||
<imageobject>
|
||||
<imagedata
|
||||
fileref="../openstack-compute-admin/figures/filteringWorkflow2.png "
|
||||
fileref="../common/figures/filteringWorkflow2.png "
|
||||
scale="80"/>
|
||||
</imageobject>
|
||||
</mediaobject>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<filename>keystone.conf</filename> when you install manually. </para>
|
||||
<para>Here is a simple example
|
||||
<filename>keystone.conf</filename> file.</para>
|
||||
<programlisting><xi:include parse="text" href="../openstack-install/samples/keystone.conf"/></programlisting>
|
||||
<programlisting><xi:include parse="text" href="../common/samples/keystone.conf"/></programlisting>
|
||||
</section>
|
||||
<xi:include href="../common/identity-configure.xml"/>
|
||||
<xi:include href="../common/keystone-sample-conf-files.xml"/>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
with the one created that was created during the
|
||||
installation. </para>
|
||||
|
||||
<literallayout class="monospaced"><xi:include parse="text" href="samples/keystone.conf"/></literallayout>
|
||||
<literallayout class="monospaced"><xi:include parse="text" href="../common/samples/keystone.conf"/></literallayout>
|
||||
</section>
|
||||
<section xml:id="keystone-paste-file">
|
||||
<title>keystone-paste.ini</title>
|
||||
@@ -101,8 +101,8 @@
|
||||
</listitem>
|
||||
</itemizedlist></para>
|
||||
|
||||
<literallayout os="ubuntu" class="monospaced"><xi:include parse="text" href="samples/nova.conf"/></literallayout>
|
||||
<literallayout os="rhel;centos;fedora" class="monospaced"><xi:include parse="text" href="samples/nova.conf-yum"/></literallayout>
|
||||
<literallayout os="ubuntu" class="monospaced"><xi:include parse="text" href="../common/samples/nova.conf"/></literallayout>
|
||||
<literallayout os="rhel;centos;fedora" class="monospaced"><xi:include parse="text" href="../common/samples/nova.conf-yum"/></literallayout>
|
||||
</section>
|
||||
<section xml:id="api-paste-ini-file">
|
||||
<title>api-paste.ini</title>
|
||||
@@ -126,7 +126,7 @@
|
||||
</section>
|
||||
<section xml:id="cinder-conf">
|
||||
<title>cinder.conf</title>
|
||||
<literallayout><xi:include parse="text" href="samples/cinder.conf"/></literallayout>
|
||||
<literallayout><xi:include parse="text" href="../common/samples/cinder.conf"/></literallayout>
|
||||
</section>
|
||||
<section xml:id="local-settings-py-file">
|
||||
<title>Dashboard configuration</title>
|
||||
|
||||
@@ -67,9 +67,9 @@ flat_interface=eth0
|
||||
flat_network_bridge=br100</programlisting>
|
||||
<para>Here is an example <filename>nova.conf</filename> with commented sections:</para>
|
||||
<para>
|
||||
<programlisting os="ubuntu"><xi:include parse="text" href="samples/nova.conf"/>
|
||||
<programlisting os="ubuntu"><xi:include parse="text" href="../common/samples/nova.conf"/>
|
||||
</programlisting>
|
||||
<programlisting os="rhel;centos;fedora"><xi:include parse="text" href="samples/nova.conf-yum"/>
|
||||
<programlisting os="rhel;centos;fedora"><xi:include parse="text" href="../common/samples/nova.conf-yum"/>
|
||||
</programlisting>
|
||||
</para>
|
||||
<para>
|
||||
|
||||