Adds information about dual hypervisor support

Since Fuel 6.1 provides dual hypervisor support
with availability zones, these changes should be
reflected in User Guide.

Change-Id: I97fea5aeb958119881b63646b4de4b25843330a9
Implements: blueprint vmware-dual-hypervisor
Closes-Bug: 1427679
Closes-Bug: 1426381

pages/terminology/a/availability-zone.rst

@@ -14,4 +14,7 @@ Users can specify an Availability Zone
 when launching an instance in Horizon;
 the :ref:`Nova scheduler <scheduler-term>` then uses the Availability Zone
 as a criteria when allocating an instance to a node.
+Since Fuel 6.1 supports KVM/QEMU with vCenter in
+one environment, different availability zones are used.
+For more information and instructions, see :ref:`Hypervisors<dualhypervisor>`.
 

pages/user-guide/7300-vcenter.rst

@@ -46,14 +46,16 @@ You can deploy Mirantis OpenStack with or without :ref:`ha-term`.
 Select vCenter Hypervisor for vCenter
 +++++++++++++++++++++++++++++++++++++
 
-Select the vCenter :ref:`hypervisor<hypervisor-ug>`
+Select the vCenter checkbox :ref:`hypervisor<hypervisor-ug>`
 when you create your OpenStack Environment.
-After that you need to fill corresponding fields.
-You can modify the vCenter specific values on the Settings tab after you
-create the environment.
-Note that you can specify either IP address or Hostname for vCenter.
+Note, due to dual hypervisor support, you can also
+click either KVM or QEMU radio buttons.
+See the :ref:`VMware tab<vmware-tab>` section for instructions
+on configuring your environment with vCenter or KVM/QEMU
+enabled.
 
-.. image:: /_images/user_screen_shots/vcenter-hv.png
+
+.. image:: /_images/user_screen_shots/select-two-hypervisors.png
    :width: 50%
 
 .. _vcenter-netv-service:
@@ -75,22 +77,22 @@ Currently, the only support network option for vCenter is nova-network.
 Choose Backend for Cinder and Glance with vCenter
 +++++++++++++++++++++++++++++++++++++++++++++++++
 
-Ceph cannot be used as a Cinder or Glance backend.
-Since Mirantis OpenStack 6.0 supports VMware
-vCenter managed datastore as a backend for Glance,
-select *VMWare vCenter/ESXi* option to enable it.
-Swift option is also available for Glance.
+Ceph cannot be used as backend for Cinder with vCenter,
+but it can be enabled as a backend for Glance.
+At this step you should select
+storage backend for Cinder that
+is going to be used with KVM/QEMU if you deploy compute nodes.
+If you would like to use Glance with VMware datastore,
+enable it on the *Settings* tab of the Fuel web UI
+and configure backend on the VMware tab.
 
-.. image:: /_images/user_screen_shots/vcenter-glance-backend.png
+.. image:: /_images/user_screen_shots/cinder-storage-backend.png
    :width: 50%
 
 After you create the environment, you must enable the VMDK
-driver for Cinder on the Settings tab.
+driver for Cinder on the *Settings* tab.
 
-.. image:: /_images/user_screen_shots/vcenter-glance-backend.png
-   :width: 50%
-
-- If you are using the deprecated Multi-node (no HA) mode,
+- If you are using the deprecated Multi-node (non-HA) mode,
   local storage is used as the backend for Glance.
 
 Related projects for vCenter
@@ -152,6 +154,7 @@ The already known *Storage - Cinder* role can be enabled for Cinder with LVM or
 
 .. _network-settings-vcenter-ug:
 
+
 Network settings
 ++++++++++++++++
 
@@ -165,24 +168,6 @@ virtual machine tenants into separate broadcast domains.
 .. image:: /_images/user_screen_shots/vcenter-network-manager.png
    :width: 50%
 
-- Check the vCenter credentials
-
-.. image:: /_images/user_screen_shots/settings-vcenter.png
-   :width: 50%
-
-.. note: The Fuel web UI now has a new option for vCenter:
-         you can fill in **Datastore regexp** field to indicate data stores to use with Compute. To learn more about
-         this setting, see `VMware vSphere <http://docs.openstack.org/juno/config-reference/content/vmware.html>`_ guide.
-
-For example, if you add *nas.*, all data stores that have a name starting
-with "nas" will be chosen.
-
-If you plan to use all available datastores, leave the field blank.
-In this case, Compute node will pick the first data store returned by the vSphere API.
-
-.. image:: /_images/vcenter-regexp.png
-   :width: 50%
-
 - Enable the 'Use VLAN tagging for fixed networks' checkbox
   and enter the VLAN tag you selected
   for the VLAN ID in the ESXi host network configuration
@@ -195,17 +180,15 @@ In this case, Compute node will pick the first data store returned by the vSpher
 .. image:: /_images/user_screen_shots/nova-vlan-check.png
    :width: 50%
 
-- Check the vCenter credentials
-
 - Specify Nova-network configuration
 
 .. image:: /_images/user_screen_shots/nova-net-vlan.png
    :width: 50%
 
+.. _settings-tab:
 
-
-Storage
-+++++++
+Settings
+++++++++
 
 To enable VMware vCenter for volumes,
 you must first uncheck the Cinder LVM over iSCSI option.
@@ -214,11 +197,113 @@ you must first uncheck the Cinder LVM over iSCSI option.
    :width: 80%
 
 To enable VMware vCenter managed datastore as a backend for Glance,
-check VMWare vCenter/ESXi datastore for images (Glance) option
-and specify the required settings.
+select *VMWare vCenter/ESXi datastore for images (Glance)* checkbox.
 
 .. image:: /_images/user_screen_shots/vcenter_glance_settings.png
    :width: 80%
 
+.. _vmware-tab:
+
+VMware tab
+----------
+
+Beginning with Fuel 6.1 release, all vCenter-related settings
+are consolidated on the VMware tab of the Fuel web UI.
+
+vCenter
++++++++
+
+In this section, you should enter not only vCenter credentials
+(previously found on the Fuel UI wizard and *Settings* of the Fuel web UI
+tab), but
+also specify Availability zone:
+
+* For KVM/QEMU nova-compute services, availability zone is *nova*.
+  You cannot edit its name, because it is the default availability zone used by OpenStack.
+
+* For vCenter nova-compute services, the availability zone name is set to *vcenter*
+  by default, but it can be changed.
+
+.. image:: /_images/user_screen_shots/vmware-tab-vcenter.png
+  :width: 40%
+
+
+Nova-Computes
++++++++++++++
+
+Beginning with Fuel 6.1,
+each nova-compute service controls
+a single vSphere cluster.
+For each vSphere cluster,
+you need to configure separate nova-compute service that will be running on the Controller node.
+
+The following options are available:
+
+#. for vCenter only environment, do not add any compute nodes.
+
+#. for dual hypervisors support (KVM or QEMU with vCenter),
+   you should do the following:
+   after selecting vCenter checkbox in the Fuel UI wizard, specify vCenter settings (host or IP),
+   username, password and which clusters you want to use.
+
+   * The cluster name is used to specify the cluster you would like
+     to use for OpenStack.
+
+   * Service name is the name that will be used to reference to your cluster in OpenStack.
+     Usually, you can copy cluster name from the field above,
+     but if the cluster name contains non-ASCII characters,
+     you must provide valid service name for it
+     (string that contains numbers, letters (a-z) and
+     underscore).
+
+   * Datastore regexp is used
+     to indicate data stores to use with Compute.
+     For example, if you add *nas.*, all data stores that have a name starting
+     with "nas" will be chosen.
+     If you plan to use all available datastores, leave the field blank.
+     In this case, nova-compute service will pick the first data store returned by the vSphere API.
+     To learn more about
+     this setting, see
+     `VMware vSphere <http://docs.openstack.org/juno/config-reference/content/vmware.html>`_ guide.
+
+.. image:: /_images/user_screen_shots/vmware-tab-nova.png
+   :width: 40%
+
+Press +, add nova-compute services and fill in
+the information for one more Instance.
+
+.. image:: /_images/user_screen_shots/vmware-tab-nova-two.png
+   :width: 40%
+
+Cinder
+++++++
+
+Select *Enable Cinder* checkbox to provide Cinder support for vCenter.
+
+.. image:: /_images/user_screen_shots/vmware-tab-cinder.png
+   :width: 20%
+
+
+Network
++++++++
+
+If you decided to use VLAN Manager,
+enter the interface on which VLANs will be provisioned.
+
+.. image:: /_images/user_screen_shots/vmware-tab-vlan.png
+   :width: 40%
+
+
+Glance
+++++++
+
+To enable Glance, you should first select the checkbox on the *Settings* tab
+(see :ref:`VMware vCenter/ESXi datastore for images (Glance) <settings-tab>`).
+Then, you should enter the information for Glance.
+
+.. image:: /_images/user_screen_shots/vmware-tab-glance.png
+   :width: 50%
+
+
 For more information about how vCenter support is implemented,
 see :ref:`vcenter-arch`.

pages/user-guide/config-environment/5000-settings.rst

@@ -43,7 +43,6 @@ you can click on the "Load Defaults" button at the bottom of the screen.
 
 .. include:: /pages/user-guide/config-environment/settings/1000-access-horizon.rst
 .. include:: /pages/user-guide/config-environment/settings/1500-modify-services.rst
-.. include:: /pages/user-guide/config-environment/settings/2000-vcenter-config.rst
 .. include:: /pages/user-guide/config-environment/settings/2500-common-settings.rst
 .. include:: /pages/user-guide/config-environment/settings/3250-debug-set.rst
 .. include:: /pages/user-guide/config-environment/settings/3300-scheduler.rst

pages/user-guide/config-environment/settings/2000-vcenter-config.rst

@@ -1,17 +0,0 @@
-
-.. raw:: pdf
-
-   PageBreak
-
-.. _vcenter-config-ug:
-
-vCenter
-+++++++
-
-If you selected vCenter as your :ref:`hypervisor<hypervisor-ug>`,
-you must fill in this section
-to configure communication with vCenter:
-
-.. image:: /_images/user_screen_shots/settings-vcenter.png
-   :width: 50%
-

pages/user-guide/create-environment/2500-hypervisor.rst

@@ -10,7 +10,7 @@ Hypervisor
 ----------
 
 
-.. image:: /_images/user_screen_shots/choose-hypervisor-ug.png
+.. image:: /_images/user_screen_shots/select-two-hypervisors.png
    :width: 50%
 
 Choose one of the following:
@@ -21,6 +21,19 @@ Choose one of the following:
 
 - :ref:`vcenter-term` -- Choose this option if you have a vCenter environment
   with ESXi servers to be used as hypervisors.
-  You must also :ref:`configure communication<vcenter-config-ug>`
-  with vCenter.
+
+.. _dualhypervisor:
+
+.. note:: Beginning with Fuel 6.1 release, you can select two
+          hypervisors (vCenter+QEMU or vCenter+KVM) to enable
+          dual hypervisor support in one environment. To do that,
+          you should choose between KVM and QEMU and click
+          the corresponding radiobutton.
+          After that, you only have to select the vCenter checkbox.
+          If you would like to have vCenter hypervisor only,
+          then you should select vCenter checkbox, enter the settings
+          and avoid adding compute nodes. For instructions, see
+          :ref:`VMware tab<vmware-tab>` section.
+
+
 

pages/user-guide/create-environment/3500-cinder-glance-backend.rst

@@ -21,10 +21,6 @@ Select the storage backend for :ref:`cinder-term`:
 - If you select "Ceph",
   you must assign at least two nodes as Ceph-OSD nodes
   on the :ref:`assign-roles-ug` screen.
-- If you are using :ref:`vCenter<vcenter-term>` as the hypervisor,
-  "VMWare vCenter/ESXi" is pre-selected,
-  meaning that you will use :ref:`VMDK<vmdk-term>`
-  to store your volumes in the vCenter datastore.
 
 Select the storage backend for :ref:`glance-term`:
 
@@ -36,10 +32,7 @@ Select the storage backend for :ref:`glance-term`:
 - If you select Ceph,
   you must assign the Ceph-OSD role on at least two nodes
   on the :ref:`assign-roles-ug` screen.
-- If you are using :ref:`vCenter<vcenter-term>` as the hypervisor,
-  "VMWare vCenter/ESXi" is pre-selected,
-  meaning that you will use :ref:`VMDK<vmdk-term>`
-  to store your images in the vCenter datastore.
+
 
 You can later change these settings
 on the :ref:`settings-storage-ug` screen,