kitchen-openstack 5.0.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed10521f2bd0acc22db46ff87e0279f2d919fbd66ed6a6088e4825d8a75c5d84
-  data.tar.gz: a0875746a6229f500b4c4e68e68f875527b1b5c90e0ab2616d79dc4035c2147f
+  metadata.gz: d3c139f8629d8896b075e11cb86e24e39895b8d98f82fe252577b781a1181f65
+  data.tar.gz: 178e6d4f4fbdc151d8cb90a3a9073f39901aab259b35955a970d1152fc4b3e2f
 SHA512:
-  metadata.gz: d46edbaac847718f7e3a9559c6003f91703bc5fd67c5d4609eab25dc6a0e0e54b495da0293a0f97746862fc0f04ccec675bdc118c2d89973910925b43ad1d81d
-  data.tar.gz: c4702f11e45567513496170e0283802929c5b7802186e6d3c14b80819130b1579231a59b263b4c3bfd3197cc5c5c6716c3dde032494d5e764626c05a279f6296
+  metadata.gz: ab2a070947110663f54193aa73379f5740ec0bc353f962e4523fcc1cd721382f216db25f97a0d1199ba22208126543460fbd76e2da63493c88884f1f956fe6b4
+  data.tar.gz: 4d1f3d1d6f753183beabf8493c87335fd7e42485d6e889410ed4e115031c5480e7fab107a7419b6166797a081ff67a293692fd7fc27598368f31eb890377108d

data/README.md

@@ -1,9 +1,7 @@
 # <a name="title"></a> Kitchen::OpenStack: A Test Kitchen Driver for OpenStack
 
 [![Gem Version](https://img.shields.io/gem/v/kitchen-openstack.svg)][gem]
-[![Build Status](https://img.shields.io/travis/test-kitchen/kitchen-openstack.svg)][travis]
-[![Code Climate](https://img.shields.io/codeclimate/github/test-kitchen/kitchen-openstack.svg)][codeclimate]
-[![Coverage Status](https://img.shields.io/coveralls/test-kitchen/kitchen-openstack.svg)][coveralls]
+![CI](https://github.com/test-kitchen/kitchen-openstack/workflows/CI/badge.svg)
 
 A [Test Kitchen][kitchen_ci] Driver for [OpenStack][openstack_web].
 
@@ -21,6 +19,12 @@ There are **no** external system requirements for this driver. However you will
 
 ## Installation and Setup
 
+This plugin ships out of the box with Chef Workstation, which is the easiest way to make sure you always have the latest testing dependencies in a single package.
+
+[Download Chef Workstation](https://downloads.chef.io/tools/workstation) to get started
+
+### Manual Installation
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -39,12 +43,6 @@ Or install it yourself as:
 $ gem install kitchen-openstack
 ```
 
-Or if using [chefdk][chefdk_dl] install with:
-
-```bash
-$ chef gem install kitchen-openstack
-```
-
 ## Minimum Configuration
 
 ```yaml
@@ -180,7 +178,7 @@ security_groups:
 
 ### user\_data
 
-If your vms have `cloud-init` enabled you can use the `user_data` in your
+If your VMs have `cloud-init` enabled you can use the `user_data` in your
 kitchen.yml to inject commands at boot time.
 
 ```
@@ -196,9 +194,28 @@ for example:
 echo "do whatever you want to pre-configure your machine"
 ```
 
+### cloud\_config
+
+If your VMs have `cloud-init` enabled you can use `cloud_config` to generate userdata for use by cloud-init in the [cloud-config format](https://cloudinit.readthedocs.io/en/latest/topics/format.html#cloud-config-data). This provides a convenient way to specify cloud-init config inline. As the cloud-config format uses YAML the resulting userdata is essentially a copy+paste of `cloud_config` with the header line '#cloud-config'
+
+```
+    driver_config:
+      cloud_config:
+        hostname: my-hostname
+```
+
+This will pass the following user data to OpenStack:
+
+```
+#cloud-config
+hostname: my-hostname
+```
+
+The `cloud_config` and `user_data` options are mutually exclusive.
+
 ### config\_drive
 
-If your vms require config drive.
+If your VMs require config drive.
 
 ```
     config_drive: true
@@ -452,10 +469,6 @@ Apache 2.0 (see [LICENSE][license])
 
 
 [gem]: https://rubygems.org/gems/kitchen-openstack
-[travis]: https://travis-ci.org/test-kitchen/kitchen-openstack
-[codeclimate]: https://codeclimate.com/github/test-kitchen/kitchen-openstack
-[coveralls]: https://coveralls.io/r/test-kitchen/kitchen-openstack
-[gemnasium]: https://gemnasium.com/test-kitchen/kitchen-openstack
 
 [author]:           https://github.com/RoboticCheese
 [maintainer]:       https://github.com/jjasghar
@@ -463,8 +476,7 @@ Apache 2.0 (see [LICENSE][license])
 [license]:          https://github.com/test-kitchen/kitchen-openstack/blob/master/LICENSE.txt
 [repo]:             https://github.com/test-kitchen/kitchen-openstack
 [driver_usage]:     https://github.com/test-kitchen/kitchen-openstack
-[chef_omnibus_dl]:  http://www.chef.io/chef/install/
-[chefdk_dl]:        https://downloads.chef.io/chef-dk
+[chef_omnibus_dl]:  https://downloads.chef.io/tools/infra-client
 [kitchen_ci]:       http://kitchen.ci
 
 [openstack_web]:    http://www.openstack.org

data/lib/kitchen/driver/openstack.rb

@@ -1,4 +1,3 @@
-# Encoding: UTF-8
 # frozen_string_literal: true
 
 #
@@ -22,7 +21,8 @@
 
 require "kitchen"
 require "fog/openstack"
-require "ohai"
+require "ohai" unless defined?(Ohai::System)
+require "yaml"
 require_relative "openstack_version"
 require_relative "openstack/volume"
 
@@ -201,6 +201,12 @@ module Kitchen
           server_def[c] = optional_config(c) if config[c]
         end
 
+        if config[:cloud_config]
+          raise(ActionFailed, "Cannot specify both cloud_config and user_data") if config[:user_data]
+
+          server_def[:user_data] = Kitchen::Util.stringified_hash(config[:cloud_config]).to_yaml.gsub(/^---\n/, "#cloud-config\n")
+        end
+
         # Can't use the Fog bootstrap and/or setup methods here; they require a
         # public IP address that can't be guaranteed to exist across all
         # OpenStack deployments (e.g. TryStack ARM only has private IPs).
@@ -412,7 +418,7 @@ module Kitchen
       end
 
       def disable_ssl_validation
-        require "excon"
+        require "excon" unless defined?(Excon)
         Excon.defaults[:ssl_verify_peer] = false
       end
 
@@ -442,7 +448,7 @@ module Kitchen
         if name.start_with?("/") && name.end_with?("/")
           regex = Regexp.new(name[1...-1])
           # check for regex name match
-          collection.each { |single| return single if regex =~ single.name }
+          collection.each { |single| return single if regex&.match?(single.name) }
         else
           # check for exact id match
           collection.each { |single| return single if single.id == name }

data/lib/kitchen/driver/openstack/volume.rb

@@ -1,4 +1,3 @@
-# Encoding: UTF-8
 # frozen_string_literal: true
 
 #

data/lib/kitchen/driver/openstack_version.rb

@@ -1,11 +1,10 @@
-# Encoding: UTF-8
 # frozen_string_literal: true
 
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
 # Copyright (C) 2013-2015, Jonathan Hartman
-# Copyright (C) 2015-2020, Chef Software Inc
+# Copyright (C) 2015-2021, Chef Software Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,6 +23,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    OPENSTACK_VERSION = "5.0.1"
+    OPENSTACK_VERSION = "6.0.0"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Jonathan Hartman
 - JJ Asghar
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -159,7 +159,7 @@ homepage: https://github.com/test-kitchen/kitchen-openstack
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -167,15 +167,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A Test Kitchen OpenStack Nova driver
 test_files: []