summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/deploy/os-odl_l2-fdio-ha.yaml2
-rw-r--r--docs/installationprocedure/baremetal.rst12
-rwxr-xr-xlib/overcloud-deploy-functions.sh15
3 files changed, 18 insertions, 11 deletions
diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml
index f1297e82..d75dc1dc 100644
--- a/config/deploy/os-odl_l2-fdio-ha.yaml
+++ b/config/deploy/os-odl_l2-fdio-ha.yaml
@@ -16,6 +16,8 @@ deploy_options:
kernel:
hugepages: 1024
hugepagesz: 2M
+ intel_iommu: 'on'
+ iommu: pt
Compute:
kernel:
hugepagesz: 2M
diff --git a/docs/installationprocedure/baremetal.rst b/docs/installationprocedure/baremetal.rst
index 21dc444e..1cf8f680 100644
--- 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/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index c1cb74f9..a6c43870 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -109,12 +109,6 @@ EOF
-a overcloud-full.qcow2
fi
- if [ "${deploy_options_array['sfc']}" == 'True' ]; then
- # upgrade ovs into ovs 2.5.90 with NSH function
- LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_kmod_rpm_name}" \
- --run-command "yum upgrade -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_rpm_name}" \
- -a overcloud-full.qcow2
- fi
EOI
elif [ "${deploy_options_array['dataplane']}" != 'ovs' ]; then
@@ -126,6 +120,15 @@ EOI
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex"
fi
+ # upgrade ovs into ovs 2.5.90 with NSH function if SFC is enabled
+ if [ "${deploy_options_array['sfc']}" == 'True' && "${deploy_options_array['dataplane']}" == 'ovs' ]; then
+ ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
+ LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_kmod_rpm_name}" \
+ --run-command "yum upgrade -y /root/ovs/rpm/rpmbuild/RPMS/x86_64/${ovs_rpm_name}" \
+ -a overcloud-full.qcow2
+EOI
+ fi
+
# Set ODL version accordingly
if [[ "${deploy_options_array['sdn_controller']}" == 'opendaylight' && "${deploy_options_array['odl_version']}" == 'boron' ]]; then
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI