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:
ensure => present,
content => template("nsxt/nsx.ini")
content => template('nsxt/nsx.ini')
}

View File

@ -7,11 +7,11 @@ $nsx_required_packages = ['libunwind8', 'zip', 'libgflags2', 'libgoogle-perftool
'libboost-iostreams1.54.0', 'libvirt0']
$nsx_packages = ['libgoogle-glog0', 'libjson-spirit', 'nicira-ovs-hypervisor-node', 'nsxa',
'nsx-agent', 'nsx-aggservice', 'nsx-cli', 'nsx-da', 'nsx-host',
'nsx-host-node-status-reporter', 'nsx-lldp', 'nsx-logical-exporter', 'nsx-mpa',
'nsx-netcpa', 'nsx-sfhc', 'nsx-transport-node-status-reporter',
'openvswitch-common', 'openvswitch-datapath-dkms', 'openvswitch-pki',
'openvswitch-switch', 'python-openvswitch', 'tcpdump-ovs']
'nsx-agent', 'nsx-aggservice', 'nsx-cli', 'nsx-da', 'nsx-host',
'nsx-host-node-status-reporter', 'nsx-lldp', 'nsx-logical-exporter', 'nsx-mpa',
'nsx-netcpa', 'nsx-sfhc', 'nsx-transport-node-status-reporter',
'openvswitch-common', 'openvswitch-datapath-dkms', 'openvswitch-pki',
'openvswitch-switch', 'python-openvswitch', 'tcpdump-ovs']
package { $nsx_required_packages:
ensure => latest,

View File

@ -33,7 +33,7 @@ if !$settings['insecure'] {
$ca_filename = try_get_value($settings['ca_file'],'name','')
if empty($ca_filename) {
# 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 {
$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','')
if empty($ca_filename) {
# 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 {
$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
echo 'Label: nsx-t-protected-packages' > Release
chmod 755 .
chmod 644 *
chmod 644 ./*
apt-get update
rm -fr "${component_archive:?}"