parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Restore shebang and don't do store if completion

This commit is contained in:
Joshua Boniface 2021-06-23 05:26:50 -04:00
parent 04fa63f081
commit bbb132414c
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client-cli/pvc/pvc.py
View File

@ -1,3 +1,5 @@
#!/usr/bin/env python3
# pvc.py - PVC client command-line interface # pvc.py - PVC client command-line interface
# Part of the Parallel Virtual Cluster (PVC) system # Part of the Parallel Virtual Cluster (PVC) system
# #
@ -42,6 +44,7 @@ import pvc.cli_lib.provisioner as pvc_provisioner
myhostname = socket.gethostname().split('.')[0] myhostname = socket.gethostname().split('.')[0]
zk_host = '' zk_host = ''
is_completion = True if os.environ.get('_PVC_COMPLETE', '') == 'complete' else False
default_store_data = { default_store_data = {
'cfgfile': '/etc/pvc/pvcapid.yaml' 'cfgfile': '/etc/pvc/pvcapid.yaml'
@ -131,19 +134,20 @@ def update_store(store_path, store_data):
fh.write(json.dumps(store_data, sort_keys=True, indent=4)) fh.write(json.dumps(store_data, sort_keys=True, indent=4))
pvc_client_dir = os.environ.get('PVC_CLIENT_DIR', None) if not is_completion:
home_dir = os.environ.get('HOME', None) pvc_client_dir = os.environ.get('PVC_CLIENT_DIR', None)
if pvc_client_dir: home_dir = os.environ.get('HOME', None)
if pvc_client_dir:
store_path = '{}'.format(pvc_client_dir) store_path = '{}'.format(pvc_client_dir)
elif home_dir: elif home_dir:
store_path = '{}/.config/pvc'.format(home_dir) store_path = '{}/.config/pvc'.format(home_dir)
else: else:
print('WARNING: No client or home config dir found, using /tmp instead') print('WARNING: No client or home config dir found, using /tmp instead')
store_path = '/tmp/pvc' store_path = '/tmp/pvc'
if not os.path.isdir(store_path): if not os.path.isdir(store_path):
os.makedirs(store_path) os.makedirs(store_path)
if not os.path.isfile(store_path + '/pvc-cli.json'): if not os.path.isfile(store_path + '/pvc-cli.json'):
update_store(store_path, {"local": default_store_data}) update_store(store_path, {"local": default_store_data})
CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'], max_content_width=120) CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'], max_content_width=120)