summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-08-09 15:37:11 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-09 15:37:11 +0000
commit9be56bb3c62fd07e5524c76256b964bb4988baf2 (patch)
tree8c578530b784283607a673d5e491fedb2f780411
parent5c9e135ccc5867ebf26bbe594cbd9964582a237d (diff)
parentd5f0e0d3cd0ca88962c3f6d57d22ae27f2e3a5f1 (diff)
Merge "Fix network_isolation argparse issue"
-rwxr-xr-xci/deploy.sh2
-rwxr-xr-xlib/parse-functions.sh2
-rwxr-xr-xlib/python/apex_python_utils.py8
-rwxr-xr-xlib/undercloud-functions.sh4
-rw-r--r--tests/test_apex_python_utils_py.py2
5 files changed, 10 insertions, 8 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 57c63766..432499a5 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -26,6 +26,7 @@ interactive="FALSE"
ping_site="8.8.8.8"
ntp_server="pool.ntp.org"
net_isolation_enabled="TRUE"
+net_isolation_arg=""
post_config="TRUE"
debug="FALSE"
@@ -130,6 +131,7 @@ parse_cmdline() {
;;
--flat )
net_isolation_enabled="FALSE"
+ net_isolation_arg="--flat"
echo "Underlay Network Isolation Disabled: using flat configuration"
shift 1
;;
diff --git a/lib/parse-functions.sh b/lib/parse-functions.sh
index e8dd982d..0be62e25 100755
--- a/lib/parse-functions.sh
+++ b/lib/parse-functions.sh
@@ -63,7 +63,7 @@ parse_network_settings() {
fi
done
- if output=$(python3.4 -B $LIB/python/apex_python_utils.py parse-net-settings -s $NETSETS -i $net_isolation_enabled -e $CONFIG/network-environment.yaml $parse_ext); then
+ if output=$(python3.4 -B $LIB/python/apex_python_utils.py parse-net-settings -s $NETSETS $net_isolation_arg -e $CONFIG/network-environment.yaml $parse_ext); then
echo -e "${blue}${output}${reset}"
eval "$output"
else
diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py
index c548437d..8ea40f2c 100755
--- a/lib/python/apex_python_utils.py
+++ b/lib/python/apex_python_utils.py
@@ -131,9 +131,9 @@ def get_parser():
default='network-settings.yaml',
dest='net_settings_file',
help='path to network settings file')
- net_settings.add_argument('-i', '--network-isolation', type=bool,
+ net_settings.add_argument('--flat', action='store_false',
default=True, dest='network_isolation',
- help='network isolation')
+ help='disable network isolation')
net_settings.add_argument('-e', '--net-env-file',
default="network-environment.yaml",
dest='net_env_file',
@@ -172,9 +172,9 @@ def get_parser():
default='network-settings.yaml',
dest='net_settings_file',
help='path to network settings file')
- nic_template.add_argument('-i', '--network-isolation', type=bool,
+ nic_template.add_argument('--flat', action='store_false',
default=True, dest='network_isolation',
- help='network isolation')
+ help='disable network isolation')
nic_template.add_argument('-n', '--enabled-networks', required=True,
dest='enabled_networks',
help='enabled network list')
diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh
index 0e26fa89..f5b53ee7 100755
--- a/lib/undercloud-functions.sh
+++ b/lib/undercloud-functions.sh
@@ -136,12 +136,12 @@ function configure_undercloud {
ovs_dpdk_bridge=''
fi
- if ! controller_nic_template=$(python3.4 -B $LIB/python/apex_python_utils.py nic-template -r controller -s $NETSETS -i $net_isolation_enabled -t $CONFIG/nics-template.yaml.jinja2 -n "$enabled_network_list" -e "br-ex" -af $ip_addr_family); then
+ if ! controller_nic_template=$(python3.4 -B $LIB/python/apex_python_utils.py nic-template -r controller -s $NETSETS $net_isolation_arg -t $CONFIG/nics-template.yaml.jinja2 -n "$enabled_network_list" -e "br-ex" -af $ip_addr_family); then
echo -e "${red}ERROR: Failed to generate controller NIC heat template ${reset}"
exit 1
fi
- if ! compute_nic_template=$(python3.4 -B $LIB/python/apex_python_utils.py nic-template -r compute -s $NETSETS -i $net_isolation_enabled -t $CONFIG/nics-template.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family -d "$ovs_dpdk_bridge"); then
+ if ! compute_nic_template=$(python3.4 -B $LIB/python/apex_python_utils.py nic-template -r compute -s $NETSETS $net_isolation_arg -t $CONFIG/nics-template.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family -d "$ovs_dpdk_bridge"); then
echo -e "${red}ERROR: Failed to generate compute NIC heat template ${reset}"
exit 1
fi
diff --git a/tests/test_apex_python_utils_py.py b/tests/test_apex_python_utils_py.py
index 47c10092..12ac4091 100644
--- a/tests/test_apex_python_utils_py.py
+++ b/tests/test_apex_python_utils_py.py
@@ -57,7 +57,7 @@ class TestCommonUtils(object):
def test_parse_net_settings(self):
args = self.parser.parse_args(['parse-net-settings',
'-s', net_sets,
- '-i', 'True',
+ '--flat',
'-e', net_env])
assert_equal(parse_net_settings(args), None)