diff options
| -rw-r--r-- | build/opnfv-environment.yaml | 2 | ||||
| -rwxr-xr-x | ci/deploy.sh | 2 | ||||
| -rwxr-xr-x | lib/parse-functions.sh | 2 | ||||
| -rwxr-xr-x | lib/python/apex_python_utils.py | 8 | ||||
| -rwxr-xr-x | lib/undercloud-functions.sh | 4 | ||||
| -rw-r--r-- | tests/test_apex_python_utils_py.py | 2 |
6 files changed, 12 insertions, 8 deletions
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml index 4f9fd986..4971ad76 100644 --- a/build/opnfv-environment.yaml +++ b/build/opnfv-environment.yaml @@ -22,3 +22,5 @@ parameters: key: 'os_compute_api:servers:show:host_status' value: 'rule:admin_or_owner' +parameter_defaults: + CeilometerStoreEvents: true 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 4820fe4d..dcf483d1 100755 --- a/lib/python/apex_python_utils.py +++ b/lib/python/apex_python_utils.py @@ -130,9 +130,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', @@ -171,9 +171,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) |