bosh-bootstrap 0.12.0 → 0.13.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDZkNmI0MDEyODI1NGNiMjRjYmJjZmExOGY4ZmFmZDNkNWY3YzIwOA==
-  data.tar.gz: !binary |-
-    MGQzNWNkMWZkZTE2ODZmMzU2Y2EwY2EwNTQxMDM5YTk0YzJjZDcwOQ==
+SHA1:
+  metadata.gz: 3234c415f1c36b95d1afdbff6bddc71547be43c2
+  data.tar.gz: 4e45a51e0833104c7f173477579c6b859f6477e3
 SHA512:
-  metadata.gz: !binary |-
-    NmVkNTdiMTM1ZmFkMWMzYjUyMGIwNDU1NWZjZGZkYmUyYWRjMGJkZmZmNDg4
-    ZThhZjI5NjMyODBjOTZlNDUzMWQ1MGZhMzJlNGVjMmE3MjA3NDVmNGQ2NjBm
-    MzY3YzExMGMwODIwOWE3N2Q2YjFkMjI4YWVlOTY2OWNhNzMwODI=
-  data.tar.gz: !binary |-
-    YzU3ZDQ0ODE4NmJiYjQzYTU1NDlmYWIwZmRkMGY4Njk1NDljZTY3YjZiYzE2
-    ZWQ3NTQyZDg1ZjQyYzBiMTRkYWQ4MDQ5YWNjMjdhNjVhZjA3YWI1YjE1ZWZj
-    YTgwNDU0MDNkYmU0MDM0YzcyN2ExZjNiODhjZjAzZGFiYjgwMjU=
+  metadata.gz: 6dbcaeeca32850eedf92bcf937142b347a461c5719bb9461ecdc8fd554b8b56c7695e16448df206c86cddbbc8dc195fe4d0bb3faa6bfbac4db13fdd14ab8365f
+  data.tar.gz: 29598c72646bddb8b601debcb9f7af6180600929ec2e3d6a6743d899ea0741b7ef625c2d5f136e737ae9fb7b309561ef0ec0e923789203eece7cff113625181c

data/.travis.yml

@@ -2,8 +2,8 @@ language: ruby
 script: bundle exec rake spec:$SUITE
 rvm:
   - ruby-1.9.3
-  - rbx-19mode
   - ruby-2.0.0
+  - ruby-2.1.0
 notifications:
   email:
     recipients:

data/ChangeLog.md

@@ -1,129 +1,148 @@
-# Change Log
+Change Log
+==========
 
 `bosh-bootstrap` is a command line tool that you can run on your laptop and automatically get a microbosh (and an inception VM) deployed on AWS (with OpenStack & vSphere coming soon).
 
-    gem install bosh-bootstrap
-    bosh-bootstrap deploy
-
-## Next
-
-## v0.12
-
-* vSphere support [thanks Matt Stine!!]
-
-## v0.11
-
-* Complete rewrite of bosh-bootstrap in orphan branch
-* CodeClimate score changed from 0.82 to 3.85
-* Initial support for AWS EC2; WIP for OpenStack; initial unit tests for vSphere
-* Interactive Q&A is extracted into [cyoi](https://github.com/drnic/cyoi) (choose-your-own-infrastructure) library
-* Accessing settings is much cleaner; functionality moved into fork of settingslogic called [readwritesettings](https://github.com/drnic/readwritesettings)
-* Inception VM/server is now provisioned via separate CLI project [inception-server](https://github.com/drnic/inception-server)
-* AWS/us-east-1 uses public AMIs; other regions & other CPIs use stemcells
-* CLI via bosh plugin (`bosh bootstrap`) rather than a stand alone CLI (`bosh-bootstrap`)
-* Added `ssh` action to ssh into the microbosh
-* Added `delete` actions to delete the microbosh (but not the IP address and security groups)
-* Add back `bosh-bootstrap` CLI & remove bosh_cli dependency (v0.11.1)
-* Specify which AWS AZ to use via `provider.az` in settings.yml (v0.11.2)
-* Support for OpenStack (also in cyoi 0.4.3) thanks to Ferdy! (v0.11.3)
-* Ensure CLI loads bundler (v0.11.4)
-* rubygem users should be able to install & run from rubygems instead of source workaround (v0.11.5)
-* microbosh volume is smaller 4G and automatically fits on devstack/openstack (v0.11.5; thx @ryfow)
-* Security group `bosh_agent_http` renamed to `bosh_agent_https`, with same 6868 port for talking to bosh_agent running in https mode (`bosh_agent_http` can then be deleted) (v0.11.5)
-* Add port 53/dns security group (v0.11.6)
-* Port 53 open on UDP only as workaround for multi-region AWS (v0.11.7; thx @yudai)
-* Suppress bundler git "fatal" warnings (by converting ~/.microbosh into git repo) (v0.11.8)
-* Update to newer-er-er stemcell paths from Pivotal's s3 bucket (v0.11.9, v0.11.10)
-* Enlarge persistent disk from 4G to 16G (v0.11.11)
-* bosh_cli gems now on rubygems instead of pivotal s3 bucket (v0.11.12)
-* OpenStack improvements to reduce POST API throttling (v0.11.13)
-* Can now update a running microbosh (thanks @lookitup4me) (v0.11.14)
-* OpenStack uses commonly available m1.medium flavor instead of bespoke m1.microbosh (v0.11.14)
-* Properly enlarge persistent disk from 4G to 16G (v0.11.15)
-
-## v0.10
+```
+gem install bosh-bootstrap
+bosh-bootstrap deploy
+```
+
+v0.13
+-----
+
+- [openstack] Neutron support - detects that Neutron is available and prompts for which subnet to use
+- [openstack] Boot from volume - prompt for which images should be used (QCOW2 vs RAW) and configure MicroBOSH to use boot_from_volume if RAW format required
+- only create 3 security groups instead of many (fix for new AWS accounts and OpenStack tenants with small quotas)
+- testing for ruby 2.1.0; though BOSH still requires 1.9.3 at time of writing
+- upgrade rspec for 3.0 and using expect/to syntax
+
+v0.12
+-----
+
+- vSphere support [thanks Matt Stine!!]
+
+v0.11
+-----
+
+- Complete rewrite of bosh-bootstrap in orphan branch
+- CodeClimate score changed from 0.82 to 3.85
+- Initial support for AWS EC2; WIP for OpenStack; initial unit tests for vSphere
+- Interactive Q&A is extracted into [cyoi](https://github.com/drnic/cyoi) (choose-your-own-infrastructure) library
+- Accessing settings is much cleaner; functionality moved into fork of settingslogic called [readwritesettings](https://github.com/drnic/readwritesettings)
+- Inception VM/server is now provisioned via separate CLI project [inception-server](https://github.com/drnic/inception-server)
+- AWS/us-east-1 uses public AMIs; other regions & other CPIs use stemcells
+- CLI via bosh plugin (`bosh bootstrap`) rather than a stand alone CLI (`bosh-bootstrap`)
+- Added `ssh` action to ssh into the microbosh
+- Added `delete` actions to delete the microbosh (but not the IP address and security groups)
+- Add back `bosh-bootstrap` CLI & remove bosh_cli dependency (v0.11.1)
+- Specify which AWS AZ to use via `provider.az` in settings.yml (v0.11.2)
+- Support for OpenStack (also in cyoi 0.4.3) thanks to Ferdy! (v0.11.3)
+- Ensure CLI loads bundler (v0.11.4)
+- rubygem users should be able to install & run from rubygems instead of source workaround (v0.11.5)
+- microbosh volume is smaller 4G and automatically fits on devstack/openstack (v0.11.5; thx @ryfow)
+- Security group `bosh_agent_http` renamed to `bosh_agent_https`, with same 6868 port for talking to bosh_agent running in https mode (`bosh_agent_http` can then be deleted) (v0.11.5)
+- Add port 53/dns security group (v0.11.6)
+- Port 53 open on UDP only as workaround for multi-region AWS (v0.11.7; thx @yudai)
+- Suppress bundler git "fatal" warnings (by converting ~/.microbosh into git repo) (v0.11.8)
+- Update to newer-er-er stemcell paths from Pivotal's s3 bucket (v0.11.9, v0.11.10)
+- Enlarge persistent disk from 4G to 16G (v0.11.11)
+- bosh_cli gems now on rubygems instead of pivotal s3 bucket (v0.11.12)
+- OpenStack improvements to reduce POST API throttling (v0.11.13)
+- Can now update a running microbosh (thanks @lookitup4me) (v0.11.14)
+- OpenStack uses commonly available m1.medium flavor instead of bespoke m1.microbosh (v0.11.14)
+- Properly enlarge persistent disk from 4G to 16G (v0.11.15)
+
+v0.10
+-----
 
 Available on branch [v0.10](https://github.com/StarkAndWayne/bosh-bootstrap/tree/v0.10).
 
 Install using:
 
-    gem install bosh-bootstrap -v "~> 0.10.0"
+```
+gem install bosh-bootstrap -v "~> 0.10.0"
+```
 
-* Only using latest pre-release bosh gems & stemcells/amis - do not upgrade if you want the old 2012 gems
-* AWS us-east-1 uses a pre-built AMI for extra speed
-* AWS all regions are working (using pre-created stemcell)
-* OpenStack is now working (using pre-created stemcell)
-* `deploy --create-inception` chooses to create an inception VM
-* Using `bosh_cli_plugin_micro` (for `bosh micro`) [was `bosh_deployer`]  (v1.10.1)
-* `bosh-cloudfoundry` gem installed with prerelease gems (fix in v0.10.1)
-* AWS inception VM gets its attached volume again (v1.10.2)
+- Only using latest pre-release bosh gems & stemcells/amis - do not upgrade if you want the old 2012 gems
+- AWS us-east-1 uses a pre-built AMI for extra speed
+- AWS all regions are working (using pre-created stemcell)
+- OpenStack is now working (using pre-created stemcell)
+- `deploy --create-inception` chooses to create an inception VM
+- Using `bosh_cli_plugin_micro` (for `bosh micro`) [was `bosh_deployer`](v1.10.1)
+- `bosh-cloudfoundry` gem installed with prerelease gems (fix in v0.10.1)
+- AWS inception VM gets its attached volume again (v1.10.2)
 
-## v0.9
+v0.9
+----
 
-* v0.8 wasn't working for many people; and neither will v0.9; but its a move in the right direction.
-* Moving towards new 1.5.0 version of bosh that hasn't come out yet formally.
-* AWS us-east-1 will use a pre-created AMI. It saves about 10-15 minutes!
-* AWS other regions will use a pre-created stemcell. I haven't tested this well yet.
-* OpenStack support is still broken because you need to create your own stemcells and for that you need a 12.10 inception VM and that work isn't quite done yet.
+- v0.8 wasn't working for many people; and neither will v0.9; but its a move in the right direction.
+- Moving towards new 1.5.0 version of bosh that hasn't come out yet formally.
+- AWS us-east-1 will use a pre-created AMI. It saves about 10-15 minutes!
+- AWS other regions will use a pre-created stemcell. I haven't tested this well yet.
+- OpenStack support is still broken because you need to create your own stemcells and for that you need a 12.10 inception VM and that work isn't quite done yet.
 
-## v0.8
+v0.8
+----
 
-* SSH keys used to access inception VM are now generated and stored within the `~/.bosh_bootstrap/ssh` folder. This fixes many issues that many people were having (their keys had passphrases, their fog_default keypair was old). It also allows a manifest file to be shared between people as it contains the private key contents, and the private key file will be recreated if it is missing.
-* existing inception VMs' manifest.yml will be upgraded automatically and a backup file created (just in case)
-* tightening of net-ssh & net-scp gems to ensure the bosh-bootstrap gem can be installed [thx @mmb]
-* preinstall net-ssh/net-scp/fog on inception VM before installing `bosh_deployer` to fix in ability to install `bosh_deployer` 1.4.1 due to latest fog 1.10.0 release (v0.8.2)
+- SSH keys used to access inception VM are now generated and stored within the `~/.bosh_bootstrap/ssh` folder. This fixes many issues that many people were having (their keys had passphrases, their fog_default keypair was old). It also allows a manifest file to be shared between people as it contains the private key contents, and the private key file will be recreated if it is missing.
+- existing inception VMs' manifest.yml will be upgraded automatically and a backup file created (just in case)
+- tightening of net-ssh & net-scp gems to ensure the bosh-bootstrap gem can be installed [thx @mmb]
+- preinstall net-ssh/net-scp/fog on inception VM before installing `bosh_deployer` to fix in ability to install `bosh_deployer` 1.4.1 due to latest fog 1.10.0 release (v0.8.2)
 
-## v0.7
+v0.7
+----
 
 Notable:
 
-* For existing users: please run "deploy --upgrade-deps" as new inception package (runit) added; and jazor/yaml_command CLIs installed
-* Forces use of microbosh stemcell 0.8.1 which work with public gems (latest public stemcell does not work with public gems)
+- For existing users: please run "deploy --upgrade-deps" as new inception package (runit) added; and jazor/yaml_command CLIs installed
+- Forces use of microbosh stemcell 0.8.1 which work with public gems (latest public stemcell does not work with public gems)
 
 Added:
 
-* `mosh` command - connect to Inception VM on trains over flaky internet connections (use instead of `ssh` or `tmux` command) [thx @mrdavidlang]
-* `upgrade-inception` command - to perform an upgrade of the Inception VM without triggering a re-deploy of microbosh.
+- `mosh` command - connect to Inception VM on trains over flaky internet connections (use instead of `ssh` or `tmux` command) [thx @mrdavidlang]
+- `upgrade-inception` command - to perform an upgrade of the Inception VM without triggering a re-deploy of microbosh.
 
 Changes:
 
-* Inception VM now installs rubygems 2.0.0 & bundler 1.3.0
-* Better idempotence for re-deploying microbosh - will delete&deploy after a failure; will deploy after a deletion.
-* Downloads ubuntu 10.04 ISO to speed up custom stemcell builds
-* Using redcard to ensure ruby 1.9 only
-* `manifest.yml` stores the name of the stemcell created from a custom stemcell build; no longer re-creates stemcell each time
-* git color is enabled on inception VM
+- Inception VM now installs rubygems 2.0.0 & bundler 1.3.0
+- Better idempotence for re-deploying microbosh - will delete&deploy after a failure; will deploy after a deletion.
+- Downloads ubuntu 10.04 ISO to speed up custom stemcell builds
+- Using redcard to ensure ruby 1.9 only
+- `manifest.yml` stores the name of the stemcell created from a custom stemcell build; no longer re-creates stemcell each time
+- git color is enabled on inception VM
 
 Work in progress:
 
-* AWS VPC support was begin by the core bosh team; though work has stopped sadly.
-* Growing number of specs mostly using Fog.mock! mode; tests being run on travis
+- AWS VPC support was begin by the core bosh team; though work has stopped sadly.
+- Growing number of specs mostly using Fog.mock! mode; tests being run on travis
 
 ### v0.7.1
 
-* Make "deploy --private-key" option work [thx @dpw]
-* Add hypervisor for OpenStack stemcells [thx @frodenas]
-* Don't fail if `settings.fog_credentials.openstack_region` doesn't exist
-* Fix README for changed location of bosh-release [thx @scottfrederick]
-* No need to show  --latest-stemcell in README tutorial
+- Make "deploy --private-key" option work [thx @dpw]
+- Add hypervisor for OpenStack stemcells [thx @frodenas]
+- Don't fail if `settings.fog_credentials.openstack_region` doesn't exist
+- Fix README for changed location of bosh-release [thx @scottfrederick]
+- No need to show --latest-stemcell in README tutorial
 
-## v0.6
+v0.6
+----
 
 Highlights:
 
-* Defaults to downloading latest stemcell (rather than stable, which are getting old now).
-* Installs the Cloud Foundry plugin for bosh https://github.com/StarkAndWayne/bosh-cloudfoundry
+- Defaults to downloading latest stemcell (rather than stable, which are getting old now).
+- Installs the Cloud Foundry plugin for bosh https://github.com/StarkAndWayne/bosh-cloudfoundry
 
 Additions:
 
-* `tmux` - if you have tmux installed, then you can SSH into inception VM with it (thx @mrdavidlang)
-* started a test suite; its small but growing! (thx @mrdavidlang for getting it started)
+- `tmux` - if you have tmux installed, then you can SSH into inception VM with it (thx @mrdavidlang)
+- started a test suite; its small but growing! (thx @mrdavidlang for getting it started)
 
 Bug fixes:
 
-* Fog::SSH uses explicit ssh key that was requested to access inception VM
+- Fog::SSH uses explicit ssh key that was requested to access inception VM
 
 Future thoughts:
 
-* I hate Settingslogic for read-write settings. It's really only a read-only settings DSL. It puts Ruby classes into the YAML. Probably going to rip it out.
-* I am so sorry I took so long to start writing tests. It always seemed such a hard thing to write tests for. But bosh-cloudfoundry project has had good success with internal tests; so we're migrating those ideas into this project.
+- I hate Settingslogic for read-write settings. It's really only a read-only settings DSL. It puts Ruby classes into the YAML. Probably going to rip it out.
+- I am so sorry I took so long to start writing tests. It always seemed such a hard thing to write tests for. But bosh-cloudfoundry project has had good success with internal tests; so we're migrating those ideas into this project.

data/Gemfile

@@ -6,6 +6,7 @@ if File.directory?("../cyoi")
   gem "cyoi", path: "../cyoi"
 end
 
+gem "unf"
 group :development do
   gem "awesome_print"
   gem "rb-fsevent", "~> 0.9.1"

data/bosh-bootstrap.gemspec

@@ -22,13 +22,13 @@ EOS
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "cyoi", "~> 0.7"
+  gem.add_dependency "cyoi", "~> 0.9.0"
   gem.add_dependency "fog", "~> 1.11"
   gem.add_dependency "readwritesettings", "~> 3.0"
   gem.add_dependency "thor", "~> 0.18"
   gem.add_dependency "redcard"
   gem.add_dependency "rbvmomi"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rspec-fire"
   gem.add_development_dependency "fakeweb"
 end

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

@@ -31,7 +31,7 @@ class Bosh::Bootstrap::Cli::Commands::Deploy
     reload_settings!
   end
 
-  def provider_client
+  def cyoi_provider_client
     @provider_client ||= Cyoi::Providers.provider_client(settings.provider)
   end
 
@@ -42,7 +42,7 @@ class Bosh::Bootstrap::Cli::Commands::Deploy
     reload_settings!
 
     # TODO why passing provider_client rather than a Cyoi::Cli::Network object?
-    network = Bosh::Bootstrap::Network.new(settings.provider.name, provider_client)
+    network = Bosh::Bootstrap::Network.new(settings.provider.name, cyoi_provider_client)
     network.deploy
   end
 
@@ -74,4 +74,4 @@ class Bosh::Bootstrap::Cli::Commands::Deploy
     @microbosh ||= Bosh::Bootstrap::Microbosh.new(settings_dir, microbosh_provider)
     @microbosh.deploy(settings)
   end
-end
+end

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

@@ -57,11 +57,7 @@ module Bosh::Bootstrap::MicroboshProviders
     def security_groups
       ["ssh",
        "dns_server",
-       "bosh_agent_https",
-       "bosh_nats_server",
-       "bosh_blobstore",
-       "bosh_director",
-       "bosh_registry"]
+       "bosh"]
     end
 
     def aws_region

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

@@ -44,6 +44,10 @@ class Bosh::Bootstrap::MicroboshProviders::Base
     settings.address.ip
   end
 
+  def public_ip?
+    settings.exists?("address.ip")
+  end
+
   def private_key_path
     settings.key_pair.path
   end

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

@@ -30,13 +30,57 @@ module Bosh::Bootstrap::MicroboshProviders
       })
     end
 
-    # network:
-    #   type: dynamic
-    #   ip: 1.2.3.4
+    # For Nova/Floating IP:
+    #   network:
+    #     type: dynamic
+    #     vip: 1.2.3.4
+    # For Neutron/Floating IP:
+    #   network:
+    #     type: dynamic
+    #     vip: 1.2.3.4  # public floating IP
+    #     cloud_properties:
+    #       net_id: XXX # internal subnet
+    # For Neutron/Internal IP:
+    #   network:
+    #     type: manual
+    #     vip: 10.10.10.3 # an IP in subnets range
+    #     cloud_properties:
+    #       net_id: XXX   # internal subnet
     def network_configuration
-      {"type"=>"dynamic",
-        "vip"=>public_ip
-      }
+      if nova?
+        {
+          "type"=>"dynamic",
+          "vip"=>public_ip
+        }
+      elsif neutron? && using_external_gateway?
+        {
+          "type"=>"dynamic",
+          "vip"=>public_ip,
+          "cloud_properties" => {
+            "net_id" => settings.address.subnet_id
+          }
+        }
+      else
+        {
+          "type"=>"manual",
+          "ip"=>public_ip,
+          "cloud_properties" => {
+            "net_id" => settings.address.subnet_id
+          }
+        }
+      end
+    end
+
+    def nova?
+      !neutron?
+    end
+
+    def neutron?
+      settings.exists?("address.subnet_id")
+    end
+
+    def using_external_gateway?
+      settings.exists?("address.pool_name")
     end
 
     def persistent_disk
@@ -57,7 +101,8 @@ module Bosh::Bootstrap::MicroboshProviders
         "region"=>region,
         "default_security_groups"=>security_groups,
         "default_key_name"=>microbosh_name,
-        "private_key"=>private_key_path}
+        "private_key"=>private_key_path,
+        "boot_from_volume"=>boot_from_volume}
     end
 
     def region
@@ -70,11 +115,11 @@ module Bosh::Bootstrap::MicroboshProviders
     def security_groups
       ["ssh",
        "dns_server",
-       "bosh_agent_https",
-       "bosh_nats_server",
-       "bosh_blobstore",
-       "bosh_director",
-       "bosh_registry"]
+       "bosh"]
+    end
+
+    def boot_from_volume
+      !!(settings.provider["options"] && settings.provider.options.boot_from_volume)
     end
 
     def stemcell_uri

data/lib/bosh-bootstrap/network.rb

@@ -4,11 +4,11 @@ require "bosh-bootstrap/network_providers/dummy"
 class Bosh::Bootstrap::Network
 
   attr_reader :provider_name
-  attr_reader :provider_client
+  attr_reader :cyoi_provider_client
 
-  def initialize(provider_name, provider_client)
+  def initialize(provider_name, cyoi_provider_client)
     @provider_name = provider_name
-    @provider_client = provider_client
+    @cyoi_provider_client = cyoi_provider_client
   end
 
   def deploy
@@ -25,9 +25,8 @@ class Bosh::Bootstrap::Network
       rescue LoadError
         klass = Bosh::Bootstrap::NetworkProviders.provider_class("dummy")
       end
-      klass.new(provider_client)
+      klass.new(cyoi_provider_client)
     end
   end
 
 end
-

data/lib/bosh-bootstrap/network_providers/aws.rb

@@ -1,14 +1,14 @@
 module Bosh::Bootstrap::NetworkProviders
   class AWS
-    attr_reader :provider_client
+    attr_reader :cyoi_provider_client
 
-    def initialize(provider_client)
-      @provider_client = provider_client
+    def initialize(cyoi_provider_client)
+      @cyoi_provider_client = cyoi_provider_client
     end
 
     def perform
       security_groups.each do |name, ports|
-        provider_client.create_security_group(name.to_s, name.to_s, ports: ports)
+        cyoi_provider_client.create_security_group(name.to_s, name.to_s, ports: ports)
       end
     end
 
@@ -17,11 +17,7 @@ module Bosh::Bootstrap::NetworkProviders
       {
         ssh: 22,
         dns_server: { protocol: "udp", ports: (53..53) },
-        bosh_nats_server: 4222,
-        bosh_agent_https: 6868,
-        bosh_blobstore: 25250,
-        bosh_director: 25555,
-        bosh_registry: 25777
+        bosh: [4222, 6868, 25250, 25555, 25777]
       }
     end
   end

data/lib/bosh-bootstrap/network_providers/dummy.rb

@@ -1,6 +1,6 @@
 module Bosh::Bootstrap::NetworkProviders
   class Dummy
-    def initialize(provider_client)
+    def initialize(cyoi_provider_client)
     end
 
     def perform

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

@@ -1,29 +1,17 @@
 module Bosh::Bootstrap::NetworkProviders
   class OpenStack
-    attr_reader :provider_client
+    attr_reader :cyoi_provider_client
 
-    def initialize(provider_client)
-      @provider_client = provider_client
+    def initialize(cyoi_provider_client)
+      @cyoi_provider_client = cyoi_provider_client
     end
 
     def perform
-      security_groups.each do |name, ports|
-        provider_client.create_security_group(name.to_s, name.to_s, ports: ports)
-      end
+      cyoi_provider_client.create_security_group("ssh", "ssh", 22)
+      cyoi_provider_client.create_security_group("dns_server", "dns_server", protocol: "udp", ports: (53..53) )
+      cyoi_provider_client.create_security_group("bosh", "bosh", [4222, 6868, 25250, 25555, 25777] )
     end
 
-    protected
-    def security_groups
-      {
-        ssh: 22,
-        dns_server: { protocol: "udp", ports: (53..53) },
-        bosh_nats_server: 4222,
-        bosh_agent_https: 6868,
-        bosh_blobstore: 25250,
-        bosh_director: 25555,
-        bosh_registry: 25777
-      }
-    end
   end
 end
 Bosh::Bootstrap::NetworkProviders.register_provider("openstack", Bosh::Bootstrap::NetworkProviders::OpenStack)

data/lib/bosh-bootstrap/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Bootstrap
-    VERSION = "0.12.0"
+    VERSION = "0.13.0"
   end
 end

data/spec/assets/microbosh_yml/micro_bosh.aws_ec2.us-west-2a.yml

@@ -21,11 +21,7 @@ cloud:
       default_security_groups: 
       - ssh
       - dns_server
-      - bosh_agent_https
-      - bosh_nats_server
-      - bosh_blobstore
-      - bosh_director
-      - bosh_registry
+      - bosh
       default_key_name: test-bosh
       ec2_private_key: ~/.microbosh/ssh/test-bosh
 apply_spec: 

data/spec/assets/microbosh_yml/micro_bosh.aws_ec2.yml

@@ -20,11 +20,7 @@ cloud:
       default_security_groups: 
       - ssh
       - dns_server
-      - bosh_agent_https
-      - bosh_nats_server
-      - bosh_blobstore
-      - bosh_director
-      - bosh_registry
+      - bosh
       default_key_name: test-bosh
       ec2_private_key: ~/.microbosh/ssh/test-bosh
 apply_spec: 

data/spec/assets/microbosh_yml/micro_bosh.aws_vpc.yml

@@ -22,11 +22,7 @@ cloud:
       default_security_groups: 
       - ssh
       - dns_server
-      - bosh_agent_https
-      - bosh_nats_server
-      - bosh_blobstore
-      - bosh_director
-      - bosh_registry
+      - bosh
       default_key_name: test-bosh
       ec2_private_key: ~/.microbosh/ssh/test-bosh
 apply_spec: 

data/spec/assets/microbosh_yml/micro_bosh.openstack.boot_from_volume.yml

@@ -0,0 +1,43 @@
+---
+name: test-bosh
+logging:
+  level: DEBUG
+network:
+  type: manual
+  ip: 10.10.10.3
+  cloud_properties:
+    net_id: 7b8788eb-b49e-4424-9065-75a6b07094ea
+resources:
+  persistent_disk: 16384
+  cloud_properties:
+    instance_type: m1.medium
+cloud:
+  plugin: openstack
+  properties:
+    openstack:
+      auth_url: http://10.0.0.2:5000/v2.0/tokens
+      username: USER
+      api_key: PASSWORD
+      tenant: TENANT
+      region: REGION
+      default_security_groups:
+      - ssh
+      - dns_server
+      - bosh
+      default_key_name: test-bosh
+      private_key: ~/.microbosh/ssh/test-bosh
+      boot_from_volume: true
+apply_spec:
+  agent:
+    blobstore:
+      address: 10.10.10.3
+    nats:
+      address: 10.10.10.3
+  properties:
+    director:
+      max_threads: 3
+    hm:
+      resurrector_enabled: true
+    ntp:
+      - 0.north-america.pool.ntp.org
+      - 1.north-america.pool.ntp.org