kitchen-wpar 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3ad071715450bc096dc68a21b9b5fcc4ba1c9d0
-  data.tar.gz: 79e4b897ab3f506fe9cb5ec70ace102988fae43d
+  metadata.gz: 751e26f0786285bf78c6ee5f3fd473e1ace58fe1
+  data.tar.gz: 4cb551333fd4cd28330fe3d4d0abf382711e4176
 SHA512:
-  metadata.gz: a432d3e0af367011aa557a1f3b83bfe3ec84f57b189a8ecc4c585fbe02ff0b7612b4dbd128fa5adcd77f4b0e934ae6e77ce2c9f84a0976ad9ee001096c8f6893
-  data.tar.gz: 5d0bec66bfae8afd1273c954359ed6f1613f525b4231ece1c1743008802688eab6f5add31825f4f601d391a3c421403466f965b9ccd3f02c244b88227787aa18
+  metadata.gz: 24ef2e0c84098e814ed16304d1c4eecf6119895b6605b79b246a672d739bf0d55463e6715518c0fd75e32badefad42d39f3e5b0978c721539946b0880d8eb473
+  data.tar.gz: f407294f4e657989eae0cba4d0580e18886f6cdb07bd176fdef57e4c98f32e20ed20355510ccfd463f1ce24ab126d0fc58e4861cccdde574ef2b09b79aa4225c

data/README.md

@@ -25,6 +25,7 @@ Please read the [Driver usage][driver_usage] page for more details.
 * **isVersioned**         create a versioned wpar. Used only with **wpar_mksysb**.
 * **isWritable**	  adds the option ' -l' to have a non-shared, writable /usr file system and /opt file system. 
 * **share_network_resolution**	  adds the option ' -r' to share name resolution services (i.e. `/etc/resolv.conf`) with the wpar.
+* **sudo**	  path to `sudo` command in case we need it.
 
 
 ### <a name="config-require-chef-omnibus"></a> require\_chef\_omnibus

data/lib/kitchen/driver/wpar.rb

@@ -50,6 +50,7 @@ module Kitchen
       default_config :mkssys, '/usr/bin/mkssys'
       default_config :startsrc, '/usr/bin/startsrc'
       default_config :stopsrc, '/usr/bin/stopsrc'
+      default_config :sudo, ''
       default_config :pam_sshd_account_rule, 'sshd account required pam_aix'
       default_config :pam_sshd_session_rule, 'sshd session required pam_aix'
 
@@ -81,11 +82,19 @@ module Kitchen
           configure_pam
         end
       end
+      
+      #section to destroy wpar
+      def destroy(state)
+        ssh_command("#{config[:rmwpar]} -F #{config[:wpar_name]}", :stderr)
+        if wpar_exists?(state)
+          raise ActionFailed, "couldn't destroy wpar !"
+        end
+      end
 
       protected
       def build_mkwpar_command()
 
-        cmd = "#{config[:mkwpar]} -s -n #{config[:wpar_name]}"
+        cmd = "#{config[:sudo]} #{config[:mkwpar]} -s -n #{config[:wpar_name]}"
         unless config[:wpar_address].nil?
           cmd += " -N address=#{config[:wpar_address]}"
         end
@@ -122,15 +131,15 @@ module Kitchen
       end
 
       def copy_key()
-        cmd = "mkdir /wpars/#{config[:wpar_name]}/.ssh;"
-        cmd += "chmod 700 /wpars/#{config[:wpar_name]}/.ssh"
+        cmd = "#{config[:sudo]} mkdir /wpars/#{config[:wpar_name]}/.ssh;"
+        cmd += "#{config[:sudo]} chmod 700 /wpars/#{config[:wpar_name]}/.ssh"
         ssh_command(cmd, :stderr)
-        cmd="cp ~/.ssh/authorized_keys /wpars/#{config[:wpar_name]}/.ssh"
+        cmd="#{config[:sudo]} cp ~/.ssh/authorized_keys /wpars/#{config[:wpar_name]}/.ssh"
         ssh_command(cmd, :stderr)
       end
 
       def wpar_exists?(state)
-        output=ssh_command("#{config[:lswpar]} #{config[:wpar_name]}", :stderr)
+        output=ssh_command("#{config[:sudo]} #{config[:lswpar]} #{config[:wpar_name]}", :stderr)
         if output.include?('0960-419')
           return false
         end
@@ -140,7 +149,7 @@ module Kitchen
       # Determines if the sshd service is defined in the WPAR.
       def sshd_service_exists?
         # FIXME: We should probably check exit status rather than AIX-specific error codes.
-        output=ssh_command("#{config[:clogin]} #{config[:wpar_name]} #{config[:lssrc]} -s sshd", :stderr)
+        output=ssh_command("#{config[:sudo]} #{config[:clogin]} #{config[:wpar_name]} #{config[:lssrc]} -s sshd", :stderr)
         if output.include?('0513-085') # 0513-085 The sshd Subsystem is not on file.
           return false
         end
@@ -150,7 +159,7 @@ module Kitchen
       # Creates an sshd service.
       def create_sshd_service
         # FIXME: We should probably check exit status rather than AIX-specific error codes.
-        output=ssh_command("#{config[:clogin]} #{config[:wpar_name]} #{config[:mkssys]} -s sshd -p /usr/sbin/sshd -a '-D' -u 0 -S -n 15 -f 9 -R -G local", :stderr)
+        output=ssh_command("#{config[:sudo]} #{config[:clogin]} #{config[:wpar_name]} #{config[:mkssys]} -s sshd -p /usr/sbin/sshd -a '-D' -u 0 -S -n 15 -f 9 -R -G local", :stderr)
         if output.include?('0513-071') # 0513-071 The sshd Subsystem has been added.
           return true
         end
@@ -160,7 +169,7 @@ module Kitchen
       # Determines if the sshd service is running.
       def sshd_service_running?
         # FIXME: We should probably check exit status rather than AIX-specific error codes.
-        output=ssh_command("#{config[:clogin]} #{config[:wpar_name]} #{config[:lssrc]} -s sshd", :stderr)
+        output=ssh_command("#{config[:sudo]} #{config[:clogin]} #{config[:wpar_name]} #{config[:lssrc]} -s sshd", :stderr)
         if output.include?('active')
           return true
         end
@@ -170,7 +179,7 @@ module Kitchen
        # Starts the sshd service.
       def start_sshd_service
         # FIXME: We should probably check exit status rather than AIX-specific error codes.
-        output=ssh_command("#{config[:clogin]} #{config[:wpar_name]} #{config[:startsrc]} -s sshd", :stderr)
+        output=ssh_command("#{config[:sudo]} #{config[:clogin]} #{config[:wpar_name]} #{config[:startsrc]} -s sshd", :stderr)
         if output.include?('0513-059') # 0513-059 The sshd Subsystem has been started. Subsystem PID is 2688212.
           return true
         end
@@ -181,8 +190,8 @@ module Kitchen
       # This includes account and session rules.
       def pam_supports_sshd?
         pam_config_path = "/wpars/#{config[:wpar_name]}/etc/pam.conf"
-        account_output=ssh_command("grep '#{config[:pam_sshd_account_rule]}' #{pam_config_path}", :stderr)
-        session_output=ssh_command("grep '#{config[:pam_sshd_session_rule]}' #{pam_config_path}", :stderr)
+        account_output=ssh_command("#{config[:sudo]} grep '#{config[:pam_sshd_account_rule]}' #{pam_config_path}", :stderr)
+        session_output=ssh_command("#{config[:sudo]} grep '#{config[:pam_sshd_session_rule]}' #{pam_config_path}", :stderr)
 
         unless account_output.include?("#{config[:pam_sshd_account_rule]}")
           return false
@@ -199,7 +208,7 @@ module Kitchen
         pam_config_path = "/wpars/#{config[:wpar_name]}/etc/pam.conf"
         pam_sshd_rules = "#{config[:pam_sshd_account_rule]}\\n#{config[:pam_sshd_session_rule]}"
         header = "\\n\\n# sshd Rules\\n"
-        cmd = "#{config[:echo]} \"#{header}#{pam_sshd_rules}\" >> #{pam_config_path}"
+        cmd = "#{config[:sudo]} #{config[:echo]} \"#{header}#{pam_sshd_rules}\" >> #{pam_config_path}"
         ssh_command(cmd, :stderr)
       end
 

data/lib/kitchen/driver/wpar_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Wpar Kitchen driver
-    WPAR_VERSION = "0.4.1"
+    WPAR_VERSION = "0.4.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-wpar
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Alain Dejoux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: test kitchen driver using AIX wpar