Merge "Fixes missing iommu parameters in odl_l2 fdio ha scenario"

diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml
index ee5537d..ab9ed96 100644 (file)
--- a/config/network/network_settings.yaml
+++ b/config/network/network_settings.yaml
@@ -89,7 +89,6 @@ networks:                            # Network configurations
     mtu: 64000                       # Tenant network MTU
     overlay_id_range: 2,65535        # Tenant network Overlay segmentation ID range:
                                      # VNI, VLAN-ID, etc.
-    vlan_id_range: 1,1000            # Tenant physical network VLAN-ID range
     segmentation_type: vxlan         # Tenant network segmentation type:
                                      # vlan, vxlan, gre
     nic_mapping:                     # Mapping of network configuration for Overcloud Nodes

diff --git a/docs/installationprocedure/baremetal.rst b/docs/installationprocedure/baremetal.rst
index 3224dd9..95412a1 100644 (file)
--- a/docs/installationprocedure/baremetal.rst
+++ b/docs/installationprocedure/baremetal.rst
@@ -184,18 +184,20 @@ IPMI configuration information gathered in section
     - ``ipmi_user``: IPMI username
     - ``ipmi_password``: IPMI password
     - ``pm_type``: Power Management driver to use for the node
+        values: pxe_ipmitool (tested) or pxe_wol (untested) or pxe_amt (untested)
     - ``cpus``: (Introspected*) CPU cores available
     - ``memory``: (Introspected*) Memory available in Mib
     - ``disk``: (Introspected*) Disk space available in Gb
     - ``arch``: (Introspected*) System architecture
-    - ``capabilities``: (Opt**) Node role (profile:control or profile:compute)
+    - ``capabilities``: (Opt**) Node's role in deployment
+        values: profile:control or profile:compute
 
-\* *Introspection looks up the overcloud node's resources and overrides these
+    \* Introspection looks up the overcloud node's resources and overrides these
     value. You can leave default values and Apex will get the correct values when
-    it runs introspection on the nodes.*
+    it runs introspection on the nodes.
 
-** *If capabilities profile is not specified then Apex will select node's roles
-   in the OPNFV cluster in a non-deterministic fashion.*
+    ** If capabilities profile is not specified then Apex will select node's roles
+    in the OPNFV cluster in a non-deterministic fashion.
 
 Creating the Settings Files
 ---------------------------

diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py
index bbe8ee6..5cb2d0c 100644 (file)
--- a/lib/python/apex/network_environment.py
+++ b/lib/python/apex/network_environment.py
@@ -116,12 +116,6 @@ class NetworkEnvironment(dict):
                   'end': str(tenant_range[1])}]
             tenant_cidr = nets[TENANT_NETWORK]['cidr']
             self[param_def]['TenantNetCidr'] = str(tenant_cidr)
-            if 'vlan_id_range' in nets[TENANT_NETWORK].keys():
-                tenant_vlan_range = \
-                    nets[TENANT_NETWORK]['vlan_id_range'].split(',')
-                self[param_def]['NeutronNetworkVLANRanges'] = \
-                    "datacentre:" + tenant_vlan_range[0] + ':' \
-                    + tenant_vlan_range[1]
             if tenant_cidr.version == 6:
                 postfix = '/tenant_v6.yaml'
             else: