x
/
fuel-plugin-6wind-virtual-accelerator
Code Issues Proposed changes

6wind-virtual-accelerator-plugin: fix to license file installation 

Always install virtual accelerator license file (if available)

Change-Id: I9189fd1582318d8bfeb3831f545b4c9b1f9d9dec
Closes-bug: 1632712
Signed-off-by: Francesco Santoro <francesco.santoro@6wind.com>
This commit is contained in:
Francesco Santoro 2016-10-12 15:30:46 +02:00
parent d3f2e1fdc6
commit 4a224054c3
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deployment_scripts/puppet/modules/virtual_accelerator/manifests/config.pp
View File

@ -17,6 +17,7 @@ class virtual_accelerator::config inherits virtual_accelerator {
$fp_conf_file = "/usr/local/etc/fast-path.env"
$hugepages_dir = "/dev/hugepages"
$license_file = $virtual_accelerator::va_license_file
exec { 'copy_template':
command => "cp /usr/local/etc/fast-path.env.tmpl ${fp_conf_file}",
@ -26,6 +27,13 @@ class virtual_accelerator::config inherits virtual_accelerator {
path => '/usr/local/bin/',
}
if $license_file != '' and $license_file != undef {
file {"/usr/local/etc/6wind_va.lic":
ensure => file,
content => $license_file,
}
}
if $advanced_params == true {
$custom_conf_file = $virtual_accelerator::va_conf_file
@ -52,15 +60,6 @@ class virtual_accelerator::config inherits virtual_accelerator {
path => '/usr/local/bin/',
}
}
$license_file = $virtual_accelerator::va_license_file
if $license_file != '' and $license_file != undef {
file {"/usr/local/etc/6wind_va.lic":
ensure => file,
content => $license_file,
}
}
}
}