diff --git a/source/integration_and_development/infrastructure_drivers_development/devel-auth.rst b/source/integration_and_development/infrastructure_drivers_development/devel-auth.rst index c7bc51b78..fd9ffd9ab 100644 --- a/source/integration_and_development/infrastructure_drivers_development/devel-auth.rst +++ b/source/integration_and_development/infrastructure_drivers_development/devel-auth.rst @@ -31,7 +31,7 @@ Where: - ``PASSWORD``: value of the password field for the user that is trying to authenticate. This can be ``-`` when the user does not exist in the OpenNebula database. - ``SECRET``: value provided in the password field of the authentication string. -.. warning:: Before the OpenNebula 5.6, the parameters were passed as command line parameters. Now all the data are passed only on standard input only! +.. warning:: Before OpenNebula 5.6, the parameters were passed as command line parameters. Now all the data is passed using only the standard input! For example, we can create a new authentication method that just checks the length of the password. For this we can store in the password field the number of characters accepted, for example 5, and user name test. Here are some example calls to the driver with several passwords: diff --git a/source/integration_and_development/infrastructure_drivers_development/devel-nm.rst b/source/integration_and_development/infrastructure_drivers_development/devel-nm.rst index 32f82906c..fc7df5677 100644 --- a/source/integration_and_development/infrastructure_drivers_development/devel-nm.rst +++ b/source/integration_and_development/infrastructure_drivers_development/devel-nm.rst @@ -36,15 +36,10 @@ Virtual Machine actions and their relation with Network actions: - **Attach Nic**: ``pre`` and ``post`` - **Detach Nic**: ``clean`` -After that you need to define the bridging technology used by the driver at ``/etc/one/oned.conf``. OpenNebula support three different technologies, **Linux Bridge**, **Open vSwitch** and **vCenter Port Groups**. See the examples below: +After that you need to define the bridging technology used by the driver at ``/etc/one/oned.conf``. OpenNebula support two different technologies, **Linux Bridge** and **Open vSwitch**. See the examples below: .. code-block:: bash - VN_MAD_CONF = [ - NAME = "vcenter" - BRIDGE_TYPE = "vcenter_port_groups" - ] - VN_MAD_CONF = [ NAME = "ovswitch_vxlan" BRIDGE_TYPE = "openvswitch" diff --git a/source/integration_and_development/infrastructure_drivers_development/index.rst b/source/integration_and_development/infrastructure_drivers_development/index.rst index a9fd2d76c..6518dd21e 100644 --- a/source/integration_and_development/infrastructure_drivers_development/index.rst +++ b/source/integration_and_development/infrastructure_drivers_development/index.rst @@ -13,5 +13,3 @@ Infrastructure Integration Authentication Driver Market Driver IPAM Driver - vCenter Driver - NSX Driver diff --git a/source/legacy_components/vcenter_driver/index.rst b/source/legacy_components/vcenter_driver/index.rst index 739b28998..38bdeaf88 100644 --- a/source/legacy_components/vcenter_driver/index.rst +++ b/source/legacy_components/vcenter_driver/index.rst @@ -8,8 +8,11 @@ VMware Integration :maxdepth: 1 vCenter Driver + vCenter Infrastructure Driver vCenter Node Installation + vCenter Virtual Machines vCenter Datastores vCenter Networking NSX Setup + NSX Driver NSX Networks diff --git a/source/integration_and_development/infrastructure_drivers_development/nsx_driver.rst b/source/legacy_components/vcenter_driver/nsx_driver.rst similarity index 100% rename from source/integration_and_development/infrastructure_drivers_development/nsx_driver.rst rename to source/legacy_components/vcenter_driver/nsx_driver.rst diff --git a/source/integration_and_development/infrastructure_drivers_development/vcenter_driver.rst b/source/legacy_components/vcenter_driver/vcenter_infra_driver.rst similarity index 100% rename from source/integration_and_development/infrastructure_drivers_development/vcenter_driver.rst rename to source/legacy_components/vcenter_driver/vcenter_infra_driver.rst diff --git a/source/management_and_operations/vm_management/vcenter_vms.rst b/source/legacy_components/vcenter_driver/vcenter_vms.rst similarity index 100% rename from source/management_and_operations/vm_management/vcenter_vms.rst rename to source/legacy_components/vcenter_driver/vcenter_vms.rst diff --git a/source/management_and_operations/vm_management/index.rst b/source/management_and_operations/vm_management/index.rst index 3afd665be..810e86cd3 100644 --- a/source/management_and_operations/vm_management/index.rst +++ b/source/management_and_operations/vm_management/index.rst @@ -8,4 +8,3 @@ Virtual Machine Management Overview Virtual Machine Templates Virtual Machine Instances - vCenter Virtual Machines