kitchen-joyent 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cdddcc9d9b8dbc4e5e0cd5122911ad74c6f924c
-  data.tar.gz: 8841635f4ff25fa656f24ae1aa6598809c4d6960
+  metadata.gz: 17150f45297853ee4ce3fc3fe3bc45fb56c147d6
+  data.tar.gz: 544dff8f6217b29abeddf1dada5b74d96adb2a66
 SHA512:
-  metadata.gz: 8240fd9d670c4d3ec0470c9317f79982893e04cb2b313eab4097f07e1db84131e52e8471b459b6436ad7f4df0d5141ddf7c1688a529b0dec1a16bd63a468998f
-  data.tar.gz: c759a4aeb60051d8f3f3d6e684b8701a92eaeed6b21dd9809192b2f987eed6e68f9add5a2e67de2de5e5d3ecc5bf8415624e1828a3df1296001224ee494de53c
+  metadata.gz: e6c3d39da70ff3764ab0f279505a447f0bdb7ee6c7ec7eb29d93d6d296a526440cef8312dcca494dbccff4b06f3e707e4d7d12b9fedfb751fedb06e55bfaa729
+  data.tar.gz: 20e69c3c9ab1ea9a784ae3e06d2a746fb508f828487217a9f263a41082e748a0c20753e09d910a0a03d9c341acffa659b6d0f85810355ec512aa1f5baa169b5b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.2.1 (2015-03-10)
+-------------------
+- Dropping invalid characters for joyent_image_name
+- Allowing API version to be specified
+
 v0.2.0 (2015-03-02)
 -------------------
 - Allow self-signed certificate on server via joyent_ssl_verify_peer

data/README.md

@@ -33,31 +33,36 @@ to override the Chef bootstrap script.
       chef_omnibus_url: http://path.to.an.script.sh
 
 ## Optional Attributes
-Under `platforms` section:
-
-    driver_config:
-      # Allow self-signed certs.
-      #
-      joyent_ssl_verify_peer: false
-      
-      # For additional nics
-      #
-      joyent_networks:
-        - d2ba0f30-bbe8-11e2-a9a2-6bc116856d85
-        - a3a84a44-766c-407e-9233-9a45ebcd579f
-        
-      # For images without a default network (will throw error if invalid)
-      # NOTE: Don't use 'joyent_networks' if using this attribute.
-      #
-      joyent_default_networks:
-        - d2ba0f30-bbe8-11e2-a9a2-6bc116856d85
-        - a3a84a44-766c-407e-9233-9a45ebcd579f
-        
-Under `suites` section:
+Under the general `driver_config`:
+````
+# Specify Joyent API version
+joyent_version: '~7.0'
+
+# Allow self-signed certs.
+joyent_ssl_verify_peer: false
+````
+Usually under `platforms` section:
+````
+driver_config:
 
-    driver_config:
-      joyent_image_name: default01
+  # For additional nics
+  # NOTE: Requires Joyent API version >= 7.0
+  joyent_networks:
+    - d2ba0f30-bbe8-11e2-a9a2-6bc116856d85
+    - a3a84a44-766c-407e-9233-9a45ebcd579f
+    
+  # Where to pull IP's from by default (internal/external)
+  joyent_default_networks:
+    - internal
+```
+Usually under `suites` section:
+```
+driver_config:
 
+  # Friendly machine name
+  # Valid Chracters =~ /0-9A-Za-z\.-/
+  joyent_image_name: default01
+```
 # Example .kitchen.yml
 
 ```

data/lib/kitchen/driver/joyent.rb

@@ -32,6 +32,7 @@ module Kitchen
       default_config :joyent_image_id, '87b9f4ac-5385-11e3-a304-fb868b82fe10'
       default_config :joyent_image_name, ''
       default_config :joyent_flavor_id, 'g3-standard-4-smartos'
+      default_config :joyent_version, '~6.5'
       default_config :joyent_networks, []
       default_config :joyent_default_networks, []
       default_config :joyent_ssl_verify_peer, true
@@ -75,6 +76,7 @@ module Kitchen
           joyent_keyname:         config[:joyent_keyname],
           joyent_keyfile:         config[:joyent_keyfile],
           joyent_url:             config[:joyent_url],
+          joyent_version:         config[:joyent_version],
           connection_options:     {
                                     ssl_verify_peer: config[:joyent_ssl_verify_peer],
                                   },
@@ -89,12 +91,16 @@ module Kitchen
         compute_def = {
           dataset:          config[:joyent_image_id],
           package:          config[:joyent_flavor_id],
-          name:             config[:joyent_image_name],
+          name:             config[:joyent_image_name].gsub!(/_/, '-').gsub!(/[^0-9A-Za-z\.-]/, ''),
         }
         
+        # Requires "joyent_version" >= 7.0
         if config[:joyent_networks].any?
           compute_def[:networks] = config[:joyent_networks]
-        elsif config[:joyent_default_networks].any?
+        end
+        
+        # "internal" and/or "external"
+        if config[:joyent_default_networks].any?
           compute_def[:default_networks] = config[:joyent_default_networks]
         end
 
@@ -105,6 +111,7 @@ module Kitchen
         debug("joyent: joyent_url #{config[:joyent_url]}")
         debug("joyent: image_id #{config[:joyent_image_id]}")
         debug("joyent: flavor_id #{config[:joyent_flavor_id]}")
+        debug("joyent: version #{config[:joyent_version]}")
         
         unless config[:joyent_image_name].length == 0
           debug("joyent: image_name #{config[:joyent_image_name]}")

data/lib/kitchen/driver/joyent_version.rb

@@ -20,6 +20,6 @@ module Kitchen
   # Kitchen
   module Driver
     # Version string for Joyent Kitchen provider
-    JOYENT_VERSION = '0.2.0'
+    JOYENT_VERSION = '0.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-joyent
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen