Browse Source

Fix puppet-lint and shell warnings and errors

Change-Id: I4ba5e6de9c0f7e5896dc592263484a8d978ffc26
Igor Zinovik 2 years ago
parent
commit
9be55a15fb

+ 1
- 1
deployment_scripts/puppet/manifests/configure-plugin.pp View File

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

+ 5
- 5
deployment_scripts/puppet/manifests/install-nsx-packages.pp View File

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

+ 1
- 1
deployment_scripts/puppet/manifests/reg-node-as-transport-node.pp View File

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

+ 1
- 1
deployment_scripts/puppet/manifests/reg-node-on-management-plane.pp View File

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

+ 1
- 1
deployment_scripts/puppet/modules/nsxt/files/create_repo.sh View File

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

Loading…
Cancel
Save