summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-02-23 21:24:01 -0500
committerDan Radez <dradez@redhat.com>2016-02-29 15:24:07 -0500
commit796cb23d09f15790cf397aa30a892bfe670c648f (patch)
tree398b64b410938718626acf337858a9fd999b8bb9
parent7f1312c63dff70df8a2c29bfe4a16b6e159e4c44 (diff)
updates to fix the --flat option
JIRA: APEX-84 Change-Id: Ic806118c3c3032abff6cebe5c93ad62a6a0a23c7 Signed-off-by: Dan Radez <dradez@redhat.com>
-rwxr-xr-xci/deploy.sh17
1 files changed, 8 insertions, 9 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 31cd4625..8589226b 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -120,7 +120,7 @@ parse_network_settings() {
elif [ "${network}" == 'admin_network' ]; then
echo -e "${red}ERROR: You must enable admin_network and configure it explicitly or use auto-detection${reset}"
exit 1
- elif [ "${network}" == 'public_network' ]; then
+ elif [[ "${network}" == 'public_network' && "$net_isolation_enabled" == "TRUE" ]]; then
echo -e "${red}ERROR: You must enable public_network and configure it explicitly or use auto-detection${reset}"
exit 1
else
@@ -301,7 +301,7 @@ parse_inventory_file() {
fi
eval $(parse_yaml $INVENTORY_FILE) || {
- echo "${red}Failed to parse inventory.yaml. Aborting.${reset}" &&
+ echo "${red}Failed to parse inventory.yaml. Aborting.${reset}"
exit 1
}
@@ -394,6 +394,7 @@ function configure_deps {
# If flat we only use admin network
if [[ "$net_isolation_enabled" == "FALSE" ]]; then
virsh_enabled_networks="admin_network"
+ enabled_network_list="admin_network"
# For baremetal we only need to create/attach instack to admin and public
elif [ "$virtual" == "FALSE" ]; then
virsh_enabled_networks="admin_network public_network"
@@ -1140,9 +1141,9 @@ parse_cmdline() {
done
if [[ ! -z "$NETSETS" && "$net_isolation_enabled" == "FALSE" ]]; then
- echo -e "${red}INFO: Single flat network requested. Ignoring any network settings!${reset}"
- elif [[ -z "$NETSETS" && "$net_isolation_enabled" == "TRUE" ]]; then
- echo -e "${red}ERROR: You must provide a network_settings file with -n or use --flat to force a single flat network${reset}"
+ echo -e "${red}INFO: Single flat network requested. Only admin_network settings will be used!${reset}"
+ elif [[ -z "$NETSETS" ]]; then
+ echo -e "${red}ERROR: You must provide a network_settings file with -n.${reset}"
exit 1
fi
@@ -1187,10 +1188,8 @@ parse_cmdline() {
main() {
parse_cmdline "$@"
- if [[ "$net_isolation_enabled" == "TRUE" ]]; then
- echo -e "${blue}INFO: Parsing network settings file...${reset}"
- parse_network_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