bosh_deployer 0.6.0 → 1.0

data/Rakefile

@@ -36,16 +36,26 @@ BundlerTask.new
 if defined?(RSpec)
   namespace :spec do
     desc "Run Unit Tests"
-    rspec_task = RSpec::Core::RakeTask.new(:unit) do |t|
+    unit_rspec_task = RSpec::Core::RakeTask.new(:unit) do |t|
       t.pattern = "spec/unit/**/*_spec.rb"
-      t.rspec_opts = %w(--format progress --colour)
+      t.rspec_opts = %w(--format progress --color)
     end
 
     CiTask.new do |task|
-      task.rspec_task = rspec_task
+      task.rspec_task = unit_rspec_task
+    end
+
+    desc "Run Integration Tests"
+    functional_rspec_task = RSpec::Core::RakeTask.new(:functional) do |t|
+      t.pattern = "spec/functional/**/*_spec.rb"
+      t.rspec_opts = %w(--format progress --color)
+    end
+
+    CiTask.new do |task|
+      task.rspec_task = functional_rspec_task
     end
   end
 
   desc "Install dependencies and run tests"
-  task :spec => %w(bundler:install:test spec:unit)
+  task :spec => %w(bundler:install:test spec:unit spec:functional)
 end

data/config/openstack_defaults.yml

@@ -8,6 +8,7 @@ dir:
 
 network:
   type: dynamic
+  label: private
   cloud_properties: {}
 
 env:
@@ -48,3 +49,6 @@ cloud:
 
 apply_spec:
   properties: {}
+  agent:
+    blobstore: {}
+    nats: {}

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

@@ -10,54 +10,61 @@ module Bosh::Cli::Command
     MICRO_DIRECTOR_PORT = 25555
     DEFAULT_CONFIG_PATH = File.expand_path("~/.bosh_deployer_config")
 
-    command :micro_deployment do
-      usage "micro deployment [<name>]"
-      desc  "Choose micro deployment to work with"
-      route { |args| (args.size > 0) ? [:micro, :set_current] : [:micro, :show_current] }
+    def initialize(runner)
+      super(runner)
+      options[:config] ||= DEFAULT_CONFIG_PATH #hijack Cli::Config
     end
 
-    command :micro_status do
-      usage "micro status"
-      desc  "Display micro BOSH deployment status"
-      route :micro, :status
+    usage "micro deployment"
+    desc  "Choose micro deployment to work with, or display current deployment"
+    def micro_deployment(name=nil)
+      if name
+        set_current(name)
+      else
+        show_current
+      end
     end
 
-    command :micro_list_deployments do
-      usage "micro deployments"
-      desc  "Show the list of deployments"
-      route :micro, :list
-    end
+    def set_current(name)
+      manifest_filename = find_deployment(name)
 
-    command :micro_deploy do
-      usage  "micro deploy [<stemcell>]"
-      desc   "Deploy a micro BOSH instance to the currently selected deployment"
-      option "--update", "update existing instance"
-      route  :micro, :perform
-    end
+      if !File.exists?(manifest_filename)
+        err "Missing manifest for #{name} (tried '#{manifest_filename}')"
+      end
 
-    command :micro_delete do
-      usage  "micro delete"
-      desc   "Delete micro BOSH instance (including persistent disk)"
-      route  :micro, :delete
-    end
+      manifest = load_yaml_file(manifest_filename)
 
-    command :micro_agent do
-      usage "micro agent <args>"
-      desc  "Send agent messages"
-      route :micro, :agent
-    end
+      unless manifest.is_a?(Hash)
+        err "Invalid manifest format"
+      end
+
+      if manifest["network"].blank?
+        err "network is not defined in deployment manifest"
+      end
+      ip = deployer(manifest_filename).discover_bosh_ip || name
+
+      if target
+        old_director_ip = URI.parse(target).host
+      else
+        old_director_ip = nil
+      end
 
-    command :micro_apply do
-      usage "micro apply <spec>"
-      desc  "Apply spec"
-      route :micro, :apply
+      if old_director_ip != ip
+        set_target(ip)
+        say "#{"WARNING!".red} Your target has been changed to `#{target.red}'!"
+      end
+
+      say "Deployment set to '#{manifest_filename.green}'"
+      config.set_deployment(manifest_filename)
+      config.save
     end
 
-    def initialize(options = {})
-      options[:config] ||= DEFAULT_CONFIG_PATH #hijack Cli::Config
-      super(options)
+    def show_current
+      say(deployment ? "Current deployment is '#{deployment.green}'" : "Deployment not set")
     end
 
+    usage "micro status"
+    desc  "Display micro BOSH deployment status"
     def status
       stemcell_cid = deployer_state(:stemcell_cid)
       stemcell_name = deployer_state(:stemcell_name)
@@ -78,9 +85,11 @@ module Bosh::Cli::Command
       say("Target".ljust(15) + target_name)
     end
 
-    def perform(*options)
-      update = options.delete("--update")
-      stemcell = options.shift
+    usage  "micro deploy"
+    desc   "Deploy a micro BOSH instance to the currently selected deployment"
+    option "--update", "update existing instance"
+    def perform(stemcell=nil)
+      update = !!options[:update]
 
       err "No deployment set" unless deployment
 
@@ -158,6 +167,8 @@ module Bosh::Cli::Command
       say("Deployed #{desc}, took #{format_time(duration).green} to complete")
     end
 
+    usage  "micro delete"
+    desc   "Delete micro BOSH instance (including persistent disk)"
     def delete
       unless deployer.exists?
         err "No existing instance to delete"
@@ -188,44 +199,8 @@ module Bosh::Cli::Command
       say("Deleted deployment '#{name}', took #{format_time(duration).green} to complete")
     end
 
-    def set_current(name)
-      manifest_filename = find_deployment(name)
-
-      if !File.exists?(manifest_filename)
-        err "Missing manifest for #{name} (tried '#{manifest_filename}')"
-      end
-
-      manifest = load_yaml_file(manifest_filename)
-
-      unless manifest.is_a?(Hash)
-        err "Invalid manifest format"
-      end
-
-      if manifest["network"].blank?
-        err "network is not defined in deployment manifest"
-      end
-      ip = deployer(manifest_filename).discover_bosh_ip || name
-
-      if target
-        old_director_ip = URI.parse(target).host
-      else
-        old_director_ip = nil
-      end
-
-      if old_director_ip != ip
-        set_target(ip)
-        say "#{"WARNING!".red} Your target has been changed to `#{target.red}'!"
-      end
-
-      say "Deployment set to '#{manifest_filename.green}'"
-      config.set_deployment(manifest_filename)
-      config.save
-    end
-
-    def show_current
-      say(deployment ? "Current deployment is '#{deployment.green}'" : "Deployment not set")
-    end
-
+    usage "micro deployments"
+    desc  "Show the list of deployments"
     def list
       file = File.join(work_dir, DEPLOYMENTS_FILE)
       if File.exists?(file)
@@ -251,6 +226,8 @@ module Bosh::Cli::Command
       say("Deployments total: %d" % deployments.size)
     end
 
+    usage "micro agent <args>"
+    desc  "Send agent messages"
     def agent(*args)
       message = args.shift
       args = args.map do |arg|
@@ -264,6 +241,8 @@ module Bosh::Cli::Command
       say(deployer.agent.send(message.to_sym, *args).pretty_inspect)
     end
 
+    usage "micro apply"
+    desc  "Apply spec"
     def apply(spec)
       deployer.apply(load_yaml_file(spec))
     end

data/lib/deployer/config.rb

@@ -10,7 +10,7 @@ module Bosh::Deployer
       include Helpers
 
       attr_accessor :logger, :db, :uuid, :resources, :cloud_options,
-        :spec_properties, :agent_properties, :bosh_ip, :env, :name
+        :spec_properties, :agent_properties, :bosh_ip, :env, :name, :net_conf
 
       def configure(config)
         plugin = cloud_plugin(config)

data/lib/deployer/instance_manager/openstack.rb

@@ -129,15 +129,20 @@ module Bosh::Deployer
       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
+          # LP OpenStack Nova 185110:
+          # Since OS API 1.1, server addresses exposes the network names
+          # instead of the network types. so we need to fetch the
+          # os-floating-ips and find if any of them is associated to the
+          # server in order to get its public address.
+          floating_ip = cloud.openstack.addresses.find {
+                          |addr| addr.instance_id == server.id
+                        }
+          ip = floating_ip.nil? ? service_ip : floating_ip.ip
+          raise "Unable to discover bosh ip" if ip.nil?
+
+          if ip != Config.bosh_ip
+            Config.bosh_ip = ip
+            logger.info("discovered bosh ip=#{Config.bosh_ip}")
           end
         end
 
@@ -145,8 +150,21 @@ module Bosh::Deployer
       end
 
       def service_ip
-        ip = cloud.openstack.servers.get(state.vm_cid).private_ip_address
-        ip["addr"] unless ip.nil? || ip.empty?
+        server = cloud.openstack.servers.get(state.vm_cid)
+        # LP OpenStack Nova 185110:
+        # Since OS API 1.1, server addresses exposes the network names
+        # instead of the network types, so we need to known which network
+        # label is used in OS (label parm or "private" by default) to fetch
+        # the service IP address.
+        net_conf  = Config.net_conf
+        net_label = net_conf["label"].nil? ? "private" : net_conf["label"]
+        ip_addresses = server.addresses[net_label]
+        unless ip_addresses.nil? || ip_addresses.empty?
+          address = ip_addresses.select { |ip| ip["version"] == 4 }.first
+          ip = address ? address["addr"] : nil
+        end
+        raise "Unable to discover service ip" if ip.nil?
+        ip
       end
 
       # @return [Integer] size in MiB

data/lib/deployer/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Deployer
-    VERSION = "0.6.0"
+    VERSION = "1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_deployer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: '1.0'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.19.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.19.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -914290662432326556
+      hash: -4201748784491997897
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -914290662432326556
+      hash: -4201748784491997897
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24