vagrant-bosh 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e34945bb57bd49ef8eb5fe0a92531a3034f8a69
-  data.tar.gz: 6ac43a05b657a6ce0df25e41290c2f13743c5270
+  metadata.gz: 2b71501a290476431595cba12152316f81b16e1b
+  data.tar.gz: 422f7595bb2acd56ce07e24fd24bba962b9e9865
 SHA512:
-  metadata.gz: 9e7eabe3954e50934c69bbd15f702ea620586e92f078f52435939961102a04cacc8c69a8605018e1d9b684b0db999badc737b11c67d43417d78a7cf08c91670d
-  data.tar.gz: 177de839fb5217569fbc93214e97f8d4e93ca7a152dbae5f8ee1b86b137b0587cffc784aa1c8ceff35dd95b7f95194d40ea642164244b22d58b2ecde4686c4de
+  metadata.gz: bd4630ce239179fa6fd40cc540ccdcf05fa6cd2c574c6585e7570af5fb67bd0b68442248cb57217911804b9410f385ceb0aa549ad98ea7cbf20a2b8fc5bcb860
+  data.tar.gz: c02f59b47e09827af921fa5318e056dcd6694156068245ea219a6dbd332654b4f29a76f62aeed530ec8f81b20d80d492ab7839dc66a9033bf12669e01571b7d7

data/.gitmodules

@@ -1,6 +1,3 @@
-[submodule "bosh"]
-	path = bosh
-	url = https://github.com/cloudfoundry/bosh.git
-[submodule "go/src/github.com/cloudfoundry-incubator/candiedyaml"]
-	path = go/src/github.com/cloudfoundry-incubator/candiedyaml
-	url = https://github.com/cloudfoundry-incubator/candiedyaml.git
+[submodule "bosh-provisioner"]
+	path = bosh-provisioner
+	url = https://github.com/cppforlife/bosh-provisioner

data/dev/Vagrantfile

@@ -20,7 +20,7 @@ Vagrant.configure("2") do |config|
   # config.vm.network "forwarded_port", guest: 5637, host: 5637 # redgreen
 
   # Example of custom private network configuration
-  # config.vm.network :private_network, ip: "192.168.56.4"
+  config.vm.network :private_network, ip: "192.168.56.4"
 
   config.vm.provider "virtualbox" do |v|
     v.memory = 4096

data/dev/example-bosh-manifest.yml

@@ -2,13 +2,12 @@
 name: bosh-in-vagrant
 
 releases:
-# Download latest BOSH release from http://bosh-artifacts.cfapps.io/
 - name: bosh
-  version: 83
+  version: 92
   url: https://s3.amazonaws.com/bosh-jenkins-artifacts/release/bosh-2652.tgz
 - name: bosh-warden-cpi
-  version: latest
-  url: dir+bosh://../../bosh-warden-cpi-release
+  version: 2
+  url: https://s3.amazonaws.com/bosh-warden-cpi-blobs/bosh-warden-cpi-2.tgz
 
 networks:
 # Must have dynamic network
@@ -54,11 +53,11 @@ properties:
   nats:
     user: nats
     password: nats-password
-    address: 10.0.2.15
+    address: 127.0.0.1
     port: 4222
 
   blobstore:
-    address: 10.0.2.15
+    address: 127.0.0.1
     port: 25251
     backend_port: 25552
     agent:
@@ -71,18 +70,18 @@ properties:
   postgres:
     user: bosh
     password: bosh-password
-    host: 10.0.2.15
+    host: 127.0.0.1
     port: 5432
     database: bosh
 
   redis:
     password: redis-password
-    address: 10.0.2.15
+    address: 127.0.0.1
     port: 25255
 
   director:
     name: bosh-in-vagrant
-    address: 10.0.2.15
+    address: 127.0.0.1
     port: 25555
     encryption: false
     enable_snapshots: true
@@ -90,7 +89,7 @@ properties:
     db:
       user: bosh
       password: bosh-password
-      host: 10.0.2.15
+      host: 127.0.0.1
       port: 5432
       database: bosh
     ssl:
@@ -181,11 +180,11 @@ properties:
       connect_network: tcp
       connect_address: 127.0.0.1:7777
     agent:
-      mbus: nats://nats:nats-password@10.0.2.15:4222
+      mbus: nats://nats:nats-password@_local_ip_:4222
       blobstore:
         provider: dav
         options:
-          endpoint: http://10.0.2.15:25251
+          endpoint: http://_local_ip_:25251
           user: agent
           password: agent-password
 
@@ -196,3 +195,4 @@ properties:
     network_pool: 10.244.0.0/22 # bosh-lite v1 used this pool
     disk_quota_enabled: false
     kernel_network_tuning_enabled: false
+

data/lib/vagrant-bosh/bootstrapper.rb

@@ -33,11 +33,11 @@ module VagrantPlugins
 
       def run_provisioner
         # Provisioner is already uploaded when assets are synced
-        provisioner_path = File.join(@config.assets_dir, "provisioner")
+        provisioner_path = File.join(@config.assets_dir, "bosh-provisioner")
         @c.chmod_x(provisioner_path)
 
         @c.sudo(
-          "#{provisioner_path} -configPath=#{@config.config_path} 2> >(tee /tmp/provisioner.log >&2)",
+          "#{provisioner_path} -configPath=#{@config.config_path} 2>/tmp/provisioner.log",
           &@provisioner_tracker.method(:add_data)
         )
       end
@@ -54,6 +54,10 @@ module VagrantPlugins
             },
           },
 
+          event_log: {
+            device_type: "text",
+          },
+
           vm_provisioner: {
             full_stemcell_compatibility: @config.full_stemcell_compatibility,
 

data/lib/vagrant-bosh/config.rb

@@ -27,7 +27,7 @@ module VagrantPlugins
 
       def initialize(*args)
         super
-        @base_dir = "/opt/vagrant-bosh"
+        @base_dir = "/opt/bosh-provisioner"
       end
 
       def finalize!

data/lib/vagrant-bosh/provisioner.rb

@@ -20,7 +20,7 @@ module VagrantPlugins
 
         asset_uploader = AssetUploader.new(
           communicator,
-          File.absolute_path("../assets", __FILE__),
+          File.absolute_path("../../../bosh-provisioner/assets", __FILE__),
           machine_ui,
         )
 

data/lib/vagrant-bosh/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VagrantBosh
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/vagrant-bosh.gemspec

@@ -15,7 +15,9 @@ Gem::Specification.new do |s|
   s.email    = ["cppforlife@gmail.com"]
   s.licenses = ["MIT"]
 
-  s.files         = `git ls-files`.split("\n")
+  s.files  = `git ls-files`.split("\n")
+  s.files += Dir["bosh-provisioner/assets/**/*"]
+
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib", "templates"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-bosh
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Dmitriy Kalinin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies: []
 description: BOSH provisioner allows to provision guest VM by specifying regular BOSH
   deployment manifest.
@@ -18,8 +18,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".gitmodules"
+- .gitignore
+- .gitmodules
 - Gemfile
 - LICENSE
 - README.md
@@ -30,140 +30,8 @@ files:
 - dev/example-winston-manifest.yml
 - docs/build-aws-stemcell.md
 - docs/release-url.md
-- go/.gitignore
-- go/bin/build
-- go/bin/build-linux-amd64
-- go/bin/env
-- go/bin/go
-- go/bin/golint
-- go/bin/test
-- go/src/boshprovisioner/agent/client/client_interface.go
-- go/src/boshprovisioner/agent/client/fakes/fake_client.go
-- go/src/boshprovisioner/agent/client/http_client.go
-- go/src/boshprovisioner/agent/client/http_client_envelope.go
-- go/src/boshprovisioner/deployment/deployment.go
-- go/src/boshprovisioner/deployment/instance.go
-- go/src/boshprovisioner/deployment/manifest/deployment.go
-- go/src/boshprovisioner/deployment/manifest/ips.go
-- go/src/boshprovisioner/deployment/manifest/manifest.go
-- go/src/boshprovisioner/deployment/manifest/manifest_suite_test.go
-- go/src/boshprovisioner/deployment/manifest/manifest_test.go
-- go/src/boshprovisioner/deployment/manifest/syntax_validator.go
-- go/src/boshprovisioner/deployment/manifest/watch_time.go
-- go/src/boshprovisioner/deployment/manifest_reader.go
-- go/src/boshprovisioner/deployment/reader_factory.go
-- go/src/boshprovisioner/deployment/semantic_validator.go
-- go/src/boshprovisioner/downloader/blobstore_downloader.go
-- go/src/boshprovisioner/downloader/default_mux_downloader.go
-- go/src/boshprovisioner/downloader/downloader_interface.go
-- go/src/boshprovisioner/downloader/http_downloader.go
-- go/src/boshprovisioner/downloader/local_fs_downloader.go
-- go/src/boshprovisioner/downloader/mux_downloader.go
-- go/src/boshprovisioner/eventlog/log.go
-- go/src/boshprovisioner/eventlog/stage.go
-- go/src/boshprovisioner/eventlog/task.go
-- go/src/boshprovisioner/index/file_index.go
-- go/src/boshprovisioner/index/file_index_test.go
-- go/src/boshprovisioner/index/index_interface.go
-- go/src/boshprovisioner/index/index_suite_test.go
-- go/src/boshprovisioner/instance/instance.go
-- go/src/boshprovisioner/instance/instance_provisioner.go
-- go/src/boshprovisioner/instance/templatescompiler/concrete_templates_compiler.go
-- go/src/boshprovisioner/instance/templatescompiler/erbrenderer/erb_renderer.go
-- go/src/boshprovisioner/instance/templatescompiler/erbrenderer/erbrenderer_suite_test.go
-- go/src/boshprovisioner/instance/templatescompiler/erbrenderer/render_properties.go
-- go/src/boshprovisioner/instance/templatescompiler/erbrenderer/render_properties_test.go
-- go/src/boshprovisioner/instance/templatescompiler/erbrenderer/template_evaluation_context.go
-- go/src/boshprovisioner/instance/templatescompiler/erbrenderer/template_evaluation_context_rb.go
-- go/src/boshprovisioner/instance/templatescompiler/jobsrepo/concrete_jobs_repository.go
-- go/src/boshprovisioner/instance/templatescompiler/jobsrepo/concrete_runtime_packages_repository.go
-- go/src/boshprovisioner/instance/templatescompiler/jobsrepo/concrete_template_to_job_repository.go
-- go/src/boshprovisioner/instance/templatescompiler/jobsrepo/jobs_repository_interface.go
-- go/src/boshprovisioner/instance/templatescompiler/rendered_archives_compiler.go
-- go/src/boshprovisioner/instance/templatescompiler/templates_compiler_interface.go
-- go/src/boshprovisioner/instance/templatescompiler/templatesrepo/ct_repository.go
-- go/src/boshprovisioner/instance/templatescompiler/templatesrepo/templates_repository_interface.go
-- go/src/boshprovisioner/instance/updater/applier/applier.go
-- go/src/boshprovisioner/instance/updater/applier/empty_state.go
-- go/src/boshprovisioner/instance/updater/applier/job_state.go
-- go/src/boshprovisioner/instance/updater/drainer.go
-- go/src/boshprovisioner/instance/updater/starter.go
-- go/src/boshprovisioner/instance/updater/stopper.go
-- go/src/boshprovisioner/instance/updater/updater.go
-- go/src/boshprovisioner/instance/updater/updater_factory.go
-- go/src/boshprovisioner/instance/updater/updater_suite_test.go
-- go/src/boshprovisioner/instance/updater/waiter.go
-- go/src/boshprovisioner/instance/updater/waiter_test.go
-- go/src/boshprovisioner/main/config.go
-- go/src/boshprovisioner/main/config_test.go
-- go/src/boshprovisioner/main/main.go
-- go/src/boshprovisioner/main/main_suite_test.go
-- go/src/boshprovisioner/main/repos_factory.go
-- go/src/boshprovisioner/packagescompiler/compiledpackagesrepo/compiled_packages_repository_interface.go
-- go/src/boshprovisioner/packagescompiler/compiledpackagesrepo/concrete_compiled_packages_repository.go
-- go/src/boshprovisioner/packagescompiler/concrete_packages_compiler.go
-- go/src/boshprovisioner/packagescompiler/concrete_packages_compiler_factory.go
-- go/src/boshprovisioner/packagescompiler/packages_compiler_interface.go
-- go/src/boshprovisioner/packagescompiler/packagesrepo/concrete_packages_repository.go
-- go/src/boshprovisioner/packagescompiler/packagesrepo/packages_repository_interface.go
-- go/src/boshprovisioner/provisioner/blobstore_config.go
-- go/src/boshprovisioner/provisioner/blobstore_provisioner.go
-- go/src/boshprovisioner/provisioner/deployment_provisioner_interface.go
-- go/src/boshprovisioner/provisioner/release_compiler.go
-- go/src/boshprovisioner/provisioner/single_configured_vm_provisioner.go
-- go/src/boshprovisioner/provisioner/single_non_configured_vm_provisioner.go
-- go/src/boshprovisioner/provisioner/single_vm_provisioner_factory.go
-- go/src/boshprovisioner/release/dir_reader.go
-- go/src/boshprovisioner/release/job/job.go
-- go/src/boshprovisioner/release/job/manifest/manifest.go
-- go/src/boshprovisioner/release/job/manifest/manifest_suite_test.go
-- go/src/boshprovisioner/release/job/manifest/manifest_test.go
-- go/src/boshprovisioner/release/job/manifest/syntax_validator.go
-- go/src/boshprovisioner/release/job/reader_factory.go
-- go/src/boshprovisioner/release/job/tar_reader.go
-- go/src/boshprovisioner/release/manifest/manifest.go
-- go/src/boshprovisioner/release/manifest/manifest_suite_test.go
-- go/src/boshprovisioner/release/manifest/manifest_test.go
-- go/src/boshprovisioner/release/manifest/syntax_validator.go
-- go/src/boshprovisioner/release/reader_factory.go
-- go/src/boshprovisioner/release/reader_interface.go
-- go/src/boshprovisioner/release/release.go
-- go/src/boshprovisioner/release/release_suite_test.go
-- go/src/boshprovisioner/release/release_test.go
-- go/src/boshprovisioner/release/tar_reader.go
-- go/src/boshprovisioner/tar/cmd_compressor.go
-- go/src/boshprovisioner/tar/cmd_extractor.go
-- go/src/boshprovisioner/tar/compressor_interface.go
-- go/src/boshprovisioner/tar/extractor_interface.go
-- go/src/boshprovisioner/util/possible_base64.go
-- go/src/boshprovisioner/util/string_keyed.go
-- go/src/boshprovisioner/vm/vagrant/agent_provisioner.go
-- go/src/boshprovisioner/vm/vagrant/asset_manager.go
-- go/src/boshprovisioner/vm/vagrant/configured_vm.go
-- go/src/boshprovisioner/vm/vagrant/deps_provisioner.go
-- go/src/boshprovisioner/vm/vagrant/monit_provisioner.go
-- go/src/boshprovisioner/vm/vagrant/non_configured_vm.go
-- go/src/boshprovisioner/vm/vagrant/runit_provisioner.go
-- go/src/boshprovisioner/vm/vagrant/simple_cmds.go
-- go/src/boshprovisioner/vm/vagrant/vcap_user_provisioner.go
-- go/src/boshprovisioner/vm/vagrant/vm_provisioner.go
-- go/src/boshprovisioner/vm/vagrant/vm_provisioner_factory.go
-- go/src/boshprovisioner/vm/vm_interface.go
 - lib/vagrant-bosh.rb
 - lib/vagrant-bosh/asset_uploader.rb
-- lib/vagrant-bosh/assets/agent/agent-log
-- lib/vagrant-bosh/assets/agent/agent-run
-- lib/vagrant-bosh/assets/agent/agent.cert
-- lib/vagrant-bosh/assets/agent/agent.json
-- lib/vagrant-bosh/assets/agent/agent.key
-- lib/vagrant-bosh/assets/agent/bosh-agent
-- lib/vagrant-bosh/assets/agent/bosh-agent-rc
-- lib/vagrant-bosh/assets/agent/bosh-blobstore-dav
-- lib/vagrant-bosh/assets/monit/monit
-- lib/vagrant-bosh/assets/monit/monit-log
-- lib/vagrant-bosh/assets/monit/monit-run
-- lib/vagrant-bosh/assets/monit/monitrc
-- lib/vagrant-bosh/assets/provisioner
 - lib/vagrant-bosh/bootstrapper.rb
 - lib/vagrant-bosh/communicator.rb
 - lib/vagrant-bosh/config.rb
@@ -180,6 +48,19 @@ files:
 - lib/vagrant-bosh/version.rb
 - templates/locales/en.yml
 - vagrant-bosh.gemspec
+- bosh-provisioner/assets/agent/agent-log
+- bosh-provisioner/assets/agent/agent-run
+- bosh-provisioner/assets/agent/agent.cert
+- bosh-provisioner/assets/agent/agent.json
+- bosh-provisioner/assets/agent/agent.key
+- bosh-provisioner/assets/agent/bosh-agent
+- bosh-provisioner/assets/agent/bosh-agent-rc
+- bosh-provisioner/assets/agent/bosh-blobstore-dav
+- bosh-provisioner/assets/bosh-provisioner
+- bosh-provisioner/assets/monit/monit
+- bosh-provisioner/assets/monit/monit-log
+- bosh-provisioner/assets/monit/monit-run
+- bosh-provisioner/assets/monit/monitrc
 homepage: https://github.com/cppforlife/vagrant-bosh
 licenses:
 - MIT
@@ -191,17 +72,17 @@ require_paths:
 - templates
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Vagrant BOSH provisioner plugin.

data/go/.gitignore

@@ -1,11 +0,0 @@
-out
-pkg
-gobin/*
-
-*\.test
-*.coverprofile
-
-*.sublime-workspace
-
-.idea/workspace.xml
-.idea/tasks.xml

data/go/bin/build

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-BINDIR=$(dirname $0)
-BASEDIR=$(dirname $BINDIR)
-
-$BINDIR/go build -o $BASEDIR/out/provisioner boshprovisioner/main
-
-cp $BASEDIR/out/provisioner $BASEDIR/../lib/vagrant-bosh/assets/provisioner

data/go/bin/build-linux-amd64

@@ -1,9 +0,0 @@
-#!/bin/bash 
-
-set -e
-
-export GOARCH=amd64
-export GOOS=linux
-export GOTOOLDIR=$(go env GOROOT)/pkg/linux_amd64
-
-$(dirname $0)/build