diff --git a/doc/TestPlanforXenServerFuelPluginver2.0.0.pdf b/doc/TestPlanforXenServerFuelPluginver2.0.0.pdf deleted file mode 100644 index ed2da14..0000000 Binary files a/doc/TestPlanforXenServerFuelPluginver2.0.0.pdf and /dev/null differ diff --git a/doc/TestPlanforXenServerFuelPluginver3.0.0.pdf b/doc/TestPlanforXenServerFuelPluginver3.0.0.pdf new file mode 100644 index 0000000..2d279d8 Binary files /dev/null and b/doc/TestPlanforXenServerFuelPluginver3.0.0.pdf differ diff --git a/doc/TestReportfortheXenServerFuelPluginver2.0.0.pdf b/doc/TestReportfortheXenServerFuelPluginver2.0.0.pdf deleted file mode 100644 index 7347e93..0000000 Binary files a/doc/TestReportfortheXenServerFuelPluginver2.0.0.pdf and /dev/null differ diff --git a/doc/TestReportfortheXenServerFuelPluginver3.0.0.pdf b/doc/TestReportfortheXenServerFuelPluginver3.0.0.pdf new file mode 100644 index 0000000..7181f82 Binary files /dev/null and b/doc/TestReportfortheXenServerFuelPluginver3.0.0.pdf differ diff --git a/doc/build/latex/fuel-plugin-xenserver.pdf b/doc/build/latex/fuel-plugin-xenserver.pdf index ecca62c..abf5a19 100644 Binary files a/doc/build/latex/fuel-plugin-xenserver.pdf and b/doc/build/latex/fuel-plugin-xenserver.pdf differ diff --git a/doc/source/_static/fmsetting00.png b/doc/source/_static/fmsetting00.png index 33a7170..6ec46e2 100644 Binary files a/doc/source/_static/fmsetting00.png and b/doc/source/_static/fmsetting00.png differ diff --git a/doc/source/_static/fmwizard00.png b/doc/source/_static/fmwizard00.png index 655772c..f2eaf8e 100644 Binary files a/doc/source/_static/fmwizard00.png and b/doc/source/_static/fmwizard00.png differ diff --git a/doc/source/_static/topology00.png b/doc/source/_static/topology00.png index 9216989..deccc83 100644 Binary files a/doc/source/_static/topology00.png and b/doc/source/_static/topology00.png differ diff --git a/doc/source/conf.py b/doc/source/conf.py index f61201b..0de450f 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -55,9 +55,9 @@ author = u'John Hua (john.hua@citrix.com)' # built documents. # # The short X.Y version. -version = '2.0' +version = '3.0' # The full version, including alpha/beta/rc tags. -release = '2.0-2.0.0-1' +release = '3.0-3.0.0-1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/source/description.rst b/doc/source/description.rst index ddc0519..da464a9 100644 --- a/doc/source/description.rst +++ b/doc/source/description.rst @@ -1,4 +1,4 @@ -XenServer Plugin for Fuel 7.0 +XenServer Plugin for Fuel 8.0 ============================= Requirements @@ -7,9 +7,9 @@ Requirements ========================= ============================ Requirement Version/Comment ========================= ============================ -Fuel 7.0 + Maintenance Update 1 +Fuel 8.0 XenServer 6.5 SP1 + Hotfix XS65ESP1013 -XenServer plugin for Fuel 2.0.0 +XenServer plugin for Fuel 3.0.0 ========================= ============================ * This plugin will not install XenServer or configure the Virtual @@ -24,15 +24,12 @@ XenServer plugin for Fuel 2.0.0 configured to PXE boot from the PXE network used by Fuel. * XenCenter is expected to be used to configure VMs, and is required by the HIMN tool in the installation steps -* Network 'br100' must exist on the XenServer hypervisors. This - network will be added automatically to Virtual Machines and the - compute nodes must have access to this network. Limitations ----------- * The plugin is **only** compatible with OpenStack environments deployed with - **Nova Network** as network configuration in the environment configuration - options. The plugin will disable incompatible options when the XenServer - Release is selected. + **Neutron with VLAN segmentation** as network configuration in the + environment configuration options. The plugin will disable incompatible + options when the XenServer Release is selected. diff --git a/doc/source/guide.rst b/doc/source/guide.rst index 020762d..a5c84c1 100644 --- a/doc/source/guide.rst +++ b/doc/source/guide.rst @@ -22,15 +22,15 @@ Prepare infrastructure 3. While many networking setups are expected to work, the following setup is known to work: - - Physical machines with two ethernet devices: + - Physical machines with three ethernet devices: - - eth0 / “Access network”: Used to access the XenServer hosts and Fuel Master during setup. - - eth1 / “VLAN network”: Carries all traffic during setup + use of OpenStack. Untagged packets are tagged at the switch to ensure isolation from eth0. + - eth0 / “Access network”: Used to access the XenServer hosts and the Fuel Master’s web interface + - eth1 / “Control network”: OpenStack control plane (management and storage), the PXE network, private network and the public network; all separated by VLAN tags. The public network is also on this network, and if a VLAN is required this is applied by the switch for untagged traffic. + - eth2 / “Private”: This version of the plugin only supports VLAN segmentation for Neutron networking. This device carries all of the VLANs to be used by Neutron for VM traffic. - - Two virtual networks + - One virtual network - - VLAN 'A' on eth1 / “PXE network”: Used for node bootstrapping. - - VLAN 'B' on eth1 / "br100": Used to give connectivity between VM and router. + - VLAN 'pxe' on eth1 / “PXE network”: Used for node bootstrapping. 4. To simplify the setup, the fuel master can also be installed on the XenServer hosts (so XenServer hosts can fully control the network setup), but this is not required. One example deployment, shown below, makes use of VLAN 19 for the "PXE network" and provides an isolated network for eth1 by tagging any untagged traffic at the switch with VLAN 237 @@ -42,7 +42,7 @@ One example deployment, shown below, makes use of VLAN 19 for the "PXE network" Select Environment ------------------ -#. Create a new environment with the Fuel UI wizard. Select "Kilo+Citrix XenServer on Ubuntu 14.04" from OpenStack Release dropdown list. At the moment you will see most of options are disabled in the wizard. +#. Create a new environment with the Fuel UI wizard. Select "Liberty+Citrix XenServer on Ubuntu 14.04" from OpenStack Release dropdown list. At the moment you will see most of options are disabled in the wizard. .. image:: _static/fmwizard00.png :width: 80% @@ -58,7 +58,7 @@ Select Environment .. image:: _static/HIMN_dialog.jpg :width: 80% -#. Add new VMs to the new environment according to `Fuel User Guide `_ and configure them properly. A typical topology of 1 controller node + 3 compute nodes + 1 storage node is recommended. +#. Add new VMs to the new environment according to `Fuel User Guide `_ and configure them properly. A typical topology of 3 controller node2 + 3 compute nodes + 1 storage node is recommended. #. Go to Settings tab and scroll down to "XenServer Plugin" section. You need to input the common access credentials to all XenServers that previously are used to create new VMs. @@ -71,9 +71,9 @@ Select Environment Finish environment configuration -------------------------------- -#. Run `network verification check `_ +#. Run `network verification check `_ -#. Press `Deploy button `_ to once you are done with environment configuration. +#. Press `Deploy button `_ to once you are done with environment configuration. #. After deployment is done, you will see in Horizon that all hypervisors are xen. diff --git a/doc/source/index.rst b/doc/source/index.rst index be50143..791bc70 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,4 +1,4 @@ -Guide to the XenServer Plugin for Fuel 7.0 +Guide to the XenServer Plugin for Fuel 8.0 ========================================== Intro diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 7abe782..83db8e4 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -11,14 +11,14 @@ To install the XenServer Fuel plugin: #. Copy the *rpm* file to the Fuel Master node: :: - [root@home ~]# scp fuel-plugin-xenserver-2.0-2.0.0-1.noarch.rpm root@fuel-master:/tmp + [root@home ~]# scp fuel-plugin-xenserver-3.0-3.0.0-1.noarch.rpm root@fuel-master:/tmp #. Log into Fuel Master node and install the plugin using the - `Fuel CLI `_: + `Fuel CLI `_: :: - [root@fuel-master ~]# fuel plugins --install /tmp/fuel-plugin-xenserver-2.0-2.0.0-1.noarch.rpm + [root@fuel-master ~]# fuel plugins --install /tmp/fuel-plugin-xenserver-3.0-3.0.0-1.noarch.rpm #. Verify that the plugin is installed correctly: :: @@ -26,7 +26,7 @@ To install the XenServer Fuel plugin: [root@fuel-master ~]# fuel plugins id | name | version | package_version ---|-----------------------|---------|---------------- - 9 | fuel-plugin-xenserver | 2.0.0 | 3.0.0 + 9 | fuel-plugin-xenserver | 3.0.0 | 3.0.0 Add Management Network tool --------------------------- diff --git a/specs/fuel-plugin-xenserver.rst b/specs/fuel-plugin-xenserver.rst index 61fff34..1d5cd64 100644 --- a/specs/fuel-plugin-xenserver.rst +++ b/specs/fuel-plugin-xenserver.rst @@ -6,7 +6,7 @@ Fuel Plugin for Xenserver The XenServer plugin provides the ability to use Xenserver as the hypervisor for Mirantis OpenStack. -Compatible with Fuel version 7.0. +Compatible with Fuel version 8.0. Problem description =================== @@ -44,7 +44,7 @@ None. Upgrade impact -------------- -When upgrading the Fuel Master node to Fuel Version higher than 7.0, +When upgrading the Fuel Master node to Fuel Version higher than 8.0, plugin compatibility should be checked, and a new plugin installed if necessary. @@ -119,15 +119,17 @@ Assignee(s) ----------- Primary assignee: - John Hua (developer) + Huan Xie (developer) Other contributors: Bob Ball (developer, reviewer) + Jianghua Wang (developer) + John Hua (developer) Work Items ---------- -* Upgrade the XenServer Fuel 6.1 plugin to work with Fuel 7.0. +* Upgrade the XenServer Fuel 7.0 plugin to work with Fuel 8.0. * Test XenServer plugin. @@ -136,7 +138,7 @@ Work Items Dependencies ============ -* Fuel 7.0 +* Fuel 8.0 Testing =======