Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
694b8e85a0 | |||
eb321497ee | |||
5b81e59481 | |||
a4c0e0befd |
@ -55,6 +55,12 @@ While PVC's API and internals aren't very screenshot-worthy, here is some exampl
|
|||||||
|
|
||||||
## Changelog
|
## Changelog
|
||||||
|
|
||||||
|
#### v0.9.34
|
||||||
|
|
||||||
|
* [Provisioner] Adds support for filesystem arguments containing =
|
||||||
|
* [CLI Client] Fixes bug with pvc provisioner status output formatting
|
||||||
|
* [Node Daemon] Fixes minor typo in startup message
|
||||||
|
|
||||||
#### v0.9.33
|
#### v0.9.33
|
||||||
|
|
||||||
* [Node Daemon] A major refactoring of the node daemon
|
* [Node Daemon] A major refactoring of the node daemon
|
||||||
|
@ -25,7 +25,7 @@ import yaml
|
|||||||
from distutils.util import strtobool as dustrtobool
|
from distutils.util import strtobool as dustrtobool
|
||||||
|
|
||||||
# Daemon version
|
# Daemon version
|
||||||
version = '0.9.33'
|
version = '0.9.34'
|
||||||
|
|
||||||
# API version
|
# API version
|
||||||
API_VERSION = 1.0
|
API_VERSION = 1.0
|
||||||
|
@ -1510,15 +1510,17 @@ def create_vm(self, vm_name, vm_profile, define_vm=True, start_vm=True, script_r
|
|||||||
if volume.get('filesystem') is None:
|
if volume.get('filesystem') is None:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
print("Creating {} filesystem on {}:\n{}".format(volume['filesystem'], dst_volume, stdout))
|
|
||||||
|
|
||||||
filesystem_args_list = list()
|
filesystem_args_list = list()
|
||||||
for arg in volume['filesystem_args'].split():
|
for arg in volume['filesystem_args'].split():
|
||||||
arg_entry, arg_data = arg.split('=')
|
arg_entry, *arg_data = arg.split('=')
|
||||||
|
arg_data = '='.join(arg_data)
|
||||||
filesystem_args_list.append(arg_entry)
|
filesystem_args_list.append(arg_entry)
|
||||||
filesystem_args_list.append(arg_data)
|
filesystem_args_list.append(arg_data)
|
||||||
filesystem_args = ' '.join(filesystem_args_list)
|
filesystem_args = ' '.join(filesystem_args_list)
|
||||||
|
|
||||||
|
print("Creating {} filesystem on {}".format(volume['filesystem'], dst_volume))
|
||||||
|
print("Args: {}".format(filesystem_args))
|
||||||
|
|
||||||
# Map the RBD device
|
# Map the RBD device
|
||||||
retcode, retmsg = pvc_ceph.map_volume(zkhandler, volume['pool'], dst_volume_name)
|
retcode, retmsg = pvc_ceph.map_volume(zkhandler, volume['pool'], dst_volume_name)
|
||||||
if not retcode:
|
if not retcode:
|
||||||
@ -1534,6 +1536,8 @@ def create_vm(self, vm_name, vm_profile, define_vm=True, start_vm=True, script_r
|
|||||||
if retcode:
|
if retcode:
|
||||||
raise ProvisioningError('Failed to create {} filesystem on "{}": {}'.format(volume['filesystem'], dst_volume, stderr))
|
raise ProvisioningError('Failed to create {} filesystem on "{}": {}'.format(volume['filesystem'], dst_volume, stderr))
|
||||||
|
|
||||||
|
print(stdout)
|
||||||
|
|
||||||
if is_script_install:
|
if is_script_install:
|
||||||
# Create temporary directory
|
# Create temporary directory
|
||||||
retcode, stdout, stderr = pvc_common.run_os_command("mktemp -d")
|
retcode, stdout, stderr = pvc_common.run_os_command("mktemp -d")
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
from requests_toolbelt.multipart.encoder import MultipartEncoder, MultipartEncoderMonitor
|
from requests_toolbelt.multipart.encoder import MultipartEncoder, MultipartEncoderMonitor
|
||||||
|
from ast import literal_eval
|
||||||
|
|
||||||
import pvc.cli_lib.ansiprint as ansiprint
|
import pvc.cli_lib.ansiprint as ansiprint
|
||||||
from pvc.cli_lib.common import UploadProgressBar, call_api
|
from pvc.cli_lib.common import UploadProgressBar, call_api
|
||||||
@ -723,10 +724,10 @@ def task_status(config, task_id=None, is_watching=False):
|
|||||||
task['type'] = task_type
|
task['type'] = task_type
|
||||||
task['worker'] = task_host
|
task['worker'] = task_host
|
||||||
task['id'] = task_job.get('id')
|
task['id'] = task_job.get('id')
|
||||||
task_args = task_job.get('args')
|
task_args = literal_eval(task_job.get('args'))
|
||||||
task['vm_name'] = task_args[0]
|
task['vm_name'] = task_args[0]
|
||||||
task['vm_profile'] = task_args[1]
|
task['vm_profile'] = task_args[1]
|
||||||
task_kwargs = task_job.get('kwargs')
|
task_kwargs = literal_eval(task_job.get('kwargs'))
|
||||||
task['vm_define'] = str(bool(task_kwargs['define_vm']))
|
task['vm_define'] = str(bool(task_kwargs['define_vm']))
|
||||||
task['vm_start'] = str(bool(task_kwargs['start_vm']))
|
task['vm_start'] = str(bool(task_kwargs['start_vm']))
|
||||||
task_data.append(task)
|
task_data.append(task)
|
||||||
|
@ -2,7 +2,7 @@ from setuptools import setup
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='pvc',
|
name='pvc',
|
||||||
version='0.9.33',
|
version='0.9.34',
|
||||||
packages=['pvc', 'pvc.cli_lib'],
|
packages=['pvc', 'pvc.cli_lib'],
|
||||||
install_requires=[
|
install_requires=[
|
||||||
'Click',
|
'Click',
|
||||||
|
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -1,3 +1,11 @@
|
|||||||
|
pvc (0.9.34-0) unstable; urgency=high
|
||||||
|
|
||||||
|
* [Provisioner] Adds support for filesystem arguments containing =
|
||||||
|
* [CLI Client] Fixes bug with pvc provisioner status output formatting
|
||||||
|
* [Node Daemon] Fixes minor typo in startup message
|
||||||
|
|
||||||
|
-- Joshua M. Boniface <joshua@boniface.me> Tue, 24 Aug 2021 16:15:25 -0400
|
||||||
|
|
||||||
pvc (0.9.33-0) unstable; urgency=high
|
pvc (0.9.33-0) unstable; urgency=high
|
||||||
|
|
||||||
* [Node Daemon] A major refactoring of the node daemon
|
* [Node Daemon] A major refactoring of the node daemon
|
||||||
|
@ -55,6 +55,12 @@ While PVC's API and internals aren't very screenshot-worthy, here is some exampl
|
|||||||
|
|
||||||
## Changelog
|
## Changelog
|
||||||
|
|
||||||
|
#### v0.9.34
|
||||||
|
|
||||||
|
* [Provisioner] Adds support for filesystem arguments containing =
|
||||||
|
* [CLI Client] Fixes bug with pvc provisioner status output formatting
|
||||||
|
* [Node Daemon] Fixes minor typo in startup message
|
||||||
|
|
||||||
#### v0.9.33
|
#### v0.9.33
|
||||||
|
|
||||||
* [Node Daemon] A major refactoring of the node daemon
|
* [Node Daemon] A major refactoring of the node daemon
|
||||||
|
@ -48,7 +48,7 @@ import re
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
# Daemon version
|
# Daemon version
|
||||||
version = '0.9.33'
|
version = '0.9.34'
|
||||||
|
|
||||||
|
|
||||||
##########################################################
|
##########################################################
|
||||||
|
@ -115,7 +115,7 @@ def setup_interfaces(logger, config):
|
|||||||
|
|
||||||
upstream_gateway = config['upstream_gateway']
|
upstream_gateway = config['upstream_gateway']
|
||||||
if upstream_gateway is not None:
|
if upstream_gateway is not None:
|
||||||
logger.out(f'Setting up Upstream networok default gateway IP {upstream_gateway}', state='i')
|
logger.out(f'Setting up Upstream network default gateway IP {upstream_gateway}', state='i')
|
||||||
if upstream_dev == cluster_dev:
|
if upstream_dev == cluster_dev:
|
||||||
common.run_os_command(f'ip route add default via {upstream_gateway} dev brcluster')
|
common.run_os_command(f'ip route add default via {upstream_gateway} dev brcluster')
|
||||||
else:
|
else:
|
||||||
|
Reference in New Issue
Block a user