kitchen-ansiblepush 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0547589c17d78e5d24ceeb92a062a44397a73f5
-  data.tar.gz: 778c772b723538a3c42d97f7acff1ff1fa97bf0f
+  metadata.gz: c7b7a7c54d6db3032fafdec0df791c8c5218917b
+  data.tar.gz: 06cd24f0c08c3960d6b718ae92e2baa52b816efe
 SHA512:
-  metadata.gz: 47e15370cfa899c16bd097d8916353522ab87298f543e64bf39d82a2b8ccd294b50f191421ba8d9c4c2ddb305a41b14cf45dfdb11287ae7b0a0170cad7b52110
-  data.tar.gz: 7a3b3686587cf196df57d014779734bd85e10301f8010d622cb57feba7f9093e257dfe24f65f946ada5e46a244fdf1c6812b6eb0361c32f2ca86bbb7013a4315
+  metadata.gz: f27af40952e7f1a8e6a284972c92e211e3795de71167e94a6c68d0eb599cfac822b21cfb24cf2236e9ba6210516a3d8522279dd5dc08192d11bcb3ec1b446122
+  data.tar.gz: 7d1186dcd96c12611a20f91e62c7a96454c462d37d817cd4c849ff053db4ec3ee4b9c490d763a6843d15397f4d2b317bd14d68670da65be02175e061e9b83bf3

data/README.md

@@ -8,23 +8,23 @@ A test-kitchen plugin that adds the support for ansible in push mode
 ## Intro
 This kitchen plugin adds ansible as a provisioner in push mode. Ansible will run from your host rather than run from guest machines.  
 
-## How to install 
+## How to install
 
 ### Ruby gem
 ```
 gem install kitchen-ansiblepush
 ```
 
-### To install from code 
-``` 
+### To install from code
+```
 git clone git@github.com:ahelal/kitchen-ansiblepush.git
 cd kitchen-ansiblepush
 gem build kitchen-ansiblepush.gemspec
 gem install kitchen-ansiblepush-<version>.gem
 ```
 
-### Use Bundler 
-My prefered method is use Gemfile 
+### Use Bundler
+My prefered method is use Gemfile
 
 ```ruby
 source "https://rubygems.org"
@@ -53,7 +53,7 @@ provisioner         :
     skip_tags           : [ "notme", "orme" ]
     start_at_task       : [ "five" ]
     # Hash of other groups
-    groups              : 
+    groups              :
          db             :
             - db01
     sudo                : true
@@ -87,11 +87,30 @@ You can use venv and install multi version of ansible or if you prefer you can u
 For further example you can check a matrix test [ansible-usermanage](https://github.com/AutomationWithAnsible/ansible-usermanage/blob/master/.kitchen.yml)
 
 ## Disable chef installation
-By default chef is installed and serverspec stuff. if you dont want to install 
+By default chef is installed and serverspec stuff. if you dont want to install
 ```yaml
 chef_bootstrap_url: nil
 ```
+## Instance name
+Ansible push generates inventory dynamically you have multipule options to name your instance
+*use_instance_name* 
+*custom_instance_name*
+
 
+## Windows support
+Kitchen ansiblepush has experimantal support.
+to enable windows support you need to add the following to your .kitchen.yml
+```yaml
+...
+transport:
+     name: winrm
+     winrm_transport: negotiate
+provisioner:
+    name                  : ansible_push
+    chef_bootstrap_url    : nil
+    ansible_connection    : "winrm"
+...
+```
 ## Pattern of usage
 You can use ansible push  with different pattern. I will list some of the ways that I use it, But by no means they are the only patterns.
 ### Roles
@@ -131,5 +150,3 @@ tests
 ## TODO
 - Enable envirionment var ANSIBLE_CALLBACK_WHITELIST="changes" before call
 - Tests (PRs for tests is highligh appreciated)
-
-

data/lib/kitchen/provisioner/ansible_push.rb

@@ -41,6 +41,7 @@ module Kitchen
       default_config :idempotency_test, false
       default_config :fail_non_idempotent, true
       default_config :use_instance_name, false
+      default_config :ansible_connection, "smart"
 
       # For tests disable if not needed
       default_config :chef_bootstrap_url, 'https://omnitruck.chef.io/install.sh'
@@ -74,7 +75,6 @@ module Kitchen
           raise 'ansible extra_vars is in valid type: %s value: %s' % [config[:extra_vars].class.to_s, config[:extra_vars].to_s] unless extra_vars_is_valid
         end
         info('Ansible push config validated')
-
         @validated_config = config
       end
 
@@ -141,9 +141,18 @@ module Kitchen
       def prepare_command
         prepare_inventory if conf[:generate_inv]
         # Place holder so a string is returned. This will execute true on remote host
-        'true'
+        true_command
       end
 
+     def true_command
+       # Place holder so a string is returned. This will execute true on remote host
+       if conf[:ansible_connection] == "winrm"
+          '$TRUE'
+       else
+          'true'
+       end
+     end
+
       def install_command
         # Must install chef for busser and serverspec to work :(
         info('*************** AnsiblePush install_command ***************')
@@ -160,13 +169,16 @@ module Kitchen
       end
 
       def chef_installation(chef_url, omnibus_download_dir, transport)
-        if chef_url
+
+        if chef_url && (chef_url != 'nil') # ignore string nil
           scripts = []
           scripts << Util.shell_helpers
           scripts << chef_installation_script(chef_url, omnibus_download_dir, transport)
           <<-INSTALL
             sh -c '#{scripts.join("\n")}'
           INSTALL
+        else
+          true_command
         end
       end
 
@@ -205,7 +217,7 @@ module Kitchen
         info('*************** AnsiblePush end run *******************')
         debug("[#{name}] Converge completed (#{conf[:sleep]}s).")
         # Place holder so a string is returned. This will execute true on remote host
-        'true'
+        true_command
       end
 
       protected
@@ -230,12 +242,16 @@ module Kitchen
       def prepare_inventory
         if instance_connection_option.nil?
           hostname =  machine_name
-        else
-          hostname =  instance_connection_option[:hostname]
+        elsif not instance_connection_option()[:hostname].nil?
+            instance_connection_option()[:hostname]
+        elsif not instance_connection_option()[:endpoint].nil?
+          require 'uri'
+          urlhost = URI.parse(instance_connection_option()[:endpoint])
+          hostname = urlhost.host
         end
         debug("hostname='#{hostname}")
         # Generate hosts
-        hosts = generate_instance_inventory(machine_name, hostname, conf[:mygroup], instance_connection_option)
+        hosts = generate_instance_inventory(machine_name, hostname, conf[:mygroup], instance_connection_option, conf[:ansible_connection])
         write_var_to_yaml("#{TEMP_INV_DIR}/ansiblepush_host_#{machine_name}.yml", hosts)
         # Generate groups (if defined)
         write_var_to_yaml(TEMP_GROUP_FILE, conf[:groups]) if conf[:groups]

data/lib/kitchen-ansible/util_inventory.rb

@@ -1,4 +1,3 @@
-
 TEMP_INV_DIR = '.kitchen/ansiblepush'.freeze
 TEMP_GROUP_FILE = "#{TEMP_INV_DIR}/ansiblepush_groups_inventory.yml".freeze
 
@@ -9,11 +8,12 @@ def write_var_to_yaml(yaml_file, hash_var)
   end
 end
 
-def generate_instance_inventory(name, host, mygroup, instance_connection_option)
+def generate_instance_inventory(name, host, mygroup, instance_connection_option, ansible_connection)
   unless instance_connection_option.nil?
     port = instance_connection_option[:port]
     keys = instance_connection_option[:keys]
     user = instance_connection_option[:user]
+    pass = instance_connection_option[:pass]
   end
 
   temp_hash = {}
@@ -21,6 +21,12 @@ def generate_instance_inventory(name, host, mygroup, instance_connection_option)
   temp_hash['ansible_ssh_port'] = port if port
   temp_hash['ansible_ssh_private_key_file'] = keys[0] if keys
   temp_hash['ansible_ssh_user'] = user if user
+  temp_hash['ansible_ssh_pass'] = pass if pass
   temp_hash['mygroup'] = mygroup if mygroup
+  # Windows issue ignore SSL
+  if ansible_connection == 'winrm'
+    temp_hash['ansible_winrm_server_cert_validation'] = 'ignore'
+    temp_hash['ansible_winrm_transport'] = 'ssl'
+  end
   { name => temp_hash }
 end

data/lib/kitchen-ansible/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module AnsiblePush
-    VERSION = '0.4.0'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ansiblepush
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Adham Helal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |+
@@ -69,13 +69,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- bin/kitchen-ansible-inventory
 - callback/changes.py
 - kitchen-ansiblepush.gemspec
 - lib/kitchen-ansible/chef_installation.rb
 - lib/kitchen-ansible/util_inventory.rb
 - lib/kitchen-ansible/version.rb
 - lib/kitchen/provisioner/ansible_push.rb
-- bin/kitchen-ansible-inventory
 homepage: https://github.com/ahelal/kitchen-ansiblepush
 licenses:
 - MIT
@@ -86,17 +86,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: '[none]'
-rubygems_version: 2.0.14.1
+rubyforge_project: "[none]"
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: ansible provisioner for test-kitchen