bosh_docker_cpi 0.0.1.pre.2 → 0.0.1.pre.3

data/lib/bosh_registry/instance_manager/docker.rb

@@ -4,8 +4,10 @@ module Bosh::Registry
 
     class Docker < InstanceManager
 
+      require 'bosh_docker_cpi'
+
       def initialize(cloud_config)
-        @docker = Docker::API.new(base_url: 'http://localhost:4243')
+        @docker = ::Docker::API.new(base_url: 'http://localhost:4243')
       end
 
       # Get the list of IPs belonging to this instance

data/lib/cloud/docker/cloud.rb

@@ -4,16 +4,16 @@ module Bosh
 
       def initialize(options)
         @agent_properties ||= options.fetch('agent', {})
-        registry_properties = options.fetch('registry')
-        registry_endpoint = registry_properties.fetch('endpoint')
-        registry_user = registry_properties.fetch('user')
-        registry_password = registry_properties.fetch('password')
+        #registry_properties = options.fetch('registry')
+        #registry_endpoint = registry_properties.fetch('endpoint')
+        #registry_user = registry_properties.fetch('user')
+        #registry_password = registry_properties.fetch('password')
+        #
+        #@registry = Bosh::Registry::Client.new(registry_endpoint,
+        #                                       registry_user,
+        #                                       registry_password)
 
-        @registry = Bosh::Registry::Client.new(registry_endpoint,
-                                               registry_user,
-                                               registry_password)
-
-        @docker = Docker::API.new(base_url: 'http://localhost:4243')
+        @docker = ::Docker::API.new(base_url: 'http://localhost:4243')
       end
 
       def current_vm_id
@@ -23,31 +23,43 @@ module Bosh
       def create_stemcell(image_path, cloud_properties)
         Dir.mktmpdir do |dir|
           Dir.chdir(dir) do
+            system 'mkdir mnt'
             system "tar -xzf #{image_path} root.img"
-
+            system 'sudo kpartx -a root.img'
+            system 'sudo mount /dev/mapper/loop0p1 mnt'
+            Dir.chdir('mnt') do
+              system 'sudo tar zcf ../stemcell_img.tgz .'
+            end
+            system 'sudo umount mnt'
+            system 'sudo kpartx -d root.img'
+            system 'sudo chmod 777 stemcell_img.tgz'
+            system 'cat stemcell_img.tgz | docker image - bosh latest'  #returns stemcell_id
           end
         end
       end
 
       def delete_stemcell(stemcell_id)
-        not_implemented(:delete_stemcell)
+        system "docker rmi #{stemcell_id}"
       end
 
       def create_vm(agent_id, stemcell_id, resource_pool,
           network_spec, disk_locality = nil, environment = nil)
 
-
-        result = containers.create(['/bin/sh', '-c', 'while true; do echo hello world; sleep 1; done'], stemcell_id)
+        nats_uri = 'nats://172.16.42.1:21084'
+        blobstore_uri = 'http://172.16.42.1:21081'
+        agent_base_dir = '/var/vcap/bosh'
+        root_dir = '/var/vcap/bosh'
+        result = containers.create(['/bin/sh', '-c', "/var/vcap/bosh/bin/bosh_agent -a #{agent_id} -s #{blobstore_uri} -p simple -b #{agent_base_dir} -n #{nats_uri} -r #{root_dir}"], stemcell_id)
         vm_id = result["Id"]
 
 
-        registry_settings = initial_agent_settings(
-            agent_id,
-            network_spec,
-            environment,
-            ''
-        )
-        registry.update_settings(vm_id, registry_settings)
+        #registry_settings = initial_agent_settings(
+        #    agent_id,
+        #    network_spec,
+        #    environment,
+        #    ''
+        #)
+        #registry.update_settings(vm_id, registry_settings)
 
         containers.start(vm_id)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_docker_cpi
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.2
+  version: 0.0.1.pre.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-client