10 files changed, 18 insertions, 16 deletions
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index e7f1dd7d..bce99437 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -46,7 +46,7 @@ pushd images > /dev/null
 
 dpdk_pkg_str=''
 for package in ${dpdk_rpms[@]}; do
-  curl -O "$dpdk_uri_base/$package"
+  wget "$dpdk_uri_base/$package"
   dpdk_pkg_str+=" --upload $package:/root/dpdk_rpms"
 done
 
diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index 6b86bf87..39bcd289 100644
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
@@ -22,7 +22,7 @@ https://wiki.opnfv.org/apex
 %setup -q
 
 %build
-rst2html docs/installation-instructions/index.rst docs/installation-instructions.html
+rst2html docs/installationprocedure/index.rst docs/installation-instructions.html
 rst2html docs/release-notes/release-notes.rst docs/release-notes.html
 
 %global __python %{__python3}
@@ -131,11 +131,11 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %doc %{_docdir}/opnfv/inventory.yaml.example
 
 %changelog
-* Thu Aug 1 2016 Tim Rozet <trozet@redhat.com> - 3.0-11
+* Mon Aug 1 2016 Tim Rozet <trozet@redhat.com> - 3.0-11
 - Add nosdn fdio scenarios.
 * Tue Jul 5 2016 Dan Radez <dradez@redhat.com> - 3.0-10
 - Adding functions.sh files
-* Thu Jun 15 2016 Tim Rozet <trozet@redhat.com> - 3.0-9
+* Wed Jun 15 2016 Tim Rozet <trozet@redhat.com> - 3.0-9
 - Add fdio scenarios.
 * Tue Jun 14 2016 Feng Pan <fpan@redhat.com> - 3.0-8
 - Add network_settings_v6.yaml
diff --git a/build/variables.sh b/build/variables.sh
index fda735cd..1cca352d 100644
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -18,11 +18,11 @@ doctor_driver=https://raw.githubusercontent.com/openstack/congress/master/congre
 
 dpdk_uri_base=http://artifacts.opnfv.org/ovsnfv
 dpdk_rpms=(
-'ovs4opnfv-32930523-dpdk-16.04.0-1.el7.centos.x86_64.rpm'
-'ovs4opnfv-32930523-dpdk-devel-16.04.0-1.el7.centos.x86_64.rpm'
-'ovs4opnfv-32930523-dpdk-examples-16.04.0-1.el7.centos.x86_64.rpm'
-'ovs4opnfv-32930523-dpdk-tools-16.04.0-1.el7.centos.x86_64.rpm'
-'ovs4opnfv-32930523-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm'
+'ovs4opnfv-55ef39e7-dpdk-16.04.0-1.el7.centos.x86_64.rpm'
+'ovs4opnfv-55ef39e7-dpdk-devel-16.04.0-1.el7.centos.x86_64.rpm'
+'ovs4opnfv-55ef39e7-dpdk-examples-16.04.0-1.el7.centos.x86_64.rpm'
+'ovs4opnfv-55ef39e7-dpdk-tools-16.04.0-1.el7.centos.x86_64.rpm'
+'ovs4opnfv-55ef39e7-openvswitch-2.5.90-0.12032.gitc61e93d6.1.el7.centos.x86_64.rpm'
 )
 
 ovs_rpm_name=openvswitch-2.5.90-1.el7.centos.x86_64.rpm
diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index f16caabe..a98c6dc6 100644
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -28,3 +28,5 @@
 61,Add dpdk bind lock file for vpp deployment
 63,Fixes honeycomb on compute
 62,Heat Domain
+64,Fix missing metadata param
+65,Add nic list and ip address to fdio class
+\ No newline at end of file
diff --git a/config/deploy/os-nosdn-fdio-noha.yaml b/config/deploy/os-nosdn-fdio-noha.yaml
index 057177f6..81ff781d 100644
--- a/config/deploy/os-nosdn-fdio-noha.yaml
+++ b/config/deploy/os-nosdn-fdio-noha.yaml
@@ -20,6 +20,6 @@ deploy_options:
         libvirtpin: 1
       kernel:
         hugepagesz: 2M
-        hugepages: 4096
+        hugepages: 2048
         intel_iommu: 'on'
         iommu: pt
diff --git a/config/deploy/os-nosdn-ovs-ha.yaml b/config/deploy/os-nosdn-ovs-ha.yaml
index 11b093f0..89be0c3d 100644
--- a/config/deploy/os-nosdn-ovs-ha.yaml
+++ b/config/deploy/os-nosdn-ovs-ha.yaml
@@ -19,6 +19,6 @@ deploy_options:
         libvirtpin: 1
       kernel:
         hugepagesz: 2M
-        hugepages: 1024
+        hugepages: 2048
         intel_iommu: 'on'
         iommu: pt
diff --git a/config/deploy/os-nosdn-ovs-noha.yaml b/config/deploy/os-nosdn-ovs-noha.yaml
index 3082dcb4..d13fd9ca 100644
--- a/config/deploy/os-nosdn-ovs-noha.yaml
+++ b/config/deploy/os-nosdn-ovs-noha.yaml
@@ -19,6 +19,6 @@ deploy_options:
         libvirtpin: 1
       kernel:
         hugepagesz: 2M
-        hugepages: 1024
+        hugepages: 2048
         intel_iommu: 'on'
         iommu: pt
diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml
index c66b35b6..75d79ce7 100644
--- a/config/deploy/os-odl_l2-fdio-ha.yaml
+++ b/config/deploy/os-odl_l2-fdio-ha.yaml
@@ -21,6 +21,6 @@ deploy_options:
         libvirtpin: 1
       kernel:
         hugepagesz: 2M
-        hugepages: 4096
+        hugepages: 2048
         intel_iommu: 'on'
         iommu: pt
diff --git a/config/deploy/os-odl_l2-fdio-noha.yaml b/config/deploy/os-odl_l2-fdio-noha.yaml
index 15942fd6..ad54fbdc 100644
--- a/config/deploy/os-odl_l2-fdio-noha.yaml
+++ b/config/deploy/os-odl_l2-fdio-noha.yaml
@@ -23,6 +23,6 @@ deploy_options:
         libvirtpin: 1
       kernel:
         hugepagesz: 2M
-        hugepages: 4096
+        hugepages: 2048
         intel_iommu: 'on'
         iommu: pt
diff --git a/docs/configguide/installerconfig.rst b/docs/configguide/installerconfig.rst
index 8f35905c..0cbb00f6 100644
--- a/docs/configguide/installerconfig.rst
+++ b/docs/configguide/installerconfig.rst
@@ -7,5 +7,5 @@
 Apex configuration
 ==================
 
-.. include:: ../installation-instructions/introduction.rst
-.. include:: ../installation-instructions/baremetal.rst
+.. include:: ../installationprocedure/introduction.rst
+.. include:: ../installationprocedure/baremetal.rst