bosh_deployer 0.4.0 → 0.5.0

data/config/aws_defaults.yml

@@ -48,3 +48,6 @@ cloud:
 
 apply_spec:
   properties: {}
+  agent:
+    blobstore: {}
+    nats: {}

data/config/openstack_defaults.yml

@@ -0,0 +1,50 @@
+---
+name:
+
+logging:
+  level: INFO
+
+dir:
+
+network:
+  type: dynamic
+  cloud_properties: {}
+
+env:
+  bosh:
+    password:
+
+resources:
+  persistent_disk: 4096
+  cloud_properties:
+    instance_type: m1.small
+    availability_zone:
+
+cloud:
+  plugin: openstack
+  properties:
+    openstack:
+      auth_url:
+      username:
+      api_key:
+      tenant:
+      default_key_name:
+      default_security_groups: []
+      ssh_user: vcap
+    registry:
+      endpoint: http://admin:admin@localhost:25889
+      user: admin
+      password: admin
+    stemcell:
+      kernel_id:
+      disk: 4096
+    agent:
+      ntp: []
+      blobstore:
+        plugin: local
+        properties:
+          blobstore_path: /var/vcap/micro_bosh/data/cache
+      mbus:
+
+apply_spec:
+  properties: {}

data/lib/bosh/cli/commands/micro.rb

@@ -80,12 +80,14 @@ module Bosh::Cli::Command
 
     def perform(*options)
       update = options.delete("--update")
+      force = options.delete("--force")
       stemcell = options.shift
 
       err "No deployment set" unless deployment
 
+      manifest = load_yaml_file(deployment)
+
       if stemcell.nil?
-        manifest = load_yaml_file(deployment)
         unless manifest.is_a?(Hash)
           err("Invalid manifest format")
         end
@@ -114,6 +116,15 @@ module Bosh::Cli::Command
           err "Instance exists.  Did you mean to --update?"
         end
 
+        # make sure the user knows a persistent disk is a really good idea
+        unless dig_hash(manifest, "resources", "persistent_disk")
+          unless force
+            msg = "No persistent disk configured, use --force to deploy anyway"
+            quit(msg.red)
+          end
+          say("WARNING! The micro bosh data won't be persisted".red)
+        end
+
         confirmation = "Deploying new"
 
         method = :create_deployment

data/lib/deployer/config.rb

@@ -10,7 +10,7 @@ module Bosh::Deployer
       include Helpers
 
       attr_accessor :logger, :db, :uuid, :resources, :cloud_options,
-        :spec_properties, :bosh_ip, :env, :name
+        :spec_properties, :agent_properties, :bosh_ip, :env, :name
 
       def configure(config)
         plugin = cloud_plugin(config)
@@ -31,7 +31,9 @@ module Bosh::Deployer
         @logger.level = Logger.const_get(config["logging"]["level"].upcase)
         @logger.formatter = ThreadFormatter.new
 
-        @spec_properties = config["apply_spec"]["properties"]
+        apply_spec = config["apply_spec"]
+        @spec_properties = apply_spec["properties"]
+        @agent_properties = apply_spec["agent"]
 
         @db = Sequel.sqlite
 
@@ -87,7 +89,9 @@ module Bosh::Deployer
       end
 
       def networks
-        @networks ||= {
+        return @networks if @networks
+
+        @networks = {
           "bosh" => {
             "cloud_properties" => @net_conf["cloud_properties"],
             "netmask"          => @net_conf["netmask"],
@@ -98,6 +102,14 @@ module Bosh::Deployer
             "default"          => ["dns", "gateway"]
           }
         }
+        if @net_conf["vip"]
+          @networks["vip"] = {
+              "ip" => @net_conf["vip"],
+              "type" => "vip"
+          }
+        end
+
+        @networks
       end
 
       private

data/lib/deployer/instance_manager/aws.rb

@@ -128,7 +128,15 @@ module Bosh::Deployer
 
       def discover_bosh_ip
         if exists?
-          ip = cloud.ec2.instances[state.vm_cid].public_ip_address
+          # choose elastic IP over public, as any agent connecting to the
+          # deployed micro bosh will be cut off from the public IP when
+          # we re-deploy micro bosh
+          if cloud.ec2.instances[state.vm_cid].has_elastic_ip?
+            ip = cloud.ec2.instances[state.vm_cid].elastic_ip.public_ip
+          else
+            ip = cloud.ec2.instances[state.vm_cid].public_ip_address
+          end
+
           if ip != Config.bosh_ip
             Config.bosh_ip = ip
             logger.info("discovered bosh ip=#{Config.bosh_ip}")
@@ -142,14 +150,14 @@ module Bosh::Deployer
         cloud.ec2.instances[state.vm_cid].private_ip_address
       end
 
-      # @return [Integer] size in kB
+      # @return [Integer] size in MiB
       def disk_size(cid)
-        # AWS stores disk size in MiB but we work with kB
+        # AWS stores disk size in GiB but the CPI uses MiB
         cloud.ec2.volumes[cid].size * 1024
       end
 
       def persistent_disk_changed?
-        # since AWS stores disk size in MiB and we use kB there
+        # since AWS stores disk size in GiB and the CPI uses MiB there
         # is a risk of conversion errors which lead to an unnecessary
         # disk migration, so we need to do a double conversion
         # here to avoid that

data/lib/deployer/instance_manager/openstack.rb

@@ -0,0 +1,256 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+require 'net/ssh'
+
+module Bosh::Deployer
+  class InstanceManager
+
+    class Openstack < InstanceManager
+
+      def update_spec(spec)
+        spec = super(spec)
+        properties = spec["properties"]
+
+        properties["openstack"] =
+          Config.spec_properties["openstack"] ||
+          Config.cloud_options["properties"]["openstack"].dup
+
+        properties["openstack"]["registry"] = Config.cloud_options["properties"]["registry"]
+        properties["openstack"]["stemcell"] = Config.cloud_options["properties"]["stemcell"]
+
+        spec.delete("networks")
+
+        spec
+      end
+
+      def configure
+        properties = Config.cloud_options["properties"]
+        @ssh_user = properties["openstack"]["ssh_user"]
+        @ssh_port = properties["openstack"]["ssh_port"] || 22
+        @ssh_wait = properties["openstack"]["ssh_wait"] || 60
+
+        key = properties["openstack"]["private_key"]
+        unless key
+          raise ConfigError, "Missing properties.openstack.private_key"
+        end
+        @ssh_key = File.expand_path(key)
+        unless File.exists?(@ssh_key)
+          raise ConfigError, "properties.openstack.private_key '#{key}' does not exist"
+        end
+
+        uri = URI.parse(properties["registry"]["endpoint"])
+        user, password = uri.userinfo.split(":", 2)
+        @registry_port = uri.port
+
+        @registry_db = Tempfile.new("openstack_registry_db")
+        @registry_db_url = "sqlite://#{@registry_db.path}"
+
+        registry_config = {
+          "logfile" => "./openstack_registry.log",
+          "http" => {
+            "port" => uri.port,
+            "user" => user,
+            "password" => password
+          },
+          "db" => {
+            "database" => @registry_db_url
+          },
+          "openstack" => properties["openstack"]
+        }
+
+        @registry_config = Tempfile.new("openstack_registry_yml")
+        @registry_config.write(YAML.dump(registry_config))
+        @registry_config.close
+      end
+
+      def start
+        configure()
+
+        Sequel.connect(@registry_db_url) do |db|
+          migrate(db)
+          servers = @deployments["openstack_servers"]
+          db[:openstack_servers].insert_multiple(servers) if servers
+        end
+
+        unless has_openstack_registry?
+          raise "openstack_registry command not found - " +
+            "run 'gem install bosh_openstack_registry'"
+        end
+
+        cmd = "openstack_registry -c #{@registry_config.path}"
+
+        @registry_pid = spawn(cmd)
+
+        5.times do
+          sleep 0.5
+          if Process.waitpid(@registry_pid, Process::WNOHANG)
+            raise Error, "`#{cmd}` failed, exit status=#{$?.exitstatus}"
+          end
+        end
+
+        timeout_time = Time.now.to_f + (60 * 5)
+        http_client = HTTPClient.new()
+        begin
+          http_client.head("http://127.0.0.1:#{@registry_port}")
+          sleep 0.5
+        rescue URI::Error, SocketError, Errno::ECONNREFUSED => e
+          if timeout_time - Time.now.to_f > 0
+            retry
+          else
+            raise "Cannot access openstack_registry: #{e.message}"
+          end
+        end
+        logger.info("openstack_registry is ready on port #{@registry_port}")
+      ensure
+        @registry_config.unlink if @registry_config
+      end
+
+      def stop
+        if @registry_pid && process_exists?(@registry_pid)
+          Process.kill("INT", @registry_pid)
+          Process.waitpid(@registry_pid)
+        end
+
+        return unless @registry_db_url
+
+        Sequel.connect(@registry_db_url) do |db|
+          @deployments["openstack_servers"] = db[:openstack_servers].map {|row| row}
+        end
+
+        save_state
+        @registry_db.unlink if @registry_db
+      end
+
+      def wait_until_agent_ready
+        tunnel(@registry_port)
+        super
+      end
+
+      def discover_bosh_ip
+        if exists?
+          server = cloud.openstack.servers.get(state.vm_cid)
+          ip = server.public_ip_address
+          ip = server.private_ip_address if ip.nil? || ip.empty?
+          if ip.nil? || ip.empty?
+            raise "Unable to discover bosh ip"
+          else
+            if ip["addr"] != Config.bosh_ip
+              Config.bosh_ip = ip["addr"]
+              logger.info("discovered bosh ip=#{Config.bosh_ip}")
+            end
+          end
+        end
+
+        super
+      end
+
+      def service_ip
+        ip = cloud.openstack.servers.get(state.vm_cid).private_ip_address
+        ip["addr"] unless ip.nil? || ip.empty?
+      end
+
+      # @return [Integer] size in MiB
+      def disk_size(cid)
+        # OpenStack stores disk size in GiB but we work with MiB
+        cloud.openstack.volumes.get(cid).size * 1024
+      end
+
+      def persistent_disk_changed?
+        # since OpenStack stores disk size in GiB and we use MiB there
+        # is a risk of conversion errors which lead to an unnecessary
+        # disk migration, so we need to do a double conversion
+        # here to avoid that
+        requested = (Config.resources['persistent_disk'] / 1024.0).ceil * 1024
+        requested != disk_size(state.disk_cid)
+      end
+
+      private
+
+      # TODO this code is similar to has_stemcell_copy?
+      # move the two into bosh_common later
+      def has_openstack_registry?(path=ENV['PATH'])
+        path.split(":").each do |dir|
+          return true if File.exist?(File.join(dir, "openstack_registry"))
+        end
+        false
+      end
+
+      def migrate(db)
+        db.create_table :openstack_servers do
+          primary_key :id
+          column :server_id, :text, :unique => true, :null => false
+          column :settings, :text, :null => false
+        end
+      end
+
+      def process_exists?(pid)
+        begin
+          Process.kill(0, pid)
+        rescue Errno::ESRCH
+          false
+        end
+      end
+
+      def socket_readable?(ip, port)
+        socket = TCPSocket.new(ip, port)
+        if IO.select([socket], nil, nil, 5)
+          logger.debug("tcp socket #{ip}:#{port} is readable")
+          yield
+          true
+        else
+          false
+        end
+      rescue SocketError => e
+        logger.debug("tcp socket #{ip}:#{port} SocketError: #{e.inspect}")
+        sleep 1
+        false
+      rescue SystemCallError => e
+        logger.debug("tcp socket #{ip}:#{port} SystemCallError: #{e.inspect}")
+        sleep 1
+        false
+      ensure
+        socket.close if socket
+      end
+
+      def tunnel(port)
+        return if @session
+
+        ip = discover_bosh_ip
+
+        loop until socket_readable?(ip, @ssh_port) do
+          #sshd is up, sleep while host keys are generated
+          sleep @ssh_wait
+        end
+
+        lo = "127.0.0.1"
+        cmd = "ssh -R #{port}:#{lo}:#{port} #{@ssh_user}@#{ip}"
+
+        logger.info("Preparing for ssh tunnel: #{cmd}")
+        loop do
+          begin
+            @session = Net::SSH.start(ip, @ssh_user, :keys => [@ssh_key],
+                                      :paranoid => false)
+            logger.debug("ssh #{@ssh_user}@#{ip}: ESTABLISHED")
+            break
+          rescue => e
+            logger.debug("ssh start #{@ssh_user}@#{ip} failed: #{e.inspect}")
+            sleep 1
+          end
+        end
+
+        @session.forward.remote(port, lo, port)
+        logger.info("`#{cmd}` started: OK")
+
+        Thread.new do
+          begin
+            @session.loop { true }
+          rescue IOError => e
+            logger.debug("`#{cmd}` terminated: #{e.inspect}")
+            @session = nil
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/deployer/instance_manager/vsphere.rb

@@ -27,7 +27,7 @@ module Bosh::Deployer
       end
     end
 
-    # @return [Integer] size in kB
+    # @return [Integer] size in MiB
     def disk_size(cid)
       disk_model[cid].size
     end

data/lib/deployer/instance_manager.rb

@@ -350,13 +350,17 @@ module Bosh::Deployer
         properties["director"]["name"] = Config.name
       end
 
-      %w{blobstore postgres director redis nats aws_registry}.each do |service|
-        next unless properties[service]
-        properties[service]["address"] = service_ip
+      # blobstore and nats need to use an elastic IP (if available),
+      # as when the micro bosh instance is re-created during a
+      # deployment, it might get a new private IP
+      %w{blobstore nats}.each do |service|
+        update_agent_service_address(properties, service, bosh_ip)
+      end
 
-        if override = Config.spec_properties[service]
-          properties[service].merge!(override)
-        end
+      services = %w{postgres director redis blobstore nats aws_registry
+                    openstack_registry}
+      services.each do |service|
+        update_service_address(properties, service, service_ip)
       end
 
       spec
@@ -382,6 +386,28 @@ module Bosh::Deployer
 
     private
 
+    # update the agent service section from the contents of the apply_spec
+    def update_agent_service_address(properties, service, address)
+      if Config.agent_properties
+        agent = properties["agent"] ||= {}
+        svc = agent[service] ||= {}
+        svc["address"] = address
+
+        if override = Config.agent_properties[service]
+          svc.merge!(override)
+        end
+      end
+    end
+
+    def update_service_address(properties, service, address)
+      return unless properties[service]
+      properties[service]["address"] = address
+
+      if override = Config.spec_properties[service]
+        properties[service].merge!(override)
+      end
+    end
+
     def bosh_ip
       Config.bosh_ip
     end

data/lib/deployer/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Deployer
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_deployer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,55 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.2
+- !ruby/object:Gem::Dependency
+  name: bosh_aws_registry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: bosh_openstack_cpi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: bosh_openstack_registry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: agent_client
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +162,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - config/aws_defaults.yml
+- config/openstack_defaults.yml
 - config/vsphere_defaults.yml
 - lib/bosh/cli/commands/micro.rb
 - lib/deployer.rb
@@ -122,6 +171,7 @@ files:
 - lib/deployer/helpers.rb
 - lib/deployer/instance_manager.rb
 - lib/deployer/instance_manager/aws.rb
+- lib/deployer/instance_manager/openstack.rb
 - lib/deployer/instance_manager/vsphere.rb
 - lib/deployer/models/instance.rb
 - lib/deployer/version.rb
@@ -142,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -397846320824722837
+      hash: -2032018102027977195
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -397846320824722837
+      hash: -2032018102027977195
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24