kitchen-wpar 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afa57801e169dc52a54a101f9c69be57b242d551
-  data.tar.gz: 03096da58cdb37af094edb4eaa60b905ea6d5cb3
+  metadata.gz: 3e0233ac43573699543e48d649035f5ea153d90d
+  data.tar.gz: eddc62479f83d58ce5f14dc6eb2b06f35fb7ffc2
 SHA512:
-  metadata.gz: 66ee5dc1546e8fbbe217d08e51ba23a21ae7ed3eeec073d88b1cd80a73f50e182ad83765afb05d0455479c41b9aebd2c005dd18cc59c93a04398cec1e1dc1011
-  data.tar.gz: 50da5618019029bb93c305355faf619e6c592a6f17025d691336477c8ec1e95df08914788809dfb18cd1703d21595a01888d4970bddea1df3d8cd4b8006586e1
+  metadata.gz: 33071aa96867e62f3f54c0982a7d202ade59f421fa00487c124703604b4ed93343a0d6a6064628a0e2d08a7e64e3926b621dba9fffab4f635fe6a137484694ce
+  data.tar.gz: 7c2dff031be297cac01ccaf67fc2e3b8a85653ead8026c6aa0b502fae2c8b67dd4f7b72a700a52ed621cee1804e366bc12e2f9996938b8eaff48ce7f4f1d6b40

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.1
+
+* Add mkwpar option ' -t' which copies root file systems from global WPAR
+
 ## 0.1.0 / Unreleased
 
 * Initial release

data/README.md

@@ -21,6 +21,7 @@ Please read the [Driver usage][driver_usage] page for more details.
 * **wpar_vg**	      Volume group to use to store shared wpar filesystems. Default to **rootvg**.
 * **wpar_rootvg**	  Specify the `hdisk` to use to create a rootvg system wpar.
 * **wpar_mksysb**	  uses a wpar backup. Specify a path to a backup to save time.
+* **wpar_copy_rootvg**	  adds the option ' -t' to copy rootvg file systems.
 * **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. 
 

data/lib/kitchen/driver/wpar.rb

@@ -38,10 +38,19 @@ module Kitchen
       default_config :rmwpar, '/usr/sbin/rmwpar'
       default_config :lswpar, '/usr/sbin/lswpar'
       default_config :wpar_name, 'kitchenwpar'
+      default_config :wpar_copy_rootvg, false
       default_config :aix_host, 'localhost'
       default_config :aix_user, 'root'
       default_config :isWritable, false
       default_config :isVersioned, false
+      default_config :echo, '/bin/echo'
+      default_config :clogin, '/usr/sbin/clogin'
+      default_config :lssrc, '/usr/bin/lssrc'
+      default_config :mkssys, '/usr/bin/mkssys'
+      default_config :startsrc, '/usr/bin/startsrc'
+      default_config :stopsrc, '/usr/bin/stopsrc'
+      default_config :pam_sshd_account_rule, 'sshd account required pam_aix'
+      default_config :pam_sshd_session_rule, 'sshd session required pam_aix'
 
       def create(state)
         if wpar_exists?(state)
@@ -56,12 +65,19 @@ module Kitchen
         end
         state[:hostname]= config[:wpar_address] || config[:wpar_name]
         copy_key()
-      end
 
-      def destroy(state)
-        ssh_command("#{config[:rmwpar]} -F #{config[:wpar_name]}", :stderr)
-        if wpar_exists?(state)
-          raise ActionFailed, "couldn't destroy wpar !"
+        # Ensure sshd is a defined service and is running so that
+        # kitchen can connect to the host and do work.
+        unless sshd_service_exists?
+          create_sshd_service
+        end
+
+        unless sshd_service_running?
+          start_sshd_service
+        end
+
+        unless pam_supports_sshd?
+          configure_pam
         end
       end
 
@@ -88,6 +104,10 @@ module Kitchen
           cmd += " -B #{config[:wpar_mksysb]}"
         end
 
+        if config[:wpar_copy_rootvg]
+          cmd += ' -t'
+        end
+
         if config[:isWritable]
           cmd += ' -l'
         end
@@ -112,6 +132,72 @@ module Kitchen
         true
       end
 
+      # 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)
+        if output.include?('0513-085') # 0513-085 The sshd Subsystem is not on file.
+          return false
+        end
+        true
+      end
+
+      # 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)
+        if output.include?('0513-071') # 0513-071 The sshd Subsystem has been added.
+          return true
+        end
+        false
+      end
+
+      # 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)
+        if output.include?('active')
+          return true
+        end
+        false # Status == inoperative
+      end
+
+       # 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)
+        if output.include?('0513-059') # 0513-059 The sshd Subsystem has been started. Subsystem PID is 2688212.
+          return true
+        end
+        false
+      end
+
+      # Determines if PAM support for sshd exists in this WPAR.
+      # 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)
+
+        unless account_output.include?("#{config[:pam_sshd_account_rule]}")
+          return false
+        end
+        unless session_output.include?("#{config[:pam_sshd_session_rule]}")
+          return false
+        end
+
+        true
+      end
+
+      # Configures PAM support for sshd in the WPAR.
+      def configure_pam
+        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}"
+        ssh_command(cmd, :stderr)
+      end
+
       def ssh_command(cmd, stream)
         out = ''
         begin

data/lib/kitchen/driver/wpar_version.rb

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

data/test/wpar_spec.rb

@@ -75,6 +75,13 @@ describe Kitchen::Driver::Wpar do
       expect(driver.send(:build_mkwpar_command)).to eq(default_string)
     end
 
+    it 'sets wpar_copy_rootvg to true' do
+      config[:wpar_copy_rootvg] = true
+      default_string = '/usr/sbin/mkwpar -s -n kitchenwpar -t'
+
+      expect(driver.send(:build_mkwpar_command)).to eq(default_string)
+    end
+
     it 'sets isWritable to false' do
       config[:isWritable] = false
       default_string = '/usr/sbin/mkwpar -s -n kitchenwpar'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-wpar
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Alain Dejoux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-07-06 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.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: test kitchen driver using AIX wpar