bosh-cloudfoundry 0.7.0.alpha.3 → 0.7.0.alpha.4

data/templates/v132/openstack/large/spec

@@ -0,0 +1,6 @@
+---
+resources:
+- small
+- medium
+- large
+- xlarge

data/templates/v132/{aws/dev → openstack/medium}/deployment_file.yml.erb

@@ -12,7 +12,7 @@
 #   cf:
 #     dns: mycloud.com
 #     ip_addresses: ['1.2.3.4']
-#     core_size: medium
+#     deployment_size: medium
 #     security_group: cf
 #     persistent_disk: 4096
 #
@@ -24,11 +24,13 @@
 #
 #     $ bosh diff deployment_file.yml.erb
 #
+no_ssl          = true
+protocol        = no_ssl ? "http" : "https"
 name            = find("name")
 dns             = find("properties.cf.dns")
 ip_addresses    = find("properties.cf.ip_addresses")
 security_group  = find("properties.cf.security_group")
-core_size       = find("properties.cf.core_size")
+deployment_size = find("properties.cf.deployment_size")
 persistent_disk = find("properties.cf.persistent_disk")
 common_password = find("properties.cf.common_password")
 -%>
@@ -84,6 +86,7 @@ resource_pools:
 
 jobs:
   - name: core
+    release: cf-release
     template:
       - syslog_aggregator
       - nats
@@ -103,7 +106,9 @@ jobs:
     properties:
       db: databases
 
+  # need a separate job for uaa due to https://github.com/cloudfoundry/cf-release/issues/104
   - name: uaa
+    release: cf-release
     template:
       - uaa
     instances: 1
@@ -113,6 +118,7 @@ jobs:
         default: [dns, gateway]
 
   - name: api
+    release: cf-release
     template:
       - cloud_controller_ng
       - gorouter
@@ -132,6 +138,7 @@ jobs:
       db: databases
 
   - name: dea
+    release: cf-release
     template:
       - dea_next
     instances: 1
@@ -145,7 +152,7 @@ properties:
     name: <%= name %>
     dns: <%= dns %>
     ip_addresses: <%= ip_addresses.inspect %>
-    core_size: <%= core_size %>
+    deployment_size: <%= deployment_size %>
     security_group: <%= security_group %>
     persistent_disk: <%= persistent_disk %>
     common_password: <%= common_password %>
@@ -194,7 +201,7 @@ properties:
   serialization_data_server:
     port: 8080
     logging_level: debug
-    upload_token: 8f7COGvThwlmulIzAgOHxMXurBrG364k
+    upload_token: <%= common_password %>
     upload_timeout: 10
 
   collector:
@@ -206,7 +213,7 @@ properties:
   nfs_server:
     address: 0.core.default.<%= name %>.microbosh
     #network: "*.<%= name %>.microbosh"
-    #idmapd_domain: iad1
+    #idmapd_domain: <%= dns %>
 
   debian_nfs_server:
     no_root_squash: true
@@ -263,9 +270,9 @@ properties:
   cc: &cc
     logging_level: debug
     external_host: ccng
-    srv_api_uri: http://api.<%= dns %>
+    srv_api_uri: <%= protocol %>://api.<%= dns %>
     cc_partition: default
-    db_encryption_key: "b963127302433579"
+    db_encryption_key: <%= common_password %>
     bootstrap_admin_email: admin@<%= dns %>
     bulk_api_password: <%= common_password %>
     uaa_resource_id: cloud_controller
@@ -273,6 +280,7 @@ properties:
     staging_upload_password: <%= common_password %>
     resource_pool:
       resource_directory_key: cc-resources
+      # Local provider when using NFS
       fog_connection:
         provider: Local
         local_root: /var/vcap/shared
@@ -284,16 +292,16 @@ properties:
   ccng: *cc
 
   login:
-    protocol: http
+    protocol: <%= protocol %>
     links:
-      home: http://console.<%= dns %>
-      passwd: http://console.<%= dns %>/password_resets/new
-      signup: http://console.<%= dns %>/register
+      home: <%= protocol %>://console.<%= dns %>
+      passwd: <%= protocol %>://console.<%= dns %>/password_resets/new
+      signup: <%= protocol %>://console.<%= dns %>/register
 
   uaa:
-    url: http://uaa.<%= dns %>
+    url: <%= protocol %>://uaa.<%= dns %>
     spring_profiles: postgresql
-    no_ssl: true
+    no_ssl: <%= no_ssl %>
     catalina_opts: -Xmx768m -XX:MaxPermSize=256m
     resource_id: account_manager
     jwt:
@@ -330,7 +338,6 @@ properties:
     client:
       autoapprove:
         - cf
-        - vmc
         - my
         - micro
         - support-signon
@@ -342,32 +349,37 @@ properties:
         authorities: oauth.login
         secret: <%= common_password %>
         authorized-grant-types: authorization_code,client_credentials,refresh_token
-        redirect-uri: http://login.<%= dns %>
+        redirect-uri: <%= protocol %>://login.<%= dns %>
       support-services:
         scope: scim.write,scim.read,openid,cloud_controller.read,cloud_controller.write
-        secret: ssosecretsso
+        secret: <%= common_password %>
         authorized-grant-types: authorization_code,client_credentials
-        redirect-uri: http://support-signon.<%= dns %>
+        redirect-uri: <%= protocol %>://support-signon.<%= dns %>
         authorities: portal.users.read
         access-token-validity: 1209600
         refresh-token-validity: 1209600
-      vmc:
+      oauth2service:
+        secret: <%= common_password %>
+        scope: openid,cloud_controller.read,cloud_controller.write
+        authorities: uaa.resource,oauth.service,clients.read,clients.write,clients.secret
+        authorized-grant-types: client_credentials,implicit
+        redirect-uri: <%= protocol %>://rewritten-later.cloudfoundry.com/whatever
         override: true
-        authorized-grant-types: password,implicit
-        authorities: uaa.none
-        scope: cloud_controller.read,cloud_controller.write,openid,password.write,cloud_controller.admin,scim.read,scim.write
+        autoapprove: true
       cf:
         override: true
         authorized-grant-types: password,implicit,refresh_token
         authorities: uaa.none
         scope: cloud_controller.read,cloud_controller.write,openid,password.write,cloud_controller.admin,scim.read,scim.write
+        access-token-validity: 7200
+        refresh-token-validity: 1209600
       servicesmgmt:
         override: true
-        secret: serivcesmgmtsecret
+        secret: <%= common_password %>
         scope: openid,cloud_controller.read,cloud_controller.write
         authorities: uaa.resource,oauth.service,clients.read,clients.write,clients.secret
         authorized-grant-types: authorization_code,client_credentials,password,implicit
-        redirect-uri: http://servicesmgmt.yourdomain.com/auth/cloudfoundry/callback
+        redirect-uri: <%= protocol %>://servicesmgmt.mycloud.com/auth/cloudfoundry/callback
         autoapprove: true
     scim:
       users:

data/templates/v132/openstack/medium/spec

@@ -0,0 +1,6 @@
+---
+resources:
+- small
+- medium
+- large
+- xlarge

data/templates/v132/openstack/spec

@@ -0,0 +1,6 @@
+---
+deployment_sizes:
+- medium
+- large
+
+default_deployment_size: medium

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-cloudfoundry
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha.3
+  version: 0.7.0.alpha.4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Create & manage Cloud Foundry deployments
 email:
 - drnicwilliams@gmail.com
@@ -387,15 +403,30 @@ files:
 - lib/bosh/cli/commands/cf.rb
 - lib/bosh/cloudfoundry.rb
 - lib/bosh/cloudfoundry/deployment_attributes.rb
-- lib/bosh/cloudfoundry/release_versioned_template.rb
+- lib/bosh/cloudfoundry/deployment_file.rb
+- lib/bosh/cloudfoundry/release_version.rb
+- lib/bosh/cloudfoundry/release_version_cpi.rb
+- lib/bosh/cloudfoundry/release_version_cpi_size.rb
+- spec/assets/v132/aws/large.yml
+- spec/assets/v132/aws/medium.yml
+- spec/deployment_file_spec.rb
 - spec/plugin_spec.rb
-- spec/release_versioned_template_spec.rb
+- spec/release_version_cpi_size_spec.rb
+- spec/release_version_cpi_spec.rb
+- spec/release_version_spec.rb
 - spec/spec_helper.rb
 - templates/README.md
-- templates/v132/aws/dev/deployment_file.yml.erb
-- templates/v132/aws/dev/spec
-- templates/v132/openstack/dev/deployment_file.yml.erb
-- templates/v132/openstack/dev/spec
+- templates/v132/aws/large/deployment_file.yml.erb
+- templates/v132/aws/large/spec
+- templates/v132/aws/medium/deployment_file.yml.erb
+- templates/v132/aws/medium/spec
+- templates/v132/aws/small/README.md
+- templates/v132/aws/spec
+- templates/v132/openstack/large/deployment_file.yml.erb
+- templates/v132/openstack/large/spec
+- templates/v132/openstack/medium/deployment_file.yml.erb
+- templates/v132/openstack/medium/spec
+- templates/v132/openstack/spec
 homepage: ''
 licenses:
 - MIT
@@ -411,7 +442,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1493789515290037622
+      hash: 273282452716595843
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -425,6 +456,11 @@ signing_key:
 specification_version: 3
 summary: Create & manage Cloud Foundry deployments using bosh in AWS & OpenStack
 test_files:
+- spec/assets/v132/aws/large.yml
+- spec/assets/v132/aws/medium.yml
+- spec/deployment_file_spec.rb
 - spec/plugin_spec.rb
-- spec/release_versioned_template_spec.rb
+- spec/release_version_cpi_size_spec.rb
+- spec/release_version_cpi_spec.rb
+- spec/release_version_spec.rb
 - spec/spec_helper.rb

data/lib/bosh/cloudfoundry/release_versioned_template.rb

@@ -1,48 +0,0 @@
-module Bosh::Cloudfoundry
-  # This project should support all known versions of Cloud Foundry back to v132.
-  # v132 was the first release of Cloud Foundry v2.
-  # The project also supports the different CPIs that are supported by bosh.
-  # The project also supports different basic sizings/compositions (small dev deployments
-  # or large, high-availability production deployments). Each sizing might scale out differently.
-  #
-  # To achieve these goals it includes templates for each combination of CPI & sizing & release version.
-  #
-  # This class calculates which deployment template to use for the current deployment.
-  class ReleaseVersionedTemplate
-    attr_reader :cpi_label
-    attr_reader :deployment_size_name
-
-    def initialize(release_version_number, cpi_label, deployment_size_name)
-      @release_version_number = release_version_number
-      @cpi_label              = cpi_label
-      @deployment_size_name   = deployment_size_name
-      raise "release_version_number must be an integer" unless release_version_number.is_a?(Fixnum)
-    end
-
-    def deployment_attributes_class
-      Bosh::Cloudfoundry::DeploymentAttributes
-    end
-
-    def template_file_path
-      File.join(template_base_path, minimum_release_version_number, cpi_label, deployment_size_name, "deployment_file.yml.erb")
-    end
-
-    def spec_file_path
-      File.join(template_base_path, minimum_release_version_number, cpi_label, deployment_size_name, "spec")
-    end
-
-    def spec
-      YAML.load_file(spec_file_path)
-    end
-
-    # TODO implement a real algorithm when there is a 2nd release & 2nd set of templates
-    def minimum_release_version_number
-      "v132"
-    end
-
-    private
-    def template_base_path
-      File.expand_path("../../../../templates", __FILE__)
-    end
-  end
-end

data/spec/release_versioned_template_spec.rb

@@ -1,12 +0,0 @@
-require "bosh/cloudfoundry/release_versioned_template"
-
-describe Bosh::Cloudfoundry::ReleaseVersionedTemplate do
-  subject { Bosh::Cloudfoundry::ReleaseVersionedTemplate.new(132, "aws", "dev") }
-  it "path to template" do
-    subject.template_file_path.should =~ %r{v132/aws/dev/deployment_file.yml.erb$}
-  end
-
-  it "path to template spec" do
-    subject.spec_file_path.should =~ %r{v132/aws/dev/spec$}
-  end
-end