From 6a85e1e4d7b008fb74376c3c0c89f08fd37cfbbc Mon Sep 17 00:00:00 2001 From: Eduardo Gonzalez Date: Wed, 23 Aug 2017 12:09:42 +0200 Subject: [PATCH] Fix Line to long in VMware doc Fix many warnings in vmware docs for D001 Line too long. Change-Id: I695f7fb958ec12161a13cf51f0297f50d9177d73 --- doc/vmware-guide.rst | 54 +++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/doc/vmware-guide.rst b/doc/vmware-guide.rst index 88e0ca65cb..1b4ab108b8 100644 --- a/doc/vmware-guide.rst +++ b/doc/vmware-guide.rst @@ -26,17 +26,19 @@ Kolla can deploy the Glance and Cinder services using VMware datastore as their backend. Ceilometer metering for vSphere is also supported. Because the `vmware-nsx `__ drivers for -neutron use completely different architecture than other types of virtualization, -vmware-nsx drivers cannot coexist with other type of virtualization in one region. -In neutron vmware-nsx drivers, neutron-server acts like an agent to translate -OpenStack actions into what vSphere/NSX Manager API can understand. -Neutron does not directly takes control of the Open vSwitch inside the VMware +neutron use completely different architecture than other types of +virtualization, vmware-nsx drivers cannot coexist with other type +of virtualization in one region. In neutron vmware-nsx drivers, +neutron-server acts like an agent to translate OpenStack actions +into what vSphere/NSX Manager API can understand. Neutron does +not directly takes control of the Open vSwitch inside the VMware environment but through the API exposed by vSphere/NSX Manager. For VMware DVS, the Neutron DHCP agent does not attaches to Open vSwitch inside -VMware environment, but attach to the Open vSwitch bridge called ``br-dvs`` on the -OpenStack side and replies to/receives DHCP packets through VLAN. Similar to what the DHCP -agent does, Neutron metadata agent attaches to ``br-dvs`` bridge and works through VLAN. +VMware environment, but attach to the Open vSwitch bridge called ``br-dvs`` on +the OpenStack side and replies to/receives DHCP packets through VLAN. Similar +to what the DHCP agent does, Neutron metadata agent attaches to ``br-dvs`` +bridge and works through VLAN. .. note:: @@ -49,7 +51,8 @@ VMware NSX-V Preparation ----------- -You should have a working NSX-V environment, this part is out of scope of Kolla. +You should have a working NSX-V environment, this part is out of scope +of Kolla. For more information, please see `VMware NSX-V documentation `__. .. note:: @@ -120,7 +123,8 @@ Enable VMware nova-compute plugin and NSX-V neutron-server plugin in * enable_neutron_lbaas: "yes" * enable_neutron_fwaas: "yes" -If you want to set VMware datastore as cinder backend, enable it in ``/etc/kolla/globals.yml``: +If you want to set VMware datastore as cinder backend, enable it in +``/etc/kolla/globals.yml``: .. code-block:: console @@ -128,7 +132,8 @@ If you want to set VMware datastore as cinder backend, enable it in ``/etc/kolla cinder_backend_vmwarevc_vmdk: "yes" vmware_datastore_name: "TestDatastore" -If you want to set VMware datastore as glance backend, enable it in ``/etc/kolla/globals.yml``: +If you want to set VMware datastore as glance backend, enable it in +``/etc/kolla/globals.yml``: .. code-block:: console @@ -136,8 +141,8 @@ If you want to set VMware datastore as glance backend, enable it in ``/etc/kolla vmware_vcenter_name: "TestDatacenter" vmware_datastore_name: "TestDatastore" -VMware options are required in ``/etc/kolla/globals.yml``, these options should be -configured correctly according to your NSX-V environment. +VMware options are required in ``/etc/kolla/globals.yml``, these options should +be configured correctly according to your NSX-V environment. Options for nova-compute and ceilometer: @@ -187,23 +192,25 @@ VMware NSX-DVS Preparation ----------- -Before deployment, you should have a working VMware vSphere environment. Create a -cluster and a vSphere Distributed Switch with all the host in the cluster attached -to it. +Before deployment, you should have a working VMware vSphere environment. +Create a cluster and a vSphere Distributed Switch with all the host in the +cluster attached to it. For more information, please see `Setting Up Networking with vSphere Distributed Switches `__. Deployment ---------- -Enable VMware nova-compute plugin and NSX-V neutron-server plugin in ``/etc/kolla/globals.yml``: +Enable VMware nova-compute plugin and NSX-V neutron-server plugin in +``/etc/kolla/globals.yml``: .. code-block:: console nova_compute_virt_type: "vmware" neutron_plugin_agent: "vmware_dvs" -If you want to set VMware datastore as Cinder backend, enable it in ``/etc/kolla/globals.yml``: +If you want to set VMware datastore as Cinder backend, enable it in +``/etc/kolla/globals.yml``: .. code-block:: console @@ -211,7 +218,8 @@ If you want to set VMware datastore as Cinder backend, enable it in ``/etc/kolla cinder_backend_vmwarevc_vmdk: "yes" vmware_datastore_name: "TestDatastore" -If you want to set VMware datastore as Glance backend, enable it in ``/etc/kolla/globals.yml``: +If you want to set VMware datastore as Glance backend, enable it in +``/etc/kolla/globals.yml``: .. code-block:: console @@ -219,10 +227,10 @@ If you want to set VMware datastore as Glance backend, enable it in ``/etc/kolla vmware_vcenter_name: "TestDatacenter" vmware_datastore_name: "TestDatastore" -VMware options are required in ``/etc/kolla/globals.yml``, these options should be -configured correctly according to the vSphere environment you installed before. -All option for nova, cinder, glance are the same as VMware-NSX, except the following -options. +VMware options are required in ``/etc/kolla/globals.yml``, these options should +be configured correctly according to the vSphere environment you installed +before. All option for nova, cinder, glance are the same as VMware-NSX, except +the following options. Options for Neutron NSX-DVS support: