bosh-cloudfoundry 0.7.0 → 0.7.1

data/bosh_release/releases/index.yml

@@ -268,3 +268,17 @@ builds:
     version: 133
   !binary "NzRlZDM1YjQ4YjlhOTQwZTg0MDU0YzQ5MWZlNmQ0Yzg0NGM1NTc1Zg==":
     version: 134
+  !binary "ZTFhNGIwYmMxYTA0ODFkMjk5MzZjZGY2ZGY1MzZkNWZlNGRiZTY1ZQ==":
+    version: 135
+  !binary "YTJiOWYzYjA1YWMwYzk0ZTBkN2RhY2E3NDk5YzBjZDQyM2M5MWJhMw==":
+    version: 136
+  !binary "MGNjMjI3MjNkM2EzYTRiNTk5YmVjZDNiNDA5MDU4Yzk3YTNkNmJkOA==":
+    version: 137
+  !binary "YTljMzUzNTg3MDQ5OGViYjg4ZDU3ODk3YTMyMmQyNDIyYmUyNTAyOQ==":
+    version: 138
+  !binary "YjY0MTRjZjFmYzg1ZGQzZWY5YzU5NDZmODZmMDRmNGM2ODUwODlhMQ==":
+    version: 139
+  !binary "YThlNGZkNTlhYzJiYWY2YzhlNzMxY2IzNzQwNmVlYzY2MjQ5NzAzNg==":
+    version: 140
+  !binary "ZTcyMGRhY2UwNWJjZjFjYTlmMmM1N2UzMmM5MjhkNmMwYzMzYWU5ZQ==":
+    version: 141

data/lib/bosh/cli/commands/01_prepare_bosh_for_cf.rb

@@ -49,7 +49,7 @@ module Bosh::Cli::Command
       end
       unless errors.empty?
         say errors.shift.make_yellow
-        stemcell_url = "http://bosh-jenkins-artifacts.s3.amazonaws.com/bosh-stemcell/#{bosh_cpi}/latest-bosh-stemcell-#{bosh_cpi}.tgz"
+        stemcell_url = "http://bosh-jenkins-artifacts.s3.amazonaws.com/bosh-stemcell/#{bosh_cpi}/bosh-stemcell-latest-#{bosh_cpi}-#{bosh_cpi_hypervisor}-ubuntu.tgz"
         stemcell_cmd(non_interactive: true).upload(stemcell_url)
       end
     end
@@ -98,6 +98,16 @@ module Bosh::Cli::Command
       bosh_status["cpi"]
     end
 
+    # The CPI (aws/openstack/etc) of the target bosh
+    def bosh_cpi_hypervisor
+      case bosh_status["cpi"]
+      when "aws"
+        "xen"
+      when "openstack"
+        "kvm"
+      end
+    end
+
     # Helper to invoke the Release command's actions
     #
     # Usage to invoke #upload action:

data/lib/bosh/cli/commands/02_create_cf.rb

@@ -15,6 +15,7 @@ module Bosh::Cli::Command
     option "--disk 4096", Integer, "Size of persistent disk (Mb)"
     option "--security-group default", String, "Security group to assign to provisioned VMs"
     option "--deployment-size medium", String, "Size of deployment - medium or large"
+    option "--skip-dns-validation", "Skip DNS validation"
     def create_cf
       auth_required
       bosh_status # preload
@@ -32,6 +33,7 @@ module Bosh::Cli::Command
       attrs.set_unless_nil(:security_group, options[:security_group])
       attrs.set_unless_nil(:common_password, options[:common_password])
       attrs.set_unless_nil(:deployment_size, options[:deployment_size])
+      attrs.set_unless_nil(:skip_dns_validation, options[:skip_dns_validation])
 
       release_version = ReleaseVersion.latest_version_number
       @release_version_cpi_size = 

data/lib/bosh/cloudfoundry/deployment_attributes.rb

@@ -18,6 +18,9 @@ module Bosh::Cloudfoundry
       @attributes[:persistent_disk] ||= default_persistent_disk
       @attributes[:security_group] ||= default_security_group
       @attributes[:common_password] ||= random_string(12, :common)
+      @attributes[:skip_dns_validation] ||= default_skip_dns_validation
+      @attributes[:dea_server_ram] ||= default_dea_server_ram
+      @attributes[:dea_container_depot_disk] ||= default_dea_container_depot_disk
     end
 
     def name
@@ -48,6 +51,14 @@ module Bosh::Cloudfoundry
       @attributes[:dns]
     end
 
+    def dea_server_ram
+      @attributes[:dea_server_ram]
+    end
+
+    def dea_container_depot_disk
+      @attributes[:dea_container_depot_disk]
+    end
+
     def available_attributes
       @attributes.keys
     end
@@ -106,8 +117,10 @@ module Bosh::Cloudfoundry
 
     # FIXME only supports a single ip_address
     def validate_dns_mapping
-      validate_dns_a_record("api.#{dns}", ip_addresses.first)
-      validate_dns_a_record("demoapp.#{dns}", ip_addresses.first)
+      unless @attributes[:skip_dns_validation]
+        validate_dns_a_record("api.#{dns}", ip_addresses.first)
+        validate_dns_a_record("demoapp.#{dns}", ip_addresses.first)
+      end
     end
 
     def validate_dns_a_record(domain, expected_ip_address)
@@ -191,6 +204,19 @@ module Bosh::Cloudfoundry
       "default"
     end
 
+    def default_skip_dns_validation
+      false
+    end
+
+    # Chosen to be small enough to fit within EC2 m1.small (1.7G)
+    def default_dea_server_ram
+      1500
+    end
+
+    def default_dea_container_depot_disk
+      10 * 1024
+    end
+
     def set_default_dns
       if dns.nil?
         first_ip_address = ip_addresses.first
@@ -223,4 +249,4 @@ module Bosh::Cloudfoundry
     end
 
   end
-end
+end

data/lib/bosh/cloudfoundry/release_version.rb

@@ -6,7 +6,6 @@ module Bosh::Cloudfoundry
   # From this class you can navigate to ReleaseVersionCpi for the CPI specific aspect of a release version;
   # and from ReleaseVersionCpi you can navigate to one or more ReleaseVersionCpiSizes (deployment sizes).
   class ReleaseVersion
-    attr_reader :release_name
     attr_reader :version_number
 
     def self.for_version(version_number)
@@ -43,7 +42,13 @@ module Bosh::Cloudfoundry
 
     def initialize(version_number)
       @version_number = version_number
-      @release_name = "cf-release" # TODO determine from release file
+    end
+
+    def release_name
+      @release_name ||= begin
+        release_yml = Dir[File.join(bosh_release_dir, "releases", "*-#{release_version}.yml")].first
+        YAML.load_file(release_yml)["name"]
+      end
     end
 
     # Attributes & their values that can be changed via setters & deployment re-deployed successfully
@@ -64,6 +69,10 @@ module Bosh::Cloudfoundry
       available_cpi_names.include?(cpi)
     end
 
+    def bosh_release_dir
+      File.expand_path("../../../../bosh_release", __FILE__)
+    end
+
     def self.base_template_dir
       File.expand_path("../../../../templates", __FILE__)
     end

data/spec/assets/v132/aws/large.yml

@@ -25,10 +25,9 @@ compilation:
 
 update:
   canaries: 1
-  canary_watch_time: 30000-600000
-  update_watch_time: 30000-600000
+  canary_watch_time: 30000-60000
+  update_watch_time: 30000-60000
   max_in_flight: 4
-  max_errors: 1
 
 resource_pools:
   - name: small

data/spec/assets/v132/aws/medium.yml

@@ -18,10 +18,9 @@ networks:
 
 update:
   canaries: 1
-  canary_watch_time: 30000-600000
-  update_watch_time: 30000-600000
+  canary_watch_time: 30000-60000
+  update_watch_time: 30000-60000
   max_in_flight: 4
-  max_errors: 1
 
 compilation:
   workers: 6
@@ -175,8 +174,8 @@ properties:
 
   nfs_server:
     address: 0.core.default.demo.microbosh
-    #network: "*.demo.microbosh"
-    #idmapd_domain: mycloud.com
+    network: "*.demo.microbosh"
+    idmapd_domain: mycloud.com
 
   debian_nfs_server:
     no_root_squash: true

data/spec/assets/v133/aws/large.yml

@@ -25,10 +25,9 @@ compilation:
 
 update:
   canaries: 1
-  canary_watch_time: 30000-600000
-  update_watch_time: 30000-600000
+  canary_watch_time: 30000-60000
+  update_watch_time: 30000-60000
   max_in_flight: 4
-  max_errors: 1
 
 resource_pools:
   - name: small

data/spec/assets/v133/aws/medium.yml

@@ -18,10 +18,9 @@ networks:
 
 update:
   canaries: 1
-  canary_watch_time: 30000-600000
-  update_watch_time: 30000-600000
+  canary_watch_time: 30000-60000
+  update_watch_time: 30000-60000
   max_in_flight: 4
-  max_errors: 1
 
 compilation:
   workers: 6
@@ -157,8 +156,8 @@ properties:
 
   nfs_server:
     address: 0.data.default.demo.microbosh
-    #network: "*.demo.microbosh"
-    #idmapd_domain: mycloud.com
+    network: "*.demo.microbosh"
+    idmapd_domain: mycloud.com
 
   debian_nfs_server:
     no_root_squash: true

data/spec/assets/v141/aws/large.yml

@@ -0,0 +1,334 @@
+---
+name: demo
+director_uuid: UUID
+
+releases:
+ - name: cf
+   version: 141
+
+networks:
+- name: floating
+  type: vip
+  cloud_properties: {}
+- name: default
+  type: dynamic
+  cloud_properties:
+    security_groups:
+    - default
+
+compilation:
+  workers: 6
+  network: default
+  reuse_compilation_vms: true
+  cloud_properties:
+    instance_type: m1.medium
+
+update:
+  canaries: 1
+  canary_watch_time: 30000-60000
+  update_watch_time: 30000-60000
+  max_in_flight: 4
+
+resource_pools:
+  - name: small
+    network: default
+    size: 8
+    stemcell:
+      name: bosh-stemcell
+      version: latest
+    cloud_properties:
+      instance_type: m1.small
+
+  - name: large
+    network: default
+    size: 1
+    stemcell:
+      name: bosh-stemcell
+      version: latest
+    cloud_properties:
+      instance_type: m1.large
+
+jobs:
+  - name: nats
+    release: cf
+    template: 
+      - nats
+    instances: 1
+    resource_pool: small
+    networks:
+      - name: default
+        default: [dns, gateway]            
+            
+  - name: syslog_aggregator
+    release: cf
+    template: 
+      - syslog_aggregator
+    instances: 1
+    resource_pool: small
+    persistent_disk: 65536
+    networks:
+      - name: default
+        default: [dns, gateway]
+      
+  - name: postgres
+    release: cf
+    template: 
+      - postgres
+    instances: 1
+    resource_pool: small
+    persistent_disk: 65536
+    networks:
+      - name: default
+        default: [dns, gateway]
+    properties:
+      db: databases
+
+  - name: nfs_server
+    release: cf
+    template:
+      - debian_nfs_server
+    instances: 1
+    resource_pool: small
+    persistent_disk: 65536
+    networks:
+      - name: default
+        default: [dns, gateway]            
+
+  - name: uaa
+    release: cf
+    template: 
+      - uaa
+    instances: 1
+    resource_pool: small
+    networks:
+      - name: default
+        default: [dns, gateway]           
+
+  - name: cloud_controller
+    release: cf
+    template: 
+      - cloud_controller_ng
+    instances: 1
+    resource_pool: small
+    networks:
+      - name: default
+        default: [dns, gateway]
+    properties:
+      ccdb: ccdb
+
+  - name: router
+    release: cf
+    template: 
+      - gorouter
+    instances: 1
+    resource_pool: small
+    networks:
+      - name: default
+        default: [dns, gateway]
+      - name: floating
+        static_ips:
+        - 1.2.3.4
+
+  - name: health_manager
+    release: cf
+    template: 
+      - health_manager_next
+    instances: 1
+    resource_pool: small
+    networks:
+      - name: default
+        default: [dns, gateway]
+       
+  - name: dea
+    release: cf
+    template: dea_next
+    instances: 1
+    resource_pool: large
+    networks:
+      - name: default
+        default: [dns, gateway]            
+
+properties:
+  cf:
+    name: demo
+    dns: mycloud.com
+    ip_addresses: ["1.2.3.4"]
+    deployment_size: large
+    security_group: default
+    persistent_disk: 4096
+    common_password: qwertyasdfgh
+    dea_server_ram: 1500
+    dea_container_depot_disk: 10240
+
+  domain: mycloud.com
+  system_domain: mycloud.com
+  system_domain_organization: mycloud.com
+  app_domains:
+    - mycloud.com
+
+  networks:
+    apps: default
+    management: default
+
+  nats:
+    address: 0.nats.default.demo.microbosh
+    port: 4222
+    user: nats
+    password: qwertyasdfgh
+    authorization_timeout: 5
+
+  router:
+    port: 8081
+    status:
+      port: 8080
+      user: gorouter
+      password: qwertyasdfgh
+
+  dea: &dea
+    memory_mb: 1500
+    disk_mb: 10240
+    directory_server_protocol: http
+
+  dea_next: *dea
+
+  syslog_aggregator:
+    address: 0.syslog-aggregator.default.demo.microbosh
+    port: 54321
+
+  nfs_server:
+    address: 0.nfs-server.default.demo.microbosh
+    network: "*.demo.microbosh"
+    idmapd_domain: mycloud.com
+
+  debian_nfs_server:
+    no_root_squash: true
+
+  databases: &databases
+    db_scheme: postgres
+    address: 0.postgres.default.demo.microbosh
+    port: 5524
+    roles:
+      - tag: admin
+        name: ccadmin
+        password: qwertyasdfgh
+      - tag: admin
+        name: uaaadmin
+        password: qwertyasdfgh
+    databases:
+      - tag: cc
+        name: ccdb
+        citext: true
+      - tag: uaa
+        name: uaadb
+        citext: true
+
+  ccdb: &ccdb
+    db_scheme: postgres
+    address: 0.postgres.default.demo.microbosh
+    port: 5524
+    roles:
+      - tag: admin
+        name: ccadmin
+        password: qwertyasdfgh
+    databases:
+      - tag: cc
+        name: ccdb
+        citext: true
+
+  ccdb_ng: *ccdb
+
+  uaadb: 
+    db_scheme: postgresql
+    address: 0.postgres.default.demo.microbosh
+    port: 5524
+    roles:
+      - tag: admin
+        name: uaaadmin
+        password: qwertyasdfgh
+    databases:
+      - tag: uaa
+        name: uaadb
+        citext: true
+
+  cc_api_version: v2
+
+  cc: &cc
+    logging_level: debug
+    external_host: ccng
+    srv_api_uri: http://api.mycloud.com
+    cc_partition: default
+    db_encryption_key: qwertyasdfgh
+    bootstrap_admin_email: admin@mycloud.com
+    bulk_api_password: qwertyasdfgh
+    uaa_resource_id: cloud_controller
+    staging_upload_user: uploaduser
+    staging_upload_password: qwertyasdfgh
+    resource_pool:
+      resource_directory_key: cc-resources
+      # Local provider when using NFS
+      fog_connection:
+        provider: Local
+        local_root: /var/vcap/shared
+    packages:
+      app_package_directory_key: cc-packages
+    droplets:
+      droplet_directory_key: cc-droplets
+    default_quota_definition: runaway
+
+  ccng: *cc
+
+  login:
+    enabled: false
+
+  uaa:
+    url: http://uaa.mycloud.com
+    spring_profiles: postgresql
+    no_ssl: true
+    catalina_opts: -Xmx768m -XX:MaxPermSize=256m
+    resource_id: account_manager
+    jwt:
+      signing_key: |
+        -----BEGIN RSA PRIVATE KEY-----
+        MIICXAIBAAKBgQDHFr+KICms+tuT1OXJwhCUmR2dKVy7psa8xzElSyzqx7oJyfJ1
+        JZyOzToj9T5SfTIq396agbHJWVfYphNahvZ/7uMXqHxf+ZH9BL1gk9Y6kCnbM5R6
+        0gfwjyW1/dQPjOzn9N394zd2FJoFHwdq9Qs0wBugspULZVNRxq7veq/fzwIDAQAB
+        AoGBAJ8dRTQFhIllbHx4GLbpTQsWXJ6w4hZvskJKCLM/o8R4n+0W45pQ1xEiYKdA
+        Z/DRcnjltylRImBD8XuLL8iYOQSZXNMb1h3g5/UGbUXLmCgQLOUUlnYt34QOQm+0
+        KvUqfMSFBbKMsYBAoQmNdTHBaz3dZa8ON9hh/f5TT8u0OWNRAkEA5opzsIXv+52J
+        duc1VGyX3SwlxiE2dStW8wZqGiuLH142n6MKnkLU4ctNLiclw6BZePXFZYIK+AkE
+        xQ+k16je5QJBAN0TIKMPWIbbHVr5rkdUqOyezlFFWYOwnMmw/BKa1d3zp54VP/P8
+        +5aQ2d4sMoKEOfdWH7UqMe3FszfYFvSu5KMCQFMYeFaaEEP7Jn8rGzfQ5HQd44ek
+        lQJqmq6CE2BXbY/i34FuvPcKU70HEEygY6Y9d8J3o6zQ0K9SYNu+pcXt4lkCQA3h
+        jJQQe5uEGJTExqed7jllQ0khFJzLMx0K6tj0NeeIzAaGCQz13oo2sCdeGRHO4aDh
+        HH6Qlq/6UOV5wP8+GAcCQFgRCcB+hrje8hfEEefHcFpyKH+5g1Eu1k0mLrxK2zd+
+        4SlotYRHgPCEubokb2S1zfZDWIXW3HmggnGgM949TlY=
+        -----END RSA PRIVATE KEY-----
+      verification_key: |
+        -----BEGIN PUBLIC KEY-----
+        MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHFr+KICms+tuT1OXJwhCUmR2d
+        KVy7psa8xzElSyzqx7oJyfJ1JZyOzToj9T5SfTIq396agbHJWVfYphNahvZ/7uMX
+        qHxf+ZH9BL1gk9Y6kCnbM5R60gfwjyW1/dQPjOzn9N394zd2FJoFHwdq9Qs0wBug
+        spULZVNRxq7veq/fzwIDAQAB
+        -----END PUBLIC KEY-----
+    cc:
+      client_secret: qwertyasdfgh
+    admin:
+      client_secret: qwertyasdfgh
+    batch:
+      username: batchuser
+      password: qwertyasdfgh
+    client:
+      autoapprove:
+        - cf
+    clients:
+      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
+    scim:
+      users:
+      - admin|qwertyasdfgh|scim.write,scim.read,openid,cloud_controller.admin
+      - services|qwertyasdfgh|scim.write,scim.read,openid,cloud_controller.admin