vagrant-smartos-zones 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 988a3cb1d2037d6bb7f60aa880606009a23ef4ca
-  data.tar.gz: 95a20be29c4b4f6de32fee8eb8e693e6988589a6
+  metadata.gz: 84fc0df3970935bc53940c6a9bf1be5b825537b7
+  data.tar.gz: ec8eaf0b1edbc52daeecbc073d591d19ddbd7575
 SHA512:
-  metadata.gz: 733c6c0afe14d5d0a29a5cd9d7710386630aad93285db0caaef743abe688ac340573a1b66038e82f8b1280c073f5f3874c84b8aaa1f4a0bccdbd895c0ca4ba20
-  data.tar.gz: 91aa10f0b5183779696c57982e8739e338aa6aa329ea45e907205287dcfa59b7b6364230f3109584f9e0458d3dc3f8e0bbfa81fb47239bfe15a96c5e91aeab70
+  metadata.gz: fc7c7632350219fade70bc11585d116149760c0a559188d4c42357ad89406805c2a5371540ae8ed5e366babdd19e821874fd4531d5ece7d71422baf090c36662
+  data.tar.gz: 506620ca02aa02d3f35cf4af3c9fcf7c85c594d2b1e4d3c1e89842a0d6d0d1f02529c8dee03ae0dcbb62805f74a954f7979c8e83994851801f1713b1dd3e9163

data/README.md

@@ -107,6 +107,7 @@ vagrant smartos install [platform_image]
 Interact with zones running in a box:
 
 ```bash
+vagrant zones config
 vagrant zones list
 vagrant zones show [name]
 vagrant zones start [name]
@@ -244,6 +245,27 @@ bundle exec kitchen test
 
 This may take a while...
 
+## Plugin configuration
+
+The plugin allows for local configuration through the `vagrant zones
+config` command. This can be used for local overrides of zone
+configuration.
+
+```bash
+vagrant zones config
+vagrant zones config key value
+vagrant zones config --delete key
+```
+
+### Pkgsrc mirror
+
+```bash
+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.
+
 ## References / Alternatives
 
 Any success of this project depends heavily on the work of others,

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

@@ -35,6 +35,18 @@ en:
               Started zone %{name} %{uuid}
             stop: |-
               Stopped zone %{name} %{uuid}
+        config:
+          set: |-
+            Setting configuration: %{key} => %{value}
+          delete:
+            success: |-
+              Deleting configuration for: %{key}
+            failed: |-
+              Unable to delete configuration key: %{key}
+              Was key actually set?
+        pkgsrc:
+          mirror:
+            Configuring pkgsrc mirror for %{uuid} => %{mirror}
         warning:
           zone_not_found: |-
             Unable to find zone with name %{name}

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

@@ -31,10 +31,18 @@ module Vagrant
           end
 
           def delete(name, *_args)
-            hash.delete(name)
+            if hash.delete(name)
+              env.ui.info(I18n.t('vagrant.smartos.zones.config.delete.success',
+                                 key: name))
+            else
+              env.ui.info(I18n.t('vagrant.smartos.zones.config.delete.failed',
+                                 key: name))
+            end
           end
 
           def set(name, value)
+            env.ui.info(I18n.t('vagrant.smartos.zones.config.set',
+                               key: name, value: value))
             hash[name] = value
           end
 

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

@@ -40,6 +40,7 @@ module Vagrant
         end
 
         command 'zones' do
+          load_il8n
           require_relative 'commands/zones'
           Command::Zones
         end

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

@@ -1,3 +1,4 @@
+require 'vagrant/smartos/zones/models/config'
 require 'vagrant/smartos/zones/models/zone'
 require 'vagrant/smartos/zones/util/global_zone/helper'
 require 'vagrant/smartos/zones/util/zone_group'
@@ -30,6 +31,7 @@ module Vagrant
             with_gz("echo '#{zone_json}' | #{sudo} vmadm create")
             with_zone(name) do |zone|
               create_zone_users(zone)
+              configure_pkgsrc_mirror(zone)
             end
           end
 
@@ -42,6 +44,14 @@ module Vagrant
 
           private
 
+          def configure_pkgsrc_mirror(zone)
+            return if zone.lx_brand?
+            return unless pkgsrc_mirror
+            machine.ui.info(I18n.t('vagrant.smartos.zones.pkgsrc.mirror',
+                                   uuid: zone.uuid, mirror: pkgsrc_mirror))
+            zone.zlogin("sed -i -e \\'s@http://pkgsrc.joyent.com@#{pkgsrc_mirror}@\\' /opt/local/etc/pkgin/repositories.conf")
+          end
+
           def create_zone_users(zone)
             create_zone_vagrant_user(zone)
             configure_zone_passwords(zone)
@@ -62,6 +72,14 @@ module Vagrant
             zone.zlogin("sed -i -e \\'s@#{user}:.*@#{user}:#{pw}:#{ts}::::::@\\' /etc/shadow")
           end
 
+          def pkgsrc_mirror
+            plugin_config['local.pkgsrc']
+          end
+
+          def plugin_config
+            @plugin_config ||= Models::Config.config(machine.env).hash
+          end
+
           def zone_json
             Util::ZoneJson.new(machine).to_json
           end

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

@@ -1,7 +1,7 @@
 module Vagrant
   module Smartos
     module Zones
-      VERSION = '0.0.2'
+      VERSION = '0.0.3'
     end
   end
 end

data/test/templates/bootstrap.sh

@@ -24,7 +24,7 @@ install_ruby() {
 }
 
 install_ruby_linux() {
-  apt-get install ruby
+  apt-get -y install ruby
 }
 
 install_ruby_smartos() {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-smartos-zones
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Eric Saxby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler