diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-09-21 14:13:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-21 14:13:59 +0000 |
| commit | 4523fd8c90acf923a526cae390922c1dbcd6220e (patch) | |
| tree | 641b5aaeefcfff9ba567b427aa6481255e22850b /lib/python/apex_python_utils.py | |
| parent | 8b6af178a5987f16325771691bde5956111cda01 (diff) | |
| parent | b6bda2fe154d067084a99733f42663252ff9b399 (diff) | |
Merge "Handling file loads and tmp dirs differently"
Diffstat (limited to 'lib/python/apex_python_utils.py')
| -rwxr-xr-x | lib/python/apex_python_utils.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py index ebc49dc5..9d6110bb 100755 --- a/lib/python/apex_python_utils.py +++ b/lib/python/apex_python_utils.py @@ -43,7 +43,9 @@ def parse_net_settings(args): net_env = NetworkEnvironment(settings, args.net_env_file, args.compute_pre_config, args.controller_pre_config) - dump_yaml(dict(net_env), '/tmp/network-environment.yaml') + target = args.target_dir.split('/') + target.append('network-environment.yaml') + dump_yaml(dict(net_env), '/'.join(target)) settings.dump_bash() @@ -108,7 +110,7 @@ def build_nic_template(args): netsets = NetworkSettings(args.net_settings_file, args.network_isolation) - env = Environment(loader=FileSystemLoader(template_dir)) + env = Environment(loader=FileSystemLoader(template_dir), autoescape=True) template = env.get_template(template) # gather vlan values into a dict @@ -148,6 +150,11 @@ def get_parser(): default="network-environment.yaml", dest='net_env_file', help='path to network environment file') + net_settings.add_argument('-td', '--target-dir', + default="/tmp", + dest='target_dir', + help='directory to write the' + 'network-environment.yaml file') net_settings.add_argument('--compute-pre-config', default=False, action='store_true', |