summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-08-11 09:47:27 -0400
committerFeng Pan <fpan@redhat.com>2016-08-11 09:47:27 -0400
commit6e103b96659cb133f222f8caf7c194568945ac88 (patch)
tree03cc75a15eff4874d2d2935e206d2ad09291520e /ci
parent1900c3825ef9163b721cda7c117c18a42aa84fb9 (diff)
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>
Diffstat (limited to 'ci')
-rw-r--r--ci/PR_revision.log1
-rwxr-xr-xci/deploy.sh8
2 files changed, 5 insertions, 4 deletions
diff --git a/ci/PR_revision.log b/ci/PR_revision.log
index 5edb97e..718652e 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 432499a..7143368 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