Fix VPP deploy failures

- Move deploy option parsing to before network settings parsing,
  as performance options are needed during networking setting
  parsing.
- Fix numa fdio_enabled option setting
- Add numa to controller hiera hierarchy in tht

opnfv-tht-pr: 53

Change-Id: I0a87c557c8bf653d5a86eccdbb3172733c06716a
Signed-off-by: Feng Pan <fpan@redhat.com>

3 files changed, 6 insertions, 5 deletions

diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index 5edb97e0..718652e8 100644
--- a/ci/PR_revision.log
+++ b/ci/PR_revision.log
@@ -20,3 +20,4 @@
 41,Add pcs cleanup exec
 50,Fix rabbitmq ipv6 config
 52,Add notifier topic to ceilometer
+53,Add numa to controller hiera hierarchy
\ No newline at end of file
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 432499a5..71433683 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -213,16 +213,16 @@ parse_cmdline() {
 
 main() {
   parse_cmdline "$@"
+  if [ -n "$DEPLOY_SETTINGS_FILE" ]; then
+    echo -e "${blue}INFO: Parsing deploy settings file...${reset}"
+    parse_deploy_settings
+  fi
   echo -e "${blue}INFO: Parsing network settings file...${reset}"
   parse_network_settings
   if ! configure_deps; then
     echo -e "${red}Dependency Validation Failed, Exiting.${reset}"
     exit 1
   fi
-  if [ -n "$DEPLOY_SETTINGS_FILE" ]; then
-    echo -e "${blue}INFO: Parsing deploy settings file...${reset}"
-    parse_deploy_settings
-  fi
   setup_undercloud_vm
   if [ "$virtual" == "TRUE" ]; then
     setup_virtual_baremetal $VM_CPUS $VM_RAM
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 2d352321..ef07ec0a 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -93,7 +93,7 @@ EOF
                                                -a overcloud-full.qcow2
 
       if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then
-        sed -i '/FdioEnabled:/c\  FdioEnabled: true' opnfv-environment.yaml
+        sudo sed -i '/FdioEnabled:/c\  FdioEnabled: true' /usr/share/openstack-tripleo-heat-templates/environments/numa.yaml
       else
         LIBGUESTFS_BACKEND=direct virt-customize --run-command "yum install -y /root/dpdk_rpms/*" \
                                                  -a overcloud-full.qcow2