diff --git a/deployment_scripts/puppet/manifests/configure-plugin.pp b/deployment_scripts/puppet/manifests/configure-plugin.pp index b597a94..fbf7794 100644 --- a/deployment_scripts/puppet/manifests/configure-plugin.pp +++ b/deployment_scripts/puppet/manifests/configure-plugin.pp @@ -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') } diff --git a/deployment_scripts/puppet/manifests/install-nsx-packages.pp b/deployment_scripts/puppet/manifests/install-nsx-packages.pp index 616501d..c4bf099 100644 --- a/deployment_scripts/puppet/manifests/install-nsx-packages.pp +++ b/deployment_scripts/puppet/manifests/install-nsx-packages.pp @@ -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, diff --git a/deployment_scripts/puppet/manifests/reg-node-as-transport-node.pp b/deployment_scripts/puppet/manifests/reg-node-as-transport-node.pp index 72eaa37..a70830a 100644 --- a/deployment_scripts/puppet/manifests/reg-node-as-transport-node.pp +++ b/deployment_scripts/puppet/manifests/reg-node-as-transport-node.pp @@ -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}" } diff --git a/deployment_scripts/puppet/manifests/reg-node-on-management-plane.pp b/deployment_scripts/puppet/manifests/reg-node-on-management-plane.pp index f809f9c..53f90ee 100644 --- a/deployment_scripts/puppet/manifests/reg-node-on-management-plane.pp +++ b/deployment_scripts/puppet/manifests/reg-node-on-management-plane.pp @@ -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}" } diff --git a/deployment_scripts/puppet/modules/nsxt/files/create_repo.sh b/deployment_scripts/puppet/modules/nsxt/files/create_repo.sh index 954a7bd..54ed085 100644 --- a/deployment_scripts/puppet/modules/nsxt/files/create_repo.sh +++ b/deployment_scripts/puppet/modules/nsxt/files/create_repo.sh @@ -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:?}"