You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2013/10/08 21:27:57 UTC
[53/70] moving nicira docs to their own directory
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-provider.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-provider.xml b/nicira/en-US/plugin-niciranvp-provider.xml
new file mode 100644
index 0000000..8694478
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-provider.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section id="Enabling-the-service-provider">
+ <title>Enabling the service provider</title>
+ <para>The Nicira NVP provider is disabled by default. Navigate to the "Network Service Providers" configuration of the physical network with the STT isolation type. Navigate to the Nicira NVP provider and press the "Enable Provider" button.</para>
+ <note><para>CloudStack 4.0 does not have the UI interface to configure the Nicira NVP plugin. Configuration needs to be done using the API directly.</para></note>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="./images/nvp-enable-provider.png" />
+ </imageobject>
+ <textobject>
+ <phrase>nvp-physical-network-stt.png: a screenshot of an enabled Nicira NVP provider</phrase>
+ </textobject>
+ </mediaobject>
+
+</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-revisions.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-revisions.xml b/nicira/en-US/plugin-niciranvp-revisions.xml
new file mode 100644
index 0000000..b58d333
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-revisions.xml
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+]>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<appendix id="appe-cloudstack-Revision_History">
+ <title>Revision History</title>
+ <simpara>
+ <revhistory>
+ <revision>
+ <revnumber>0-0</revnumber>
+ <date>Wed Oct 03 2012</date>
+ <author>
+ <firstname>Hugo</firstname>
+ <surname>Trippaers</surname>
+ <email>hugo@apache.org</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Documentation created for 4.0.0-incubating version of the NVP Plugin</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>1-0</revnumber>
+ <date>Wed May 22 2013</date>
+ <author>
+ <firstname>Hugo</firstname>
+ <surname>Trippaers</surname>
+ <email>hugo@apache.org</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Documentation updated for &PRODUCT; 4.1.0</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ </revhistory>
+ </simpara>
+</appendix>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-tables.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-tables.xml b/nicira/en-US/plugin-niciranvp-tables.xml
new file mode 100644
index 0000000..615f349
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-tables.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section id="Database-tables">
+ <title>Database tables</title>
+ <para>The following tables are added to the cloud database for the Nicira NVP Plugin</para>
+ <table>
+ <title>nicira_nvp_nic_map</title>
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>id</entry>
+ <entry>auto incrementing id</entry>
+ </row>
+ <row>
+ <entry>logicalswitch</entry>
+ <entry>uuid of the logical switch this port is connected to</entry>
+ </row>
+ <row>
+ <entry>logicalswitchport</entry>
+ <entry>uuid of the logical switch port for this nic</entry>
+ </row>
+ <row>
+ <entry>nic</entry>
+ <entry>the &PRODUCT; uuid for this nic, reference to the nics table</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>external_nicira_nvp_devices</title>
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>id</entry>
+ <entry>auto incrementing id</entry>
+ </row>
+ <row>
+ <entry>uuid</entry>
+ <entry>UUID identifying this device</entry>
+ </row>
+ <row>
+ <entry>physical_network_id</entry>
+ <entry>the physical network this device is configured on</entry>
+ </row>
+ <row>
+ <entry>provider_name</entry>
+ <entry>NiciraNVP</entry>
+ </row>
+ <row>
+ <entry>device_name</entry>
+ <entry>display name for this device</entry>
+ </row>
+ <row>
+ <entry>host_id</entry>
+ <entry>reference to the host table with the device configuration</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>nicira_nvp_router_map</title>
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>id</entry>
+ <entry>auto incrementing id</entry>
+ </row>
+ <row>
+ <entry>logicalrouter_uuid</entry>
+ <entry>uuid of the logical router</entry>
+ </row>
+ <row>
+ <entry>network_id</entry>
+ <entry>id of the network this router is linked to</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <note>
+ <para>nicira_nvp_router_map is only available in &PRODUCT; 4.1 and above</para>
+ </note>
+
+</section>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-troubleshooting.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-troubleshooting.xml b/nicira/en-US/plugin-niciranvp-troubleshooting.xml
new file mode 100644
index 0000000..02b0655
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-troubleshooting.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<chapter id="Troubleshooting-the-Nicira-NVP-Plugin" >
+ <title>Troubleshooting the Nicira NVP Plugin</title>
+
+ <xi:include href="plugin-niciranvp-uuidreferences.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="plugin-niciranvp-tables.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+</chapter>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-ui.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-ui.xml b/nicira/en-US/plugin-niciranvp-ui.xml
new file mode 100644
index 0000000..8b1bbad
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-ui.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section id="plugin-niciranvp-ui">
+ <title>Configuring the Nicira NVP plugin from the UI</title>
+ <para>In CloudStack 4.1.0-incubating the Nicira NVP plugin and its resources can be configured in the infrastructure tab of the UI. Navigate to the physical network with STT isolation and configure the network elements. The NiciraNvp is listed here. <!-- TODO add screenshot --></para>
+</section>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-usage.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-usage.xml b/nicira/en-US/plugin-niciranvp-usage.xml
new file mode 100644
index 0000000..9f04c38
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-usage.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<chapter id="Using-the-Nicira-NVP-Plugin" >
+ <title>Configuring the Nicira NVP Plugin</title>
+
+ <xi:include href="plugin-niciranvp-preparations.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="plugin-niciranvp-physicalnet.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="plugin-niciranvp-provider.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="plugin-niciranvp-devicemanagement.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="plugin-niciranvp-networkofferings.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</chapter>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-uuidreferences.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-uuidreferences.xml b/nicira/en-US/plugin-niciranvp-uuidreferences.xml
new file mode 100644
index 0000000..cb5f1ca
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-uuidreferences.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section id="UUID-references">
+ <title>UUID References</title>
+ <para>The plugin maintains several references in the &PRODUCT; database to items created on the NVP Controller.</para>
+ <para>Every guest network that is created will have its broadcast type set to Lswitch and if the network is in state "Implemented", the broadcast URI will have the UUID of the Logical Switch that was created for this network on the NVP Controller.</para>
+ <para>The Nics that are connected to one of the Logical Switches will have their Logical Switch Port UUID listed in the nicira_nvp_nic_map table</para>
+ <note><para>All devices created on the NVP Controller will have a tag set to domain-account of the owner of the network, this string can be used to search for items in the NVP Controller.</para></note>
+
+</section>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-vpc.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-vpc.xml b/nicira/en-US/plugin-niciranvp-vpc.xml
new file mode 100644
index 0000000..a43c5fa
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-vpc.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<chapter id="Using-the-Nicira-NVP-Plugin-With_VPC" >
+ <title>Using the Nicira NVP plugin with VPC</title>
+
+ <xi:include href="plugin-niciranvp-vpcfeatures.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="plugin-niciranvp-vpcoffering.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+ <xi:include href="plugin-niciranvp-vpcnetworkoffering.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include>
+
+</chapter>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-vpcfeatures.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-vpcfeatures.xml b/nicira/en-US/plugin-niciranvp-vpcfeatures.xml
new file mode 100644
index 0000000..a8d8194
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-vpcfeatures.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section id="vpc-features">
+ <title>Supported VPC features</title>
+ <para>The Nicira NVP plugin supports &PRODUCT; VPC to a certain extent. Starting with &PRODUCT; version 4.1 VPCs can be deployed using NVP isolated networks.</para>
+ <para>It is not possible to use a Nicira NVP Logical Router for as a VPC Router</para>
+ <para>It is not possible to connect a private gateway using a Nicira NVP Logical Switch</para>
+</section>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-vpcnetworkoffering.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-vpcnetworkoffering.xml b/nicira/en-US/plugin-niciranvp-vpcnetworkoffering.xml
new file mode 100644
index 0000000..141006e
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-vpcnetworkoffering.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section id="nvp-vpc-network-offering">
+ <title>VPC Network Offerings</title>
+ <para>The VPC needs specific network offerings with the VPC flag enabled. Otherwise these network offerings are identical to regular network offerings. To allow VPC networks with a Nicira NVP isolated network the offerings need to support the Virtual Networking service with the NiciraNVP provider.</para>
+ <para>In a typical configuration two network offerings need to be created. One with the loadbalancing service enabled and one without loadbalancing.</para>
+ <table>
+ <title>VPC Network Offering with Loadbalancing</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Service</entry>
+ <entry>Provider</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>VPN</entry>
+ <entry>VpcVirtualRouter</entry>
+ </row>
+ <row>
+ <entry>DHCP</entry>
+ <entry>VpcVirtualRouter</entry>
+ </row>
+ <row>
+ <entry>DNS</entry>
+ <entry>VpcVirtualRouter</entry>
+ </row>
+ <row>
+ <entry>Load Balancer</entry>
+ <entry>VpcVirtualRouter</entry>
+ </row>
+ <row>
+ <entry>User Data</entry>
+ <entry>VpcVirtualRouter</entry>
+ </row>
+ <row>
+ <entry>Source NAT</entry>
+ <entry>VpcVirtualRouter</entry>
+ </row>
+ <row>
+ <entry>Static NAT</entry>
+ <entry>VpcVirtualRouter</entry>
+ </row>
+ <row>
+ <entry>Post Forwarding</entry>
+ <entry>VpcVirtualRouter</entry>
+ </row>
+ <row>
+ <entry>NetworkACL</entry>
+ <entry>VpcVirtualRouter</entry>
+ </row>
+ <row>
+ <entry>Virtual Networking</entry>
+ <entry>NiciraNVP</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+</section>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/en-US/plugin-niciranvp-vpcoffering.xml
----------------------------------------------------------------------
diff --git a/nicira/en-US/plugin-niciranvp-vpcoffering.xml b/nicira/en-US/plugin-niciranvp-vpcoffering.xml
new file mode 100644
index 0000000..292621e
--- /dev/null
+++ b/nicira/en-US/plugin-niciranvp-vpcoffering.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "cloudstack.ent">
+%BOOK_ENTITIES;
+<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod">
+%xinclude;
+]>
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<section id="nvp-vpc-offering">
+ <title>VPC Offering with Nicira NVP</title>
+ <para>To allow a VPC to use the Nicira NVP plugin to provision networks, a new VPC offering needs to be created which allows the Virtual Networking service to be implemented by NiciraNVP.</para>
+ <para>This is not currently possible with the UI. The API does provide the proper calls to create a VPC offering with Virtual Networking enabled. However due to a limitation in the 4.1 API it is not possible to select the provider for this network service. To configure the VPC offering with the NiciraNVP provider edit the database table 'vpc_offering_service_map' and change the provider to NiciraNvp for the service 'Connectivity'</para>
+ <para>It is also possible to update the default VPC offering by adding a row to the
+ 'vpc_offering_service_map' with service 'Connectivity' and provider 'NiciraNvp'</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="./images/nvp-vpc-offering-edit.png" />
+ </imageobject>
+ <textobject>
+ <phrase>nvp-physical-network-stt.png: a screenshot of the mysql table.</phrase>
+ </textobject>
+ </mediaobject>
+ <note><para>When creating a new VPC offering please note that the UI does not allow you to select a VPC offering yet. The VPC needs to be created using the API with the offering UUID.</para></note>
+</section>
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/nicira/publican.cfg
----------------------------------------------------------------------
diff --git a/nicira/publican.cfg b/nicira/publican.cfg
new file mode 100644
index 0000000..2e3696d
--- /dev/null
+++ b/nicira/publican.cfg
@@ -0,0 +1,28 @@
+# Publican configuration file for CloudStack Complete Documentation Set
+# Contains all technical docs except release notes
+# Config::Simple 4.58
+# Tue May 29 00:57:27 2012
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information#
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+xml_lang: en-US
+type: Book
+docname: CloudStack_Nicira_NVP_Guide
+brand: cloudstack
+chunk_first: 1
+chunk_section_depth: 1
+condition: install
http://git-wip-us.apache.org/repos/asf/cloudstack-docs/blob/0808f4ba/publican-plugin-niciranvp.cfg
----------------------------------------------------------------------
diff --git a/publican-plugin-niciranvp.cfg b/publican-plugin-niciranvp.cfg
deleted file mode 100644
index 2e3696d..0000000
--- a/publican-plugin-niciranvp.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-# Publican configuration file for CloudStack Complete Documentation Set
-# Contains all technical docs except release notes
-# Config::Simple 4.58
-# Tue May 29 00:57:27 2012
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information#
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-xml_lang: en-US
-type: Book
-docname: CloudStack_Nicira_NVP_Guide
-brand: cloudstack
-chunk_first: 1
-chunk_section_depth: 1
-condition: install