6wind-virtual-accelerator-plugin: rework parameters displaying

With the 6WIND Virtual Accelerator 1.3.2 some advanced parameters have been
dismissed and the default value of others has changed.
This patch updates both these parameters in the Web UI and documentation.

Moreover the "License File" upload section has been moved to be always visible.

Change-Id: I1a8ee3bb2dd2068505a39bbe09fcbda4aac07514
Signed-off-by: Francesco Santoro <francesco.santoro@6wind.com>
This commit is contained in:
Francesco Santoro 2016-06-22 17:38:51 +02:00
parent 83577ade80
commit b385d3a0e3
6 changed files with 23 additions and 42 deletions

View File

@ -23,17 +23,8 @@ class virtual_accelerator::config inherits virtual_accelerator {
ensure => 'running',
}
$fp_mem = $virtual_accelerator::fp_mem
$fp_conf_file = "/usr/local/etc/fast-path.env"
exec { 'copy_template':
command => "cp /usr/local/etc/fast-path.env.tmpl ${fp_conf_file}",
} ->
exec { 'set_fp_mem':
command => "config_va.sh FP_MEMORY ${fp_mem}",
path => '/usr/local/bin/',
}
if $advanced_params == true {
$custom_conf_file = $virtual_accelerator::va_conf_file
@ -48,16 +39,19 @@ class virtual_accelerator::config inherits virtual_accelerator {
}
}
else {
$cores_per_port = $virtual_accelerator::cores_per_port
exec { 'set_core':
command => "config_va.sh CORE_PER_PORT ${cores_per_port}",
path => '/usr/local/bin/',
}
$vm_mem = $virtual_accelerator::vm_mem
$fp_mem = $virtual_accelerator::fp_mem
exec { 'copy_template':
command => "cp /usr/local/etc/fast-path.env.tmpl ${fp_conf_file}",
} ->
exec { 'set_vm_mem':
command => "config_va.sh VM_MEMORY ${vm_mem}",
path => '/usr/local/bin/',
} ->
exec { 'set_fp_mem':
command => "config_va.sh FP_MEMORY ${fp_mem}",
path => '/usr/local/bin/',
}
}

View File

@ -12,7 +12,6 @@ class virtual_accelerator {
# 6WIND Virtual Accelerator settings
$advanced_params = $settings['advanced_params_enabled']
$fp_mem = $settings['fp_mem']
$cores_per_port = $settings['cores_per_port']
$vm_mem = $settings['vm_mem']
$va_conf_file = ''
$disable_ipset = $settings['disable_ipset']

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 85 KiB

View File

@ -106,9 +106,10 @@ Configuring 6WIND Virtual Accelerator Plugin
* Provide base64 credentials package you received from 6WIND support team
* Refer to next chapter for detailed field description and configuration.
In particular if you have a **license file** you should upload it at this time
in the Advanced Paramaters menu.
* Provide the license file to be used for 6WIND Virtual Accelerator
activation
* Refer to next chapter for the description of Advanced Paramaters fields.
#. Add nodes and assign them the following roles:
@ -116,7 +117,7 @@ Configuring 6WIND Virtual Accelerator Plugin
* At least 1 Controller
* At least one node with both Compute and 6WIND Virtual Accelerator roles.
Make sure that the chosen node has **at least 2 cpus and 4 GB of RAM**
Make sure that the chosen node has **at least 2 cpus and 6 GB of RAM**
.. image:: images/node-roles.png
:width: 100%

View File

@ -7,25 +7,22 @@ attributes:
weight: 20
type: "file"
va_license_file:
value: ''
label: "License File"
description: "(optional) license file used to activate VA"
weight: 30
type: "file"
advanced_params_enabled:
value: false
label: "Advanced Parameters"
description: "Enables configuration of advanced parameters"
weight: 30
weight: 35
type: "checkbox"
va_license_file:
value: ''
label: "LICENSE FILE"
description: "license file used to activate VA"
weight: 35
type: "file"
restrictions:
- condition: "settings:6wind-virtual-accelerator.advanced_params_enabled.value == false"
action: hide
fp_mem:
value: '1024'
value: 'auto'
label: 'FP_MEMORY'
description: 'defines how much memory is used by VA'
weight: 40
@ -34,16 +31,6 @@ attributes:
- condition: "settings:6wind-virtual-accelerator.advanced_params_enabled.value == false"
action: hide
cores_per_port:
value: '1'
label: 'CORE_PER_PORT'
description: 'defines the amount of cores polling each port'
weight: 40
type: "text"
restrictions:
- condition: "settings:6wind-virtual-accelerator.advanced_params_enabled.value == false"
action: hide
vm_mem:
value: 'auto'
label: 'VM_MEMORY'