bosh-bootstrap 0.14.2 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af248e749e33a61d0c03cc066b5200b093c3b835
-  data.tar.gz: a6de1b93227da6d75030c2f38cf7e08dedf86c0a
+  metadata.gz: 107abb3ad26122e0fa2fb1e8b2eab29b753ab9e5
+  data.tar.gz: 25d5e7ef383295c216ba761477fdbab6d58a934d
 SHA512:
-  metadata.gz: d5e5a743abb0cf0462e9f8f362dc7b874dd222ccb175bb3a5a7bcc3a276b7fe8e2f7f8bf6565e66b02538caef168376778dc80a9b1396e5f96a1a7c185943b49
-  data.tar.gz: cda9ac07e4a1827cf3be8be1b30987c42f44930a999205cd8ba1a4f816efcc0ace9ddbf04c97da1bce8785684a4771fd855a75ee2fb6242500a9d8ecaa06d757
+  metadata.gz: 6909070081d3a519a4b270f8b637d8c03e5e42f6088836b1d6ba5bf9de0303b3a5fe1f4b4d593ebf3df6dc4fd66abcfa700445bf129021edd5995459cab0e7bb
+  data.tar.gz: 4fffaadec6c276db11f36501f46832002418a478ea51ddb56e4bedb9e5675b2a51b5780d59babd7df76867ef59331ddebcb74423e0bc42343ee7894829e6cfe5

data/ChangeLog.md

@@ -9,12 +9,14 @@ bosh-bootstrap deploy
 ```
 
 v0.14
+-----
 
 -	default target directory is current director, rather than `~/.microbosh`
 -	fixed to use new stemcells
 -	[aws] VPC support - detects if VPCs available and allows selection, then select of subset, then creates security groups into the VPC
 -	[aws vpc] network type: manual for vpc
 -	[aws] reuse existing bosh stemcell AMIs - automatically detects if a stemcell has been uploaded/converted into an AMI [v0.14.2]
+-	[openstack] reuse existing bosh stemcell images - automatically detects if a stemcell has been uploaded/converted into an OpenStack image [v0.14.3]
 
 v0.13
 -----

data/lib/bosh-bootstrap/cli/commands/deploy.rb

@@ -68,6 +68,7 @@ class Bosh::Bootstrap::Cli::Commands::Deploy
     end
     settings.set("bosh.stemcell_path", stemcell_path)
     puts settings.bosh.stemcell_path
+    save_settings!
   end
 
   def perform_microbosh_deploy

data/lib/bosh-bootstrap/microbosh_providers/base.rb

@@ -60,7 +60,7 @@ class Bosh::Bootstrap::MicroboshProviders::Base
   end
 
   def stemcell_path
-    unless settings.exists?("bosh.stemcell_path")
+    settings.exists?("bosh.stemcell_path") || begin
       if image = discover_if_stemcell_image_already_uploaded
         return image
       end

data/lib/bosh-bootstrap/microbosh_providers/openstack.rb

@@ -131,6 +131,26 @@ module Bosh::Bootstrap::MicroboshProviders
       end
     end
 
+    def owned_images
+      fog_compute.images
+    end
+
+    # @return [String] Any AMI imageID
+    # e.g. "BOSH-14c85f35-3dd3-4200-af85-ada65216b2de" for given BOSH stemcell name/version
+    # Usage: find_ami_for_stemcell("bosh-openstack-kvm-ubuntu-trusty-go_agent", "2732")
+    def find_image_for_stemcell(name, version)
+      image = owned_images.find do |image|
+        metadata = image.metadata
+        metadata_name = metadata.find { |m| m.key == "name" }
+        metadata_version = metadata.find { |m| m.key == "version" }
+        metadata_name && metadata_version && metadata_name.value == name && metadata_version.value == version
+      end
+      image.name if image
+    end
+
+    def discover_if_stemcell_image_already_uploaded
+      find_image_for_stemcell(latest_stemcell.stemcell_name, latest_stemcell.version)
+    end
   end
 end
 Bosh::Bootstrap::MicroboshProviders.register_provider("openstack", Bosh::Bootstrap::MicroboshProviders::OpenStack)

data/lib/bosh-bootstrap/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Bootstrap
-    VERSION = "0.14.2"
+    VERSION = "0.14.3"
   end
 end

data/spec/unit/microbosh_providers/openstack_spec.rb

@@ -95,4 +95,29 @@ describe Bosh::Bootstrap::MicroboshProviders::OpenStack do
       yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.openstack.boot_from_volume.yml"))
     end
   end
+
+  describe "existing stemcells as openstack images" do
+
+    it "finds match" do
+      subject = Bosh::Bootstrap::MicroboshProviders::OpenStack.new(microbosh_yml, settings, fog_compute)
+      expect(subject).to receive(:owned_images).and_return([
+        instance_double("Fog::Compute::OpenStack::Image",
+          name: "BOSH-14c85f35-3dd3-4200-af85-ada65216b2de",
+          metadata: [
+            instance_double("Fog::Compute::OpenStack::Metadata",
+              key: "name", value: "bosh-openstack-kvm-ubuntu-trusty-go_agent"),
+            instance_double("Fog::Compute::OpenStack::Metadata",
+              key: "version", value: "2732"),
+        ])
+      ])
+      expect(subject.find_image_for_stemcell("bosh-openstack-kvm-ubuntu-trusty-go_agent", "2732")).to eq("BOSH-14c85f35-3dd3-4200-af85-ada65216b2de")
+    end
+
+    it "doesn't find match" do
+      subject = Bosh::Bootstrap::MicroboshProviders::OpenStack.new(microbosh_yml, settings, fog_compute)
+      expect(subject).to receive(:owned_images).and_return([])
+      expect(subject.find_image_for_stemcell("xxxx", "12345")).to be_nil
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.3
 platform: ruby
 authors:
 - Dr Nic Williams