bosh-cloudfoundry 0.6.0 → 0.6.1

data/ChangeLog.md

@@ -1,5 +1,7 @@
 # Change Log
 
+Create and manage your Cloud Foundry deployments on AWS and OpenStack with a simple command line tool (a plugin for BOSH CLI in fact). Start small, grow big, and constantly upgrade your various Cloud Foundry deployments.
+
 ## v0.6
 
 There is now a write up of [the concepts](https://github.com/StarkAndWayne/bosh-cloudfoundry/blob/master/docs/concept.md) and constructs being deployed from Anders Sveen!
@@ -12,6 +14,12 @@ Faster when using a final release because it no longer pulls down all the submod
 
 Still need to create development releases from cf-release's master branch. Hopefully all the required patches will be in cf-release's 130 release coming soon!
 
+### v0.6.1
+
+Constrain which fog version is installed to match bosh_cli. [thx @bonzofenix]
+
+Little bit of README clean up.
+
 ## v0.5
 
 Gerrit is dead. Long live gerrit. This release is for everyone who is getting started or wants to upgrade. Gerrit is dead.

data/README.md

@@ -20,14 +20,9 @@ bosh-bootstrap deploy
 # and some other fields that you can
 # just press Enter for.
 
-# SSH into inception VM
+# SSH into inception VM (also see 'tmux' and 'mosh' commands)
 bosh-bootstrap ssh
 
-git config --global user.email "you@example.com"
-git config --global user.name "Your Name"
-
-sudo gem install bosh-cloudfoundry
-export TMPDIR=/var/vcap/store/tmp
 bosh cf prepare system production
 # prompts for a DNS host for your CloudFoundry, such as mycompany.com
 # will generate a new IP address
@@ -237,3 +232,7 @@ bundle exec rake install
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/StarkAndWayne/bosh-cloudfoundry/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/bosh-cloudfoundry.gemspec

@@ -26,6 +26,6 @@ deployments.
   gem.add_dependency "bosh_cli", ">=1.0.3"
   gem.add_dependency "rake" # file_utils sh helper
   gem.add_dependency "net-dns"
-  gem.add_dependency "fog", ">= 1.8.0"
+  gem.add_dependency "fog", "~>1.9.0"
   gem.add_development_dependency "rspec"
 end

data/lib/bosh-cloudfoundry/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Cloudfoundry
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/spec/assets/deployments/openstack-core-only.yml

@@ -0,0 +1,204 @@
+---
+name: production-core
+director_uuid: fd63be52-be83-4fa3-950a-01fb26c2c781 
+
+release:
+  name: bobrelease
+  version: latest
+
+compilation:
+  workers: 3
+  network: default
+  cloud_properties:
+    instance_type: bosh
+
+update:
+  canaries: 1
+  canary_watch_time: 3000-90000
+  update_watch_time: 3000-90000
+  max_in_flight: 2
+  max_errors: 1
+
+networks:
+- name: default
+  type: dynamic
+  cloud_properties:
+     security_groups:
+       - cloudfoundry-production
+       
+- name: vip_network
+  type: vip
+  cloud_properties:
+    security_groups:
+    - cloudfoundry-production
+
+resource_pools:
+
+- name: core
+  network: default
+  size: 1
+  stemcell:
+    name: bosh-stemcell
+    version: 0.7.0
+  cloud_properties:
+    instance_type: bosh
+#env:
+#bosh:
+#password: $6$w4JRA567VU84$0TPA5/ZZqjXVvEUw5nDXBg8dYqp20xB4Qno2x4nH/oJaMrSUZ8Rgblhil4uv5x..xWA7xhwFuAXJ/rmCizql0.
+
+
+jobs:
+
+- name: core
+  template: 
+  - nats
+  - router
+  - stager
+  - postgres
+  - uaa
+  - dea
+  - cloud_controller
+  - vcap_redis
+  - health_manager_next
+  instances: 1
+  resource_pool: core
+  networks:
+  - name: default
+    default:
+    - dns
+    - gateway
+  - name: vip_network
+    static_ips:
+    - 1.2.3.4
+
+properties:
+  domain: cloudfoundry.test
+
+  env:
+
+  networks:
+    apps: default
+    management: default
+
+  nats:
+    user: nats
+    password: aaa3ij3122
+    address: 192.168.1.11
+    port: 4222
+
+  dea:
+    max_memory: 4096
+
+  stager:
+    max_staging_duration: 120
+    max_active_tasks: 20
+    queues:
+    - staging
+
+  router:
+    client_inactivity_timeout: 600
+    app_inactivity_timeout: 600
+    local_route: 1.2.3.4
+    status:
+      port: 8080
+      user: aaaUxXlS0pc71wVef
+      password: aaamaIf9vPV4mJyBe
+      
+  postgresql_server:
+    max_connections: 30
+    listen_address: 0.0.0.0
+
+  service_lifecycle:
+    download_url: 1.2.3.4
+    mount_point: /var/vcap/service_lifecycle
+    tmp_dir: /var/vcap/service_lifecycle/tmp_dir
+    resque:
+      host: 1.2.3.4
+      port: 3456
+      password: c1oudc0wc1oudc0w
+
+  db: ccdb
+  ccdb:
+    template: postgres
+    address: 1.2.3.4
+    port: 2544
+    databases:
+    - tag: cc
+      name: appcloud
+    - tag: uaa
+      name: uaa
+    roles:
+    - name: root
+      password: c1oudc0wc1oudc0w
+      tag: admin
+    - name: uaa
+      password: c1oudc0wc1oudc0w
+      tag: uaa
+
+  uaa:
+    catalina_opts: -Xmx768m -XX:MaxPermSize=256m
+    url: http://uaa.cloudfoundry.test
+    resource_id: account_manager
+    client_secret: foosecret
+    token_secret: barsecret
+    cc:
+      token_secret: WGvbxaiC37
+      client_secret: fOZF5DMND
+    admin:
+      client_secret: MeM5fER8e
+    login:
+      client_secret: HZtd2FyZS
+    batch:
+      username: do0H2AK
+      password: FSCTipl
+    client:
+      override: true
+      autoapprove:
+        - vmc
+        - my
+        - portal
+        - micro
+        - support-signon
+        - login
+    
+    scim:
+      user:
+        override: true
+      users:
+      - admin|bob|admin@bobland.com|admin|admin|clients.read,clients.write,clients.secret,uaa.admin,scim.read,scim.write,password.write
+      - bob|bob|openid,dashboard.user
+
+      
+  cc:
+    srv_api_uri: http://api.cloudfoundry.test
+    password: aaauuLaap44jadlas2l312lk
+    token: aaaf4eaa8c1758f66d5cb7adcb24adb9d7
+    use_nginx: true
+    new_stager_percent: 100
+    new_stager_email_regexp: '.*@vmware.com'
+    staging_upload_user: aaafhgjg
+    staging_upload_password: aaafdase9
+    allow_registration: true
+ #   uaa:
+ #     enabled: true
+ #     resource_id: cloud_controller
+ #     token_creation_email_filter: [""]
+    admins:
+    - admin.bobland.com
+    
+  vcap_redis:
+    address: 192.168.1.16
+    port: 5454
+    password: aaaxbL98RWpwBuUJvKNojnpIcRb1ot2
+    maxmemory: 2000000000 # 2GB    
+
+  uaadb:
+    address: 1.2.3.4
+    port: 2544
+    roles:
+    - tag: admin
+      name: uaa
+      password: c1oudc0wc1oudc0w
+    databases:
+    - tag: uaa
+      name: uaa

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-cloudfoundry
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +135,7 @@ files:
 - spec/assets/deployments/aws-core-2-m1.xlarge-dea.yml
 - spec/assets/deployments/aws-core-only.yml
 - spec/assets/deployments/aws-core-with-nfs.yml
+- spec/assets/deployments/openstack-core-only.yml
 - spec/functional/.gitkeep
 - spec/spec_helper.rb
 - spec/unit/.gitkeep
@@ -163,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1064713131226492709
+      hash: 1048486874731810334
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1064713131226492709
+      hash: 1048486874731810334
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -189,6 +190,7 @@ test_files:
 - spec/assets/deployments/aws-core-2-m1.xlarge-dea.yml
 - spec/assets/deployments/aws-core-only.yml
 - spec/assets/deployments/aws-core-with-nfs.yml
+- spec/assets/deployments/openstack-core-only.yml
 - spec/functional/.gitkeep
 - spec/spec_helper.rb
 - spec/unit/.gitkeep