diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-09-28 17:22:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-28 17:22:42 +0000 |
| commit | 9239d8f96cdd4dfc014de2d211312c3719eceaca (patch) | |
| tree | c61fca329350af8a14fd06d97c04ece040e1b9d4 /lib/python/apex_python_utils.py | |
| parent | 523c9cb5bea77f19c909ebce4fa23c9676c4dd6d (diff) | |
| parent | d8059095ab25e5939373777330b955075d064ec6 (diff) | |
Merge "Removing --flat and network_isolation variables"
Diffstat (limited to 'lib/python/apex_python_utils.py')
| -rwxr-xr-x | lib/python/apex_python_utils.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py index b67028ac..b0ebb270 100755 --- a/lib/python/apex_python_utils.py +++ b/lib/python/apex_python_utils.py @@ -33,11 +33,8 @@ def parse_net_settings(args): Args: - file: string file to network_settings.yaml file - - network_isolation: bool - enable or disable network_isolation """ - settings = NetworkSettings(args.net_settings_file, - args.network_isolation) + settings = NetworkSettings(args.net_settings_file) net_env = NetworkEnvironment(settings, args.net_env_file, args.compute_pre_config, args.controller_pre_config) @@ -106,8 +103,7 @@ def build_nic_template(args): """ template_dir, template = args.template.rsplit('/', 1) - netsets = NetworkSettings(args.net_settings_file, - args.network_isolation) + netsets = NetworkSettings(args.net_settings_file) env = Environment(loader=FileSystemLoader(template_dir), autoescape=True) template = env.get_template(template) @@ -132,9 +128,6 @@ def get_parser(): default='network-settings.yaml', dest='net_settings_file', help='path to network settings file') - net_settings.add_argument('--flat', action='store_false', - default=True, dest='network_isolation', - help='disable network isolation') net_settings.add_argument('-e', '--net-env-file', default="network-environment.yaml", dest='net_env_file', @@ -178,9 +171,6 @@ def get_parser(): default='network-settings.yaml', dest='net_settings_file', help='path to network settings file') - nic_template.add_argument('--flat', action='store_false', - default=True, dest='network_isolation', - help='disable network isolation') nic_template.add_argument('-e', '--ext-net-type', default='interface', dest='ext_net_type', choices=['interface', 'br-ex'], |