Fix puppet-lint and shell warnings and errors

Change-Id: I4ba5e6de9c0f7e5896dc592263484a8d978ffc26
This commit is contained in:
Igor Zinovik 2016-09-15 12:57:09 +03:00
parent a8caf3e740
commit 9be55a15fb
5 changed files with 9 additions and 9 deletions

View File

@ -8,7 +8,7 @@ file { $::nsxt::params::nsx_plugin_dir:
file { $::nsxt::params::nsx_plugin_config: file { $::nsxt::params::nsx_plugin_config:
ensure => present, ensure => present,
content => template("nsxt/nsx.ini") content => template('nsxt/nsx.ini')
} }

View File

@ -33,7 +33,7 @@ if !$settings['insecure'] {
$ca_filename = try_get_value($settings['ca_file'],'name','') $ca_filename = try_get_value($settings['ca_file'],'name','')
if empty($ca_filename) { if empty($ca_filename) {
# default path to ca for Ubuntu 14.0.4 # default path to ca for Ubuntu 14.0.4
$ca_file = "/etc/ssl/certs/ca-certificates.crt" $ca_file = '/etc/ssl/certs/ca-certificates.crt'
} else { } else {
$ca_file = "${::nsxt::params::nsx_plugin_dir}/${ca_filename}" $ca_file = "${::nsxt::params::nsx_plugin_dir}/${ca_filename}"
} }

View File

@ -18,7 +18,7 @@ if !$settings['insecure'] {
$ca_filename = try_get_value($settings['ca_file'],'name','') $ca_filename = try_get_value($settings['ca_file'],'name','')
if empty($ca_filename) { if empty($ca_filename) {
# default path to ca for Ubuntu 14.0.4 # default path to ca for Ubuntu 14.0.4
$ca_file = "/etc/ssl/certs/ca-certificates.crt" $ca_file = '/etc/ssl/certs/ca-certificates.crt'
} else { } else {
$ca_file = "${::nsxt::params::nsx_plugin_dir}/${ca_filename}" $ca_file = "${::nsxt::params::nsx_plugin_dir}/${ca_filename}"
} }

View File

@ -8,6 +8,6 @@ tar --wildcards --strip-components=1 -zxvf "$component_archive" "*/"
dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
echo 'Label: nsx-t-protected-packages' > Release echo 'Label: nsx-t-protected-packages' > Release
chmod 755 . chmod 755 .
chmod 644 * chmod 644 ./*
apt-get update apt-get update
rm -fr "${component_archive:?}" rm -fr "${component_archive:?}"