bosh_docker_cpi 0.0.1.pre.3 → 0.0.1.pre.4

data/lib/active_support/core_ext/numeric.rb

@@ -0,0 +1 @@
+#Nothing here just hack around issue with docker_client gem.

data/lib/bosh_docker_cpi.rb

@@ -1,5 +1,4 @@
-require 'tmpdir'
-require 'docker'
+require 'cloud'
 require 'cloud/docker'
 require 'bosh_registry/instance_manager/docker'
 

data/lib/bosh_registry/instance_manager/docker.rb

@@ -1,11 +1,11 @@
+require 'docker'
+
 module Bosh::Registry
 
   class InstanceManager
 
     class Docker < InstanceManager
 
-      require 'bosh_docker_cpi'
-
       def initialize(cloud_config)
         @docker = ::Docker::API.new(base_url: 'http://localhost:4243')
       end

data/lib/cloud/docker.rb

@@ -1,6 +1,159 @@
-require_relative 'docker/cloud'
+require 'docker'
+require 'tmpdir'
 
 module Bosh
   module Clouds
+
+    class Docker < Bosh::Cloud
+
+      def initialize(options)
+        @nats_uri = options.fetch('nats', '')
+        @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 = Bosh::Registry::Client.new(registry_endpoint,
+        #                                       registry_user,
+        #                                       registry_password)
+
+        @docker = ::Docker::API.new(base_url: 'http://localhost:4243')
+      end
+
+      def current_vm_id
+        nil
+      end
+
+      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)
+        system "docker rmi #{stemcell_id}"
+      end
+
+      def create_vm(agent_id, stemcell_id, resource_pool,
+          network_spec, disk_locality = nil, environment = nil)
+
+        #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)
+
+        containers.start(vm_id)
+
+
+        vm_id
+      end
+
+      def delete_vm(vm_id)
+        containers.stop(vm_id)
+        containers.remove(vm_id)
+      end
+
+      def has_vm?(vm_id)
+        containers.list.collect { |c| c['Id'] }.include?(vm_id)
+      end
+
+      def reboot_vm(vm_id)
+        containers.restart(vm_id)
+      end
+
+      def set_vm_metadata(vm, metadata)
+        # Nothing to do here
+      end
+
+      def configure_networks(vm_id, networks)
+        #not_implemented(:configure_networks)
+      end
+
+      def create_disk(size, vm_locality = nil)
+        # create dir name for volume
+        #not_implemented(:create_disk)
+      end
+
+      def delete_disk(disk_id)
+        # remove dir
+        #not_implemented(:delete_disk)
+      end
+
+      def attach_disk(vm_id, disk_id)
+        # add volume to container (have to stop then start with volume)
+        #not_implemented(:attach_disk)
+      end
+
+      def snapshot_disk(disk_id, metadata={})
+        # copy dir (or put volume on btrfs and snapshot?)
+        #not_implemented(:snapshot_disk)
+      end
+
+      def delete_snapshot(snapshot_id)
+        # delete dir or btrfs snapshot
+        #not_implemented(:delete_snapshot)
+      end
+
+      def detach_disk(vm_id, disk_id)
+        # stop container, restart w/o volume
+        #not_implemented(:detach_disk)
+      end
+
+      def get_disks(vm_id)
+        details = containers.show(vm_id)
+        details['Volumes'].keys
+      end
+
+      private
+
+      attr_reader :registry, :agent_properties, :docker, :nats_uri
+
+      def containers
+        @containers ||= docker.containers
+      end
+
+      def initial_agent_settings(agent_id, network_spec, environment, root_device_name)
+        settings = {
+            "vm" => {
+                "name" => "vm-#{SecureRandom.uuid}"
+            },
+            "agent_id" => agent_id,
+            "networks" => network_spec,
+            "disks" => {
+                "system" => root_device_name,
+                "ephemeral" => '',
+                "persistent" => {}
+            }
+        }
+
+        settings["env"] = environment if environment
+        settings.merge(agent_properties)
+      end
+    end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_docker_cpi
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre.3
+  version: 0.0.1.pre.4
   prerelease: 6
 platform: ruby
 authors:
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bosh_common
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0.pre.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0.pre.3
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -59,64 +43,16 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.0.pre.3
-- !ruby/object:Gem::Dependency
-  name: bosh_registry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0.pre.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0.pre.3
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.2.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.2.4
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.2
 description: BOSH Docker CPI
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/active_support/core_ext/numeric.rb
 - lib/bosh_docker_cpi.rb
 - lib/bosh_registry/instance_manager/docker.rb
 - lib/cloud/docker.rb
-- lib/cloud/docker/cloud.rb
 homepage: https://github.com/ajackson/bosh-lite
 licenses:
 - Apache 2.0

data/lib/cloud/docker/cloud.rb

@@ -1,153 +0,0 @@
-module Bosh
-  module Clouds
-    class Docker < Bosh::Cloud
-
-      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 = Bosh::Registry::Client.new(registry_endpoint,
-        #                                       registry_user,
-        #                                       registry_password)
-
-        @docker = ::Docker::API.new(base_url: 'http://localhost:4243')
-      end
-
-      def current_vm_id
-        nil
-      end
-
-      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)
-        system "docker rmi #{stemcell_id}"
-      end
-
-      def create_vm(agent_id, stemcell_id, resource_pool,
-          network_spec, disk_locality = nil, environment = nil)
-
-        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)
-
-        containers.start(vm_id)
-
-
-        vm_id
-      end
-
-      def delete_vm(vm_id)
-        containers.stop(vm_id)
-        containers.remove(vm_id)
-      end
-
-      def has_vm?(vm_id)
-        containers.list.collect { |c| c['Id'] }.include?(vm_id)
-      end
-
-      def reboot_vm(vm_id)
-        containers.restart(vm_id)
-      end
-
-      def set_vm_metadata(vm, metadata)
-        # Nothing to do here
-      end
-
-      def configure_networks(vm_id, networks)
-        #not_implemented(:configure_networks)
-      end
-
-      def create_disk(size, vm_locality = nil)
-        # create dir name for volume
-        #not_implemented(:create_disk)
-      end
-
-      def delete_disk(disk_id)
-        # remove dir
-        #not_implemented(:delete_disk)
-      end
-
-      def attach_disk(vm_id, disk_id)
-        # add volume to container (have to stop then start with volume)
-        #not_implemented(:attach_disk)
-      end
-
-      def snapshot_disk(disk_id, metadata={})
-        # copy dir (or put volume on btrfs and snapshot?)
-        #not_implemented(:snapshot_disk)
-      end
-
-      def delete_snapshot(snapshot_id)
-        # delete dir or btrfs snapshot
-        #not_implemented(:delete_snapshot)
-      end
-
-      def detach_disk(vm_id, disk_id)
-        # stop container, restart w/o volume
-        #not_implemented(:detach_disk)
-      end
-
-      def get_disks(vm_id)
-        details = containers.show(vm_id)
-        details['Volumes'].keys
-      end
-
-      private
-
-      attr_reader :registry, :agent_properties, :docker
-
-      def containers
-        @containers ||= docker.containers
-      end
-
-      def initial_agent_settings(agent_id, network_spec, environment, root_device_name)
-        settings = {
-            "vm" => {
-                "name" => "vm-#{SecureRandom.uuid}"
-            },
-            "agent_id" => agent_id,
-            "networks" => network_spec,
-            "disks" => {
-                "system" => root_device_name,
-                "ephemeral" => '',
-                "persistent" => {}
-            }
-        }
-
-        settings["env"] = environment if environment
-        settings.merge(agent_properties)
-      end
-    end
-  end
-end