Merge "Adding new file and XIncludes"

This commit is contained in:
Jenkins 2014-08-26 00:31:50 +00:00 committed by Gerrit Code Review
commit 19ea9d2710
3 changed files with 33 additions and 5 deletions

View File

@ -58,6 +58,10 @@
</itemizedlist>
<xi:include href="section_deployment-architecture.xml"/>
<xi:include href="section_deployment-authentication.xml"/>
<!--<xi:include href="section_plugins-ml2.xml"/>
section above is being created by Summer Long currently, will include when
saved and pushed up. AS -->
<xi:include href="section_deployment-scenarios.xml"/>
</chapter>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE section [
<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
%openstack;
]>
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xlink="http://www.w3.org/1999/xlink"
version="5.0"
xml:id="deployment-authentication">
<title>Authentication</title>
<para>
Bacon ipsum dolor sit amet biltong meatloaf andouille, turducken
bresaola pork belly beef ribs ham hock capicola tail prosciutto
landjaeger meatball pork loin. Swine turkey jowl, porchetta doner
boudin meatloaf. Shoulder capicola prosciutto, shank landjaeger short
ribs sirloin turducken pork belly boudin frankfurter chuck. Salami
shankle bresaola cow filet mignon ham hock shank.
</para>
<!-- For future reference, please note that the Red Hat Cloud Administrator Guide
was the book in mind when creating this section. Link here:
https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux_OpenStack_Platform/5/html-single/Cloud_Administrator_Guide/index.html#section_networking_auth
AS -->
</section>

View File

@ -10,13 +10,13 @@
xml:id="plugins-ml2">
<title>ML2</title>
<section xml:id="overview">
<section xml:id="plugins-ml2-overview">
<title>Overview</title>
<para>architecture</para>
<para>configuration file organization, relationships, etc</para>
</section>
<section xml:id="networktypedrivers">
<section xml:id="plugins-ml2-networktypedrivers">
<title>Network type drivers</title>
<variablelist>
<varlistentry>
@ -46,7 +46,7 @@
</variablelist>
</section>
<section xml:id="tenantnetworktypes">
<section xml:id="plugins-ml2-tenantnetworktypes">
<title>Tenant network types</title>
<itemizedlist>
<listitem><para>Local</para></listitem>
@ -58,7 +58,7 @@
<para>See admin-guide-cloud/networking/section_networking_arch.xml</para>
</section>
<section xml:id="mechanisms">
<section xml:id="plugins-ml2-mechanisms">
<title>Mechanisms</title>
<variablelist>
<varlistentry>
@ -94,7 +94,7 @@
</variablelist>
</section>
<section xml:id="security">
<section xml:id="plugins-ml2-security">
<title>Security</title>
<variablelist>
<varlistentry>