vagrant-smartos-zones 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1df692477b2ec1b9b16af72471943afc89c47e56
-  data.tar.gz: 896cd4b6f1731874af686af0c7e197bf593dfd27
+  metadata.gz: b23f15194df8189c39b2ed6a4d757e9948497185
+  data.tar.gz: 0fb7e83e3bb27d84cf743ce303ef2a9401f864e6
 SHA512:
-  metadata.gz: 6e9ff7c4b39346cd7daf63b95e14a6a1041c8f3c12235cf86f73ac560d038bd5e5e99a3b9be6b91d187691a817ef7b6220ae8cce21864690eb7f430c76645106
-  data.tar.gz: 3fd14dd777071cc407a25801367fd5f4ecfc35365f20a7ed0d3ad4ec621024580707b1106687e1b18bb6650f26f0bc57f3ec69072a69b730f760e84db0ccbfa5
+  metadata.gz: 19c63f89d059f8aca3098414f774e86e3eb83d1fc7986cf63e22b6e11117817696a6138e3091a09dd6b27c95b78e69f17f394bafe2293b80139b711e1d302ed9
+  data.tar.gz: 54489755d0f804f002127bfeccf1b971b13c9d993746b8d348b87d3ba5630a43eaa71215e852498685e5b784d899f615958b00bdfba72a24fba7f07372d8466d

data/README.md

@@ -114,6 +114,14 @@ vagrant zones start [name]
 vagrant zones stop [name]
 ```
 
+Export a running zone as a dataset (image) in the local file system:
+
+```bash
+vagrant dataset create [zone] [identifier]
+vagrant dataset delete [identifier]
+vagrant dataset list
+```
+
 ## Single zone usage
 
 When a single zone is configured (currently the only configuration
@@ -232,19 +240,6 @@ group with which to connect. This user should have `Primary
 Administrator` privileges. When creating a local zone, a `vagrant`
 user and group are also created in the zone.
 
-## Tests
-
-There is a basic test suite that uses `test-kitchen` to converge
-different brands of zones. Although it might not be comprehensive, it
-should be ran after new features or after any significant refactoring to
-ensure that nothing breaks the ability to stand up a zone.
-
-```bash
-bundle exec kitchen test
-```
-
-This may take a while...
-
 ## Plugin configuration
 
 The plugin allows for local configuration through the `vagrant zones
@@ -264,6 +259,9 @@ networks. For this reason, the network chosen by the plugin when
 configuring the Global Zone and its local zone can be globally
 overridden.
 
+Since this is a facet of your current location and not of the box
+itself, this is configured in the plugin rather than in the Vagrantfile.
+
 ```bash
 vagrant zones config network 10.0.0.0/24
 ```
@@ -274,6 +272,33 @@ create zones. It should be pretty obvious when this is the case.
 
 * Does your network overlap with VirtualBox's local network space?
 
+### Using local zone images
+
+When running vagrant from a location far away from where SmartOS images
+are hosted (anywhere other than the east coast of the USA, basically),
+setting up a zone can be very slow.
+
+Zones can be modified in Vagrant, then exported locally to save time on
+repeated tasks. After modifying a zone, for instance by installing build
+tools, you can export the zone as follows (warning: this will take a
+while):
+
+```bash
+# vagrant dataset create [zone] [identifier]
+vagrant dataset create base64 base64-15.1.1-build-essential
+```
+
+The vagrant-smartos-zones plugin can be configured to use a local zone
+image in place of a remote one as follows:
+
+```bash
+vagrant zones config dataset.0edf00aa-0562-11e5-b92f-879647d45790 base64-15.1.1-build-essential
+```
+
+Now any Vagrantfile configured to use a local zone with the image
+0edf00aa-0562-11e5-b92f-879647d45790 will instead install and use the
+local image.
+
 ### Pkgsrc mirror
 
 ```bash
@@ -283,6 +308,19 @@ vagrant zones config local.pkgsrc http://mirror.domain.com
 This will replace the protocol and domain of the pkgsrc mirror used by
 pkgin in a SmartOS zone.
 
+## Tests
+
+There is a basic test suite that uses `test-kitchen` to converge
+different brands of zones. Although it might not be comprehensive, it
+should be ran after new features or after any significant refactoring to
+ensure that nothing breaks the ability to stand up a zone.
+
+```bash
+bundle exec kitchen test
+```
+
+This may take a while...
+
 ## References / Alternatives
 
 Any success of this project depends heavily on the work of others,

data/examples/Vagrantfile.lx

@@ -13,12 +13,11 @@ Vagrant.configure('2') do |config|
 
   config.ssh.insert_key = false
 
-  config.global_zone.platform_image = 'hourly-20141121'
-  config.global_zone.platform_image_url = 'https://us-east.manta.joyent.com/nahamu/public/smartos/platform-hourly.iso'
+  config.global_zone.platform_image = 'latest'
 
-  config.zone.name = 'lx'
+  config.zone.name = 'lx-ubuntu-14.04_20150415'  # images are available through https://images.joyent.com/images
   config.zone.brand = 'lx'
-  config.zone.image = 'b7493690-f019-4612-958b-bab5f844283e'
+  config.zone.image = '430da066-e3a7-11e4-9657-332a2dbdf565'
   config.zone.memory = 1536
   config.zone.disk_size = 5
 end

data/lib/vagrant/smartos/locales/en.yml

@@ -3,6 +3,17 @@ en:
     smartos:
       zones:
         commands:
+          dataset:
+            create: |-
+              Creating a new dataset %{dataset} from zone: %{uuid}
+            prepare_image: |-
+              Preparing zone for dataset
+            save: |-
+              Saving zone file system
+            start_zone: |-
+              Restarting zone
+            stop_zone: |-
+              Stopping zone
           zones:
             list: |-
               name                      state      uuid 

data/lib/vagrant/smartos/zones/cap/dataset/list.rb

@@ -0,0 +1,17 @@
+require 'vagrant/smartos/zones/util/datasets'
+
+module Vagrant
+  module Smartos
+    module Zones
+      module Cap
+        module Dataset
+          class List
+            def self.dataset_list(env)
+              Zones::Util::Datasets.new(env).list
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/smartos/zones/cap/imgadm_import.rb

@@ -1,4 +1,7 @@
 require 'vagrant/smartos/zones/cap/base'
+require 'vagrant/smartos/zones/models/dataset'
+require 'vagrant/smartos/zones/util/datasets/manifest'
+require 'vagrant/smartos/zones/util/zone_image'
 
 module Vagrant
   module Smartos
@@ -10,18 +13,46 @@ module Vagrant
           def execute
             return ui.info 'No zone image set, skipping import' unless image
 
-            installed = machine.communicate.gz_test("#{sudo} imgadm get #{image}")
+            if zone_image.install_override?
+              install
+            else
+              import
+            end
+          end
 
-            ui.info "Checking for zone image #{image}: #{installed ? 'installed' : 'not installed'}"
-            return if installed
+          private
 
-            ui.info '  Importing...'
+          def image
+            machine.config.zone.image
+          end
+
+          def import
+            ui.info "Zone image #{image}: installed" && return if installed?(image)
+            ui.info "  Importing zone image #{image}..."
             machine.communicate.gz_execute("#{sudo} imgadm sources -a https://updates.joyent.com")
             machine.communicate.gz_execute("#{sudo} imgadm import #{image}")
           end
 
-          def image
-            machine.config.zone.image
+          def installed?(uuid)
+            machine.communicate.gz_test("#{sudo} imgadm get #{uuid}")
+          end
+
+          def install
+            uuid = zone_image.override_uuid
+            ui.info "Swapping out image #{uuid} for #{image}"
+            ui.info "Zone image #{uuid}: installed" && return if installed?(uuid)
+            dataset = Models::Dataset.install(zone_image.override, machine)
+            machine.communicate.gz_upload(manifest.local_filename, manifest.remote_filename)
+            ui.info "  Unpacking #{uuid}..."
+            machine.communicate.gz_execute("#{sudo} imgadm install -m #{manifest.remote_filename} -f #{dataset.remote_filename}")
+          end
+
+          def manifest
+            @manifest ||= Util::Datasets::Manifest.new(zone_image.override, machine.env).load!
+          end
+
+          def zone_image
+            @zone_image ||= Util::ZoneImage.new(machine)
           end
         end
       end

data/lib/vagrant/smartos/zones/commands/dataset.rb

@@ -40,7 +40,8 @@ module Vagrant
 
           def create(zonename, dataset)
             with_zone(zonename) do |zone|
-              Models::Dataset.create(dataset, zone)
+              ui.info(I18n.t('vagrant.smartos.zones.commands.dataset.create', uuid: zone.uuid, dataset: dataset))
+              Models::Dataset.create(dataset, zone, zone.machine)
             end
           end
 

data/lib/vagrant/smartos/zones/communicator/smartos.rb

@@ -1,4 +1,5 @@
 require 'vagrant/smartos/zones/util/global_zone/connection'
+require 'vagrant/smartos/zones/util/rsync'
 
 module Vagrant
   module Smartos
@@ -10,6 +11,38 @@ module Vagrant
             super
           end
 
+          def gz_download(from, to = nil)
+            @logger.debug("Downloading from global zone: #{from} to #{to}")
+
+            if gz_rsync_connector.available?
+              gz_rsync_connector.download(from, to)
+            else
+              gz_scp_connect do |scp|
+                scp.download!(from, to) do |_ch, name, sent, total|
+                  percent = (sent.to_f / total) * 100
+                  print "#{name}: #{sent}/#{total} : #{percent.to_i}%\r"
+                  $stdout.flush
+                end
+              end
+            end
+          end
+
+          def gz_upload(from, to)
+            @logger.debug("Uploading to global zone: #{from} to #{to}")
+
+            if gz_rsync_connector.available?
+              gz_rsync_connector.upload(from, to)
+            else
+              gz_scp_connect do |scp|
+                scp.upload!(from, to) do |_ch, name, sent, total|
+                  percent = (sent.to_f / total) * 100
+                  print "#{name}: #{sent}/#{total} : #{percent.to_i}%\r"
+                  $stdout.flush
+                end
+              end
+            end
+          end
+
           # rubocop:disable Metrics/MethodLength
           def gz_execute(command, opts = {}, &block)
             opts = {
@@ -70,6 +103,15 @@ module Vagrant
             exit_status
           end
 
+          def gz_scp_connect
+            global_zone_connector.with_connection do |connection|
+              yield connection.scp
+            end
+          rescue Net::SCP::Error => e
+            raise Vagrant::Errors::SCPUnavailable if e.message =~ /\(127\)/
+            raise
+          end
+
           def gz_test(command, opts = nil)
             opts = { error_check: false }.merge(opts || {})
             gz_execute(command, opts) == 0
@@ -80,6 +122,10 @@ module Vagrant
           def global_zone_connector
             @global_zone_connector ||= Vagrant::Smartos::Zones::Util::GlobalZone::Connection.new(@machine, @logger)
           end
+
+          def gz_rsync_connector
+            @gz_rsync_connector ||= Vagrant::Smartos::Zones::Util::Rsync.new(global_zone_connector.connect)
+          end
         end
       end
     end

data/lib/vagrant/smartos/zones/models/dataset.rb

@@ -1,4 +1,6 @@
 require 'vagrant/smartos/zones/models/snapshot'
+require 'vagrant/smartos/zones/util/datasets'
+require 'vagrant/smartos/zones/util/datasets/manifest'
 require 'vagrant/smartos/zones/util/global_zone/helper'
 
 module Vagrant
@@ -8,18 +10,94 @@ module Vagrant
         class Dataset
           include Util::GlobalZone::Helper
 
+          attr_reader :name, :zone, :machine
+
+          def initialize(name, zone, machine)
+            @name = name
+            @zone = zone
+            @machine = machine
+          end
+
           def self.create(name, zone)
+            new(name, zone).create
+          end
+
+          def self.install(name, machine)
+            new(name, nil, machine).install
+          end
+
+          def create
+            Zones::Util::Datasets.new(machine.env).setup_smartos_directories
+            prepare_gz
+            # create_dataset
+            # download
+            write_manifest
+          end
+
+          def exists?
+            cmd = 'ls %s 2>/dev/null' % remote_filename
+            with_gz(cmd) do |output|
+              return true if output.strip == remote_filename
+            end
+            false
+          end
+
+          def install
+            prepare_gz
+            upload
+            self
+          end
+
+          def remote_filename
+            '/zones/vagrant/%s' % filename
+          end
+
+          private
+
+          def prepare_gz
+            with_gz('pfexec mkdir /zones/vagrant')
+            with_gz('pfexec chown vagrant:vagrant /zones/vagrant')
+          end
+
+          def create_dataset
+            return machine.ui.info('Dataset already exists in global zone') if exists?
             Models::Snapshot.around(zone) do
+              machine.ui.info(I18n.t('vagrant.smartos.zones.commands.dataset.prepare_image'))
               zone.zlogin('\'find /var/log -type f -exec truncate --size 0 {} \;\'')
               zone.zlogin('sm-prepare-image -y')
+              machine.ui.info(I18n.t('vagrant.smartos.zones.commands.dataset.stop_zone'))
               zone.stop
               Models::Snapshot.around(zone) do |snapshot|
-                cmd = 'pfexec /usr/bin/bash -l -c "/usr/sbin/zfs send %s | /usr/bin/bzip2 > /zones/%s.zfs.bz2"'
-                with_gz(zone.machine, cmd % [snapshot.path, name])
+                machine.ui.info(I18n.t('vagrant.smartos.zones.commands.dataset.save'))
+                cmd = 'pfexec /usr/bin/bash -l -c "/usr/sbin/zfs send %s | /usr/bin/bzip2 > %s"'
+                with_gz(cmd % [snapshot.path, remote_filename])
               end
             end
+            machine.ui.info(I18n.t('vagrant.smartos.zones.commands.dataset.start_zone'))
             zone.start
           end
+
+          def download
+            machine.ui.info 'Downloading %s' % filename
+            machine.communicate.gz_download(remote_filename, local_filename)
+          end
+
+          def upload
+            machine.ui.info 'Installing %s in global zone' % filename
+            machine.communicate.gz_upload(local_filename, remote_filename)
+          end
+
+          def write_manifest
+            Zones::Util::Datasets::Manifest.new(name, machine.env).write!
+          end
+
+          def filename
+            '%s.zfs.bz2' % name
+          end
+
+          def local_filename
+            machine.env.home_path.join('smartos', 'datasets', filename).to_s
+          end
         end
       end
     end

data/lib/vagrant/smartos/zones/plugin.rb

@@ -90,6 +90,11 @@ module Vagrant
           Cap::Zone::Stop
         end
 
+        host_capability 'bsd', 'dataset_list' do
+          require_relative 'cap/dataset/list'
+          Cap::Dataset::List
+        end
+
         host_capability 'bsd', 'platform_image_install' do
           require_relative 'cap/platform_image/install'
           Cap::PlatformImage::Install

data/lib/vagrant/smartos/zones/util/datasets/manifest.rb

@@ -0,0 +1,95 @@
+require 'securerandom'
+require 'vagrant/smartos/zones/util/datasets'
+
+module Vagrant
+  module Smartos
+    module Zones
+      module Util
+        class Datasets
+          class Manifest
+            attr_reader :name, :env
+
+            def initialize(name, env)
+              @name = name
+              @env = env
+            end
+
+            def write!
+              File.open(local_filename, 'w') do |f|
+                f.write to_json
+              end
+              self
+            end
+
+            def load!
+              json = JSON.load(File.read(local_filename))
+              @creator = json['creator_uuid']
+              @uuid = json['uuid']
+              self
+            end
+
+            def to_json
+              {
+                'creator_name' => 'vagrant-smartos-zones',
+                'creator_uuid' => creator_uuid,
+                'description' => name,
+                'files' => files,
+                'name' => name,
+                'os' => 'smartos',
+                'published_at' => '2015-06-15T15:13:08.425Z',
+                'type' => 'zone-dataset',
+                'urn' => urn,
+                'uuid' => uuid,
+                'version' => '1.0.0'
+              }.to_json
+            end
+
+            def local_filename
+              env.home_path.join('smartos', 'datasets', manifest_filename).to_s
+            end
+
+            def remote_filename
+              '/zones/vagrant/%s' % manifest_filename
+            end
+
+            def uuid
+              @uuid ||= SecureRandom.uuid
+            end
+
+            private
+
+            def files
+              [
+                {
+                  'path' => "#{name}.zfs.bz2",
+                  'sha1' => sha1,
+                  'size' => size
+                }
+              ]
+            end
+
+            def creator_uuid
+              @creator ||= SecureRandom.uuid
+            end
+
+            def sha1
+              Datasets.new(env).sha1(name)
+            end
+
+            def size
+              Datasets.new(env).size(name)
+            end
+
+            def urn
+              "smartos:vagrant-smartos-zones:#{name}:1.0.0"
+            end
+
+            def manifest_filename
+              '%s.dsmanifest' % name
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/smartos/zones/util/datasets.rb

@@ -0,0 +1,56 @@
+require 'digest/sha1'
+
+module Vagrant
+  module Smartos
+    module Zones
+      module Util
+        class Datasets
+          attr_reader :env, :machine
+
+          def initialize(env, machine = nil)
+            @env = env
+            @machine = machine
+          end
+
+          def list
+            setup_smartos_directories
+            ui.info(datasets.join("\n"), prefix: false)
+          end
+
+          def setup_smartos_directories
+            env.setup_home_path if env.respond_to?(:setup_home_path)
+            FileUtils.mkdir_p(dataset_dir)
+          end
+
+          def sha1(name)
+            Digest::SHA1.file(dataset_dir.join("#{name}.zfs.bz2")).hexdigest
+          end
+
+          def size(name)
+            ::File.size(dataset_dir.join("#{name}.zfs.bz2"))
+          end
+
+          private
+
+          def ui
+            env.respond_to?(:ui) ? env.ui : env[:ui]
+          end
+
+          def home_path
+            env.respond_to?(:home_path) ? env.home_path : env[:home_path]
+          end
+
+          def datasets
+            Dir[dataset_dir.join('*.zfs.bz2')].map do |f|
+              File.basename(f, '.zfs.bz2')
+            end.sort
+          end
+
+          def dataset_dir
+            home_path.join('smartos', 'datasets')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/smartos/zones/util/rsync.rb

@@ -0,0 +1,51 @@
+module Vagrant
+  module Smartos
+    module Zones
+      module Util
+        class Rsync
+          attr_reader :connection
+
+          def initialize(connection)
+            @connection = connection
+          end
+
+          def available?
+            Vagrant::Util::Subprocess.execute(*%w(which rsync)).exit_code == 0
+          end
+
+          def download(from, to)
+            Vagrant::Util::Subprocess.execute(*rsync_command, '-e', ssh_command, remote(from), to, notify: [:stdout])
+          end
+
+          def upload(from, to)
+            Vagrant::Util::Subprocess.execute(*rsync_command, '-e', ssh_command, from, remote(to), notify: [:stdout])
+          end
+
+          def rsync_command
+            %w(rsync -avz --progress)
+          end
+
+          def ssh_command
+            "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i #{identity_file} -p #{remote_port}"
+          end
+
+          def identity_file
+            connection.options[:keys].first
+          end
+
+          def remote(file)
+            "#{remote_user}@#{connection.host}:#{file}"
+          end
+
+          def remote_port
+            connection.options[:port]
+          end
+
+          def remote_user
+            connection.options[:user]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/smartos/zones/util/zone_group.rb

@@ -18,13 +18,18 @@ module Vagrant
           def find(group)
             Models::ZoneGroup.new.tap do |g|
               g.name = group
-              with_gz("#{sudo} zlogin #{zone.uuid} gid -g #{group}") do |_type, output|
-                g.gid = output.chomp
+              with_gz("#{sudo} zlogin #{zone.uuid} gid -g #{group}") do |output|
+                g.gid = output.chomp if output
               end
             end
           end
 
+          def exists?(group)
+            machine.communicate.gz_test("#{sudo} zlogin #{zone.uuid} gid -g #{group}")
+          end
+
           def create(group)
+            return if exists?(group)
             zone.zlogin("groupadd #{group}")
           end
         end

data/lib/vagrant/smartos/zones/util/zone_image.rb

@@ -0,0 +1,43 @@
+require 'vagrant/smartos/zones/models/config'
+
+module Vagrant
+  module Smartos
+    module Zones
+      module Util
+        class ZoneImage
+          attr_reader :machine
+
+          def initialize(machine)
+            @machine = machine
+          end
+
+          def image
+            machine.config.zone.image
+          end
+
+          def install_override?
+            !!override
+          end
+
+          def override
+            plugin_config["dataset.#{image}"]
+          end
+
+          def override_uuid
+            @override_uuid ||= manifest.uuid
+          end
+
+          private
+
+          def plugin_config
+            @plugin_config ||= Models::Config.config(machine.env).hash
+          end
+
+          def manifest
+            @manifest ||= Util::Datasets::Manifest.new(override, machine.env).load!
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/smartos/zones/util/zone_json.rb

@@ -1,4 +1,5 @@
 require 'vagrant/smartos/zones/models/network'
+require 'vagrant/smartos/zones/util/zone_image'
 
 module Vagrant
   module Smartos
@@ -23,7 +24,7 @@ module Vagrant
             {
               'brand' => machine.config.zone.brand,
               'alias' => machine.config.zone.name,
-              'dataset_uuid' => machine.config.zone.image,
+              'dataset_uuid' => image,
               'quota' => machine.config.zone.disk_size || 1,
               'max_physical_memory' => machine.config.zone.memory || 64
             }
@@ -67,6 +68,10 @@ module Vagrant
             }
           end
 
+          def image
+            zone_image.install_override? ? zone_image.override_uuid : machine.config.zone.image
+          end
+
           private
 
           def lx_brand?
@@ -76,6 +81,10 @@ module Vagrant
           def network
             @network ||= Models::Network.new(machine.env)
           end
+
+          def zone_image
+            @zone_image ||= Util::ZoneImage.new(machine)
+          end
         end
       end
     end

data/lib/vagrant/smartos/zones/util/zone_project.rb

@@ -15,8 +15,13 @@ module Vagrant
             @zone = zone
           end
 
+          def exists?(project)
+            machine.communicate.gz_test("#{sudo} zlogin #{zone.uuid} projects -l #{project}")
+          end
+
           def create(project, users, comment)
             return if zone.lx_brand?
+            return if exists?(project)
             zone.zlogin("projadd -c \"#{comment}\" -U #{users.join(',')} #{project}")
           end
         end

data/lib/vagrant/smartos/zones/util/zone_user.rb

@@ -19,13 +19,18 @@ module Vagrant
           def find(username)
             Models::ZoneUser.new.tap do |u|
               u.name = username
-              machine.communicate.gz_execute("#{sudo} zlogin #{zone.uuid} id -u #{username}") do |_type, output|
-                u.uid = output.chomp
+              with_gz("#{sudo} zlogin #{zone.uuid} id -u #{username}") do |output|
+                u.uid = output.chomp if output
               end
             end
           end
 
+          def exists?(username)
+            machine.communicate.gz_test("#{sudo} zlogin #{zone.uuid} id -u #{username}")
+          end
+
           def create(username, group, role = nil)
+            return if exists?(username)
             zone.zlogin("useradd #{flags(group)} #{username}")
             grant_role(username, role)
             install_public_key(group)

data/lib/vagrant/smartos/zones/util/zones.rb

@@ -27,8 +27,8 @@ module Vagrant
           end
 
           def create(name)
-            machine.ui.info "Creating zone #{machine.config.zone.name} with image #{machine.config.zone.image}"
-            with_gz("echo '#{zone_json}' | #{sudo} vmadm create")
+            machine.ui.info "Creating zone #{machine.config.zone.name} with image #{zone_json.image}"
+            with_gz("echo '#{zone_json.to_json}' | #{sudo} vmadm create")
             with_zone(name) do |zone|
               create_zone_users(zone)
               configure_pkgsrc_mirror(zone)
@@ -38,7 +38,7 @@ module Vagrant
           def update(name)
             with_zone(name) do |zone|
               machine.ui.info "Updating zone #{name}..."
-              with_gz("echo '#{zone_json}' | #{sudo} vmadm update #{zone.uuid}")
+              with_gz("echo '#{zone_json.to_json}' | #{sudo} vmadm update #{zone.uuid}")
             end
           end
 
@@ -81,7 +81,7 @@ module Vagrant
           end
 
           def zone_json
-            Util::ZoneJson.new(machine).to_json
+            Util::ZoneJson.new(machine)
           end
 
           def with_zone(name)

data/lib/vagrant/smartos/zones/version.rb

@@ -1,7 +1,7 @@
 module Vagrant
   module Smartos
     module Zones
-      VERSION = '0.1.0'
+      VERSION = '0.2.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-smartos-zones
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Eric Saxby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -107,6 +107,7 @@ files:
 - lib/vagrant/smartos/zones/action/zone_gate/install.rb
 - lib/vagrant/smartos/zones/cap/base.rb
 - lib/vagrant/smartos/zones/cap/create_gz_vnic.rb
+- lib/vagrant/smartos/zones/cap/dataset/list.rb
 - lib/vagrant/smartos/zones/cap/imgadm_import.rb
 - lib/vagrant/smartos/zones/cap/platform_image/install.rb
 - lib/vagrant/smartos/zones/cap/platform_image/latest.rb
@@ -138,14 +139,18 @@ files:
 - lib/vagrant/smartos/zones/models/zone_user.rb
 - lib/vagrant/smartos/zones/plugin.rb
 - lib/vagrant/smartos/zones/util/checksum.rb
+- lib/vagrant/smartos/zones/util/datasets.rb
+- lib/vagrant/smartos/zones/util/datasets/manifest.rb
 - lib/vagrant/smartos/zones/util/downloader.rb
 - lib/vagrant/smartos/zones/util/global_zone/connection.rb
 - lib/vagrant/smartos/zones/util/global_zone/helper.rb
 - lib/vagrant/smartos/zones/util/global_zone/ssh_info.rb
 - lib/vagrant/smartos/zones/util/platform_images.rb
 - lib/vagrant/smartos/zones/util/public_key.rb
+- lib/vagrant/smartos/zones/util/rsync.rb
 - lib/vagrant/smartos/zones/util/snapshots.rb
 - lib/vagrant/smartos/zones/util/zone_group.rb
+- lib/vagrant/smartos/zones/util/zone_image.rb
 - lib/vagrant/smartos/zones/util/zone_json.rb
 - lib/vagrant/smartos/zones/util/zone_project.rb
 - lib/vagrant/smartos/zones/util/zone_user.rb
@@ -177,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Manage SmartOS zones in Vagrant
@@ -187,4 +192,3 @@ test_files:
 - test/integration/default/serverspec/user_spec.rb
 - test/templates/Vagrantfile.smartos.erb
 - test/templates/bootstrap.sh
-has_rdoc: