vagrant-smartos-zones 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84fc0df3970935bc53940c6a9bf1be5b825537b7
-  data.tar.gz: ec8eaf0b1edbc52daeecbc073d591d19ddbd7575
+  metadata.gz: 1df692477b2ec1b9b16af72471943afc89c47e56
+  data.tar.gz: 896cd4b6f1731874af686af0c7e197bf593dfd27
 SHA512:
-  metadata.gz: fc7c7632350219fade70bc11585d116149760c0a559188d4c42357ad89406805c2a5371540ae8ed5e366babdd19e821874fd4531d5ece7d71422baf090c36662
-  data.tar.gz: 506620ca02aa02d3f35cf4af3c9fcf7c85c594d2b1e4d3c1e89842a0d6d0d1f02529c8dee03ae0dcbb62805f74a954f7979c8e83994851801f1713b1dd3e9163
+  metadata.gz: 6e9ff7c4b39346cd7daf63b95e14a6a1041c8f3c12235cf86f73ac560d038bd5e5e99a3b9be6b91d187691a817ef7b6220ae8cce21864690eb7f430c76645106
+  data.tar.gz: 3fd14dd777071cc407a25801367fd5f4ecfc35365f20a7ed0d3ad4ec621024580707b1106687e1b18bb6650f26f0bc57f3ec69072a69b730f760e84db0ccbfa5

data/README.md

@@ -257,6 +257,23 @@ vagrant zones config key value
 vagrant zones config --delete key
 ```
 
+### Network
+
+Networks conflict, particularly when assumptions are made about local
+networks. For this reason, the network chosen by the plugin when
+configuring the Global Zone and its local zone can be globally
+overridden.
+
+```bash
+vagrant zones config network 10.0.0.0/24
+```
+
+What can go wrong? Well... basically, what can go wrong is that the
+Global Zone port forwarding will break, and we won't actually be able to
+create zones. It should be pretty obvious when this is the case.
+
+* Does your network overlap with VirtualBox's local network space?
+
 ### Pkgsrc mirror
 
 ```bash
@@ -295,11 +312,5 @@ references have fallen by the wayside.
 
 ## Contributing
 
-1. Fork it ( https://github.com/vagrant-smartos/vagrant-smartos-zones/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-When creating a new Pull Request, `/cc @sax` in the notes to make sure
-I get an email about it.
+See the [Contributing](https://github.com/vagrant-smartos/vagrant-smartos-zones/wiki/Contributing)
+page for guidelines/recommendations on contributions.

data/examples/Vagrantfile

@@ -8,6 +8,8 @@ Vagrant.configure('2') do |config|
   config.vm.synced_folder '.', '/vagrant', disabled: true
   config.vm.communicator = 'smartos'
 
+  config.ssh.insert_key = false
+
   config.global_zone.platform_image = 'latest'
 
   config.zone.name = 'base64'

data/examples/Vagrantfile.chef_server

@@ -11,6 +11,8 @@ Vagrant.configure('2') do |config|
   config.vm.synced_folder '.', '/vagrant', disabled: true
   config.vm.communicator = 'smartos'
 
+  config.ssh.insert_key = false
+
   config.global_zone.platform_image = 'latest'
 
   config.zone.name = 'base64'

data/examples/Vagrantfile.lx

@@ -11,6 +11,8 @@ Vagrant.configure('2') do |config|
   config.vm.synced_folder '.', '/vagrant', disabled: true
   config.vm.communicator = 'smartos'
 
+  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'
 

data/examples/Vagrantfile.rsync

@@ -13,6 +13,8 @@ Vagrant.configure('2') do |config|
 
   config.vm.synced_folder ".", "/vagrant", type: "rsync"
 
+  config.ssh.insert_key = false
+
   config.global_zone.platform_image = 'latest'
 
   config.zone.name = 'base64'

data/files/gz_vnic/create_gz_vnic

@@ -3,13 +3,13 @@
 dladm create-etherstub stub0
 dladm create-vnic -l stub0 vnic0
 ipadm create-if vnic0
-ipadm create-addr -T static -a 10.0.0.1/24 vnic0/static
+ipadm create-addr -T static -a <gz_addr> vnic0/static
 
-echo 'map e1000g0 10.0.0.0/24 -> 0.0.0.0/32' | ipnat -f -
+echo 'map e1000g0 <zone_network> -> 0.0.0.0/32' | ipnat -f -
 
 # When we SSH into port 2222, ensure that that goes to 22 in the GZ
 # and is never forwarded to the zone.
-echo 'rdr e1000g0 0.0.0.0/0 port 2222 -> 10.0.0.1 port 22' | ipnat -f -
+echo 'rdr e1000g0 0.0.0.0/0 port 2222 -> <gz_ip> port 22' | ipnat -f -
 
 routeadm -u -e ipv4-forwarding
 routeadm -u -e ipv4-routing

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

@@ -1,4 +1,5 @@
 require 'vagrant/smartos/zones/cap/base'
+require 'vagrant/smartos/zones/models/network'
 
 module Vagrant
   module Smartos
@@ -13,10 +14,13 @@ module Vagrant
             ui.info 'Installing vnic in global zone'
             sudo = machine.config.smartos.suexec_cmd
 
-            machine.communicate.upload(create_vnic_script, '%s/create_gz_vnic' % vm_tmp_folder)
+            machine.communicate.upload(create_vnic_script, tmp_script)
+            machine.communicate.execute('sed -i -e \'s@<gz_addr>@%s@\' %s' % [network.gz_addr, tmp_script])
+            machine.communicate.execute('sed -i -e \'s@<zone_network>@%s@\' %s' % [network.zone_network, tmp_script])
+            machine.communicate.execute('sed -i -e \'s@<gz_ip>@%s@\' %s' % [network.gz_stub_ip, tmp_script])
             machine.communicate.upload(vnic_smf_manifest, '%s/create-gz-vnic.xml' % vm_tmp_folder)
 
-            machine.communicate.execute("#{sudo} mv %s/create_gz_vnic /opt/custom/method" % vm_tmp_folder)
+            machine.communicate.execute("#{sudo} mv %s /opt/custom/method" % tmp_script)
             machine.communicate.execute("#{sudo} mv %s/create-gz-vnic.xml /opt/custom/smf" % vm_tmp_folder)
 
             machine.communicate.execute("#{sudo} svccfg import /opt/custom/smf/create-gz-vnic.xml")
@@ -31,6 +35,14 @@ module Vagrant
             File.join(local_files_folder, 'gz_vnic', 'create_gz_vnic')
           end
 
+          def network
+            @network ||= Models::Network.new(machine.env)
+          end
+
+          def tmp_script
+            '%s/create_gz_vnic' % vm_tmp_folder
+          end
+
           def vnic_smf_manifest
             File.join(local_files_folder, 'smf', 'create-gz-vnic.xml')
           end

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

@@ -0,0 +1,48 @@
+require 'netaddr'
+require 'vagrant/smartos/zones/models/config'
+
+module Vagrant
+  module Smartos
+    module Zones
+      module Models
+        class Network
+          attr_reader :env
+
+          def initialize(env)
+            @env = env
+          end
+
+          def network
+            plugin_config.hash['network'] || '172.16.0.0/24'
+          end
+
+          def zone_network
+            [cidr.network, cidr.bits].join('/')
+          end
+
+          def gz_addr
+            [gz_stub_ip, cidr.bits].join('/')
+          end
+
+          def gz_stub_ip
+            cidr[1].ip
+          end
+
+          def zone_ip
+            cidr[2].ip
+          end
+
+          private
+
+          def cidr
+            @cidr ||= NetAddr::CIDR.create(network)
+          end
+
+          def plugin_config
+            @config ||= Models::Config.config(env)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+require 'vagrant/smartos/zones/models/network'
+
 module Vagrant
   module Smartos
     module Zones
@@ -51,7 +53,7 @@ module Vagrant
 
           def nics
             {
-              'nics' => [nic_info('stub0', '10.0.0.2')]
+              'nics' => [nic_info('stub0', network.zone_ip)]
             }
           end
 
@@ -60,7 +62,7 @@ module Vagrant
               'nic_tag' => tag,
               'ip' => ip,
               'netmask' => '255.255.255.0',
-              'gateway' => '10.0.0.1',
+              'gateway' => network.gz_stub_ip,
               'allow_ip_spoofing' => true
             }
           end
@@ -70,6 +72,10 @@ module Vagrant
           def lx_brand?
             machine.config.zone.brand == 'lx'
           end
+
+          def network
+            @network ||= Models::Network.new(machine.env)
+          end
         end
       end
     end

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

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

data/vagrant-smartos-zones.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'netaddr'
+
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'pry-nav'
   spec.add_development_dependency 'rake'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-smartos-zones
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Eric Saxby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: netaddr
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +131,7 @@ files:
 - lib/vagrant/smartos/zones/hooks.rb
 - lib/vagrant/smartos/zones/models/config.rb
 - lib/vagrant/smartos/zones/models/dataset.rb
+- lib/vagrant/smartos/zones/models/network.rb
 - lib/vagrant/smartos/zones/models/snapshot.rb
 - lib/vagrant/smartos/zones/models/zone.rb
 - lib/vagrant/smartos/zones/models/zone_group.rb
@@ -172,3 +187,4 @@ test_files:
 - test/integration/default/serverspec/user_spec.rb
 - test/templates/Vagrantfile.smartos.erb
 - test/templates/bootstrap.sh
+has_rdoc: