summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
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 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