bosh-cloudfoundry 0.7.0.alpha.10 → 0.7.0.alpha.11

data/README.md

@@ -27,17 +27,16 @@ For a medium deployment the following VMs are created and have the following vit
 
 ```
 $ bosh create cf ... --deployment-size medium
-$ bosh vms --vitals
-+-----------+---------+---------------+-------------------------------+-----------------------+------+------+------+----------------+------------+------------+------------+------------+
-| Job/index | State   | Resource Pool | IPs                           |         Load          | CPU  | CPU  | CPU  | Memory Usage   | Swap Usage | System     | Ephemeral  | Persistent |
-|           |         |               |                               | (avg01, avg05, avg15) | User | Sys  | Wait |                |            | Disk Usage | Disk Usage | Disk Usage |
-+-----------+---------+---------------+-------------------------------+-----------------------+------+------+------+----------------+------------+------------+------------+------------+
-| api/0     | running | small         | 10.159.35.150, 54.225.102.129 | 0.06%, 0.08%, 0.13%   | 0.1% | 0.2% | 0.0% | 13.7% (227.8M) | 0.0% (0B)  | 49%        | 1%         | n/a        |
-| core/0    | running | small         | 10.118.153.76                 | 1.25%, 0.87%, 0.35%   | 0.0% | 0.0% | 0.1% | 23.6% (391.7M) | 0.0% (0B)  | 49%        | 1%         | n/a        |
-| data/0    | running | small         | 10.158.26.49                  | 0.02%, 0.02%, 0.07%   | 0.0% | 0.0% | 0.2% | 7.1% (118.9M)  | 0.0% (0B)  | 49%        | 1%         | 4%         |
-| dea/0     | running | small         | 10.235.53.185                 | 0.07%, 0.07%, 0.06%   | 0.1% | 0.2% | 0.0% | 19.2% (319.8M) | 0.0% (0B)  | 49%        | 2%         | n/a        |
-| uaa/0     | running | small         | 10.29.186.245                 | 0.09%, 0.10%, 0.08%   | 0.1% | 0.0% | 0.1% | 28.3% (469.7M) | 0.0% (0B)  | 49%        | 1%         | n/a        |
-+-----------+---------+---------------+-------------------------------+-----------------------+------+------+------+----------------+------------+------------+------------+------------+
+$ bosh vms
++-----------+---------+---------------+-------------------------------+
+| Job/index | State   | Resource Pool | IPs                           |
++-----------+---------+---------------+-------------------------------+
+| api/0     | running | small         | 10.143.165.48, 54.227.237.123 |
+| core/0    | running | small         | 10.141.164.174                |
+| data/0    | running | small         | 10.139.11.105                 |
+| dea/0     | running | small         | 10.139.14.146                 |
++-----------+---------+---------------+-------------------------------+
+
 ```
 
 For a large deployment, all jobs (moving parts) of Cloud Foundry are isolated into their own VMs, and it includes a syslog aggregator:
@@ -52,7 +51,6 @@ $ bosh vms --vitals
 | cloud_controller/0  | running | small         | 10.152.174.25                | 0.15%, 0.12%, 0.08%   | 0.0% | 0.0% | 0.3%  | 11.0% (183.2M) | 0.0% (0B)  | 49%        | 1%         | n/a        |
 | dea/0               | running | large         | 10.144.83.102                | 0.80%, 0.36%, 0.15%   | 0.0% | 0.0% | 0.0%  | 5.3% (400.5M)  | 0.0% (0B)  | 49%        | 1%         | n/a        |
 | health_manager/0    | running | small         | 10.147.214.194               | 0.07%, 0.12%, 0.13%   | 0.0% | 0.0% | 0.2%  | 7.1% (118.4M)  | 0.0% (0B)  | 49%        | 1%         | n/a        |
-| login/0             | running | small         | 10.144.157.79                | 0.06%, 0.27%, 0.17%   | 0.0% | 0.0% | 0.2%  | 18.9% (313.8M) | 0.0% (0B)  | 49%        | 1%         | n/a        |
 | nats/0              | running | small         | 10.152.188.72                | 0.04%, 0.14%, 0.13%   | 0.0% | 0.0% | 0.0%  | 5.9% (98.0M)   | 0.0% (0B)  | 49%        | 1%         | n/a        |
 | nfs_server/0        | running | small         | 10.164.22.218                | 0.03%, 0.09%, 0.09%   | 0.0% | 0.0% | 15.5% | 5.2% (87.8M)   | 0.0% (0B)  | 49%        | 1%         | 1%         |
 | postgres/0          | running | small         | 10.154.152.54                | 0.25%, 0.17%, 0.12%   | 0.0% | 0.1% | 0.1%  | 6.7% (111.2M)  | 0.0% (0B)  | 49%        | 1%         | 1%         |

data/bosh-cloudfoundry.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "bosh-cloudfoundry"
-  spec.version       = "0.7.0.alpha.10"
+  spec.version       = "0.7.0.alpha.11"
   spec.authors       = ["Dr Nic Williams"]
   spec.email         = ["drnicwilliams@gmail.com"]
   spec.description   = %q{Create & manage Cloud Foundry deployments}

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

@@ -14,7 +14,7 @@ networks:
   type: dynamic
   cloud_properties:
     security_groups:
-    - cf
+    - default
 
 compilation:
   workers: 6
@@ -33,7 +33,7 @@ update:
 resource_pools:
   - name: small
     network: default
-    size: 9
+    size: 8
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -105,16 +105,6 @@ jobs:
       - name: default
         default: [dns, gateway]           
 
-  - name: login
-    release: cf-release
-    template: 
-      - login
-    instances: 1
-    resource_pool: small
-    networks:
-      - name: default
-        default: [dns, gateway]
-
   - name: cloud_controller
     release: cf-release
     template: 
@@ -164,8 +154,8 @@ properties:
     name: demo
     dns: mycloud.com
     ip_addresses: ["1.2.3.4"]
-    deployment_size: medium
-    security_group: cf
+    deployment_size: large
+    security_group: default
     persistent_disk: 4096
     common_password: qwertyasdfgh
 
@@ -202,24 +192,14 @@ properties:
 
   dea_next: *dea
 
-  service_lifecycle:
-    serialization_data_server:
-    - 169.254.1.1 
-
   syslog_aggregator:
     address: 0.syslog-aggregator.default.demo.microbosh
     port: 54321
 
-  serialization_data_server:
-    port: 8080
-    logging_level: debug
-    upload_token: qwertyasdfgh
-    upload_timeout: 10
-
   nfs_server:
     address: 0.nfs-server.default.demo.microbosh
-    # network: "*.demo.microbosh"
-    # idmapd_domain: mycloud.com
+    network: "*.demo.microbosh"
+    idmapd_domain: mycloud.com
 
   debian_nfs_server:
     no_root_squash: true
@@ -298,11 +278,7 @@ properties:
   ccng: *cc
 
   login:
-    protocol: http
-    links:
-      home: http://console.mycloud.com
-      passwd: http://console.mycloud.com/password_resets/new
-      signup: http://console.mycloud.com/register
+    enabled: false
 
   uaa:
     url: http://uaa.mycloud.com
@@ -344,34 +320,7 @@ properties:
     client:
       autoapprove:
         - cf
-        - my
-        - micro
-        - support-signon
-        - login
     clients:
-      login:
-        override: true
-        scope: openid
-        authorities: oauth.login
-        secret: qwertyasdfgh
-        authorized-grant-types: authorization_code,client_credentials,refresh_token
-        redirect-uri: http://login.mycloud.com
-      support-services:
-        scope: scim.write,scim.read,openid,cloud_controller.read,cloud_controller.write
-        secret: qwertyasdfgh
-        authorized-grant-types: authorization_code,client_credentials
-        redirect-uri: http://support-signon.mycloud.com
-        authorities: portal.users.read
-        access-token-validity: 1209600
-        refresh-token-validity: 1209600
-      oauth2service:
-        secret: qwertyasdfgh
-        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: http://rewritten-later.cloudfoundry.com/whatever
-        override: true
-        autoapprove: true
       cf:
         override: true
         authorized-grant-types: password,implicit,refresh_token
@@ -379,14 +328,6 @@ properties:
         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: qwertyasdfgh
-        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.mycloud.com/auth/cloudfoundry/callback
-        autoapprove: true
     scim:
       users:
       - admin|qwertyasdfgh|scim.write,scim.read,openid,cloud_controller.admin

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

@@ -33,7 +33,7 @@ compilation:
 resource_pools:
   - name: small
     network: default
-    size: 5
+    size: 4
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -69,11 +69,9 @@ jobs:
   - name: core
     release: cf-release
     template:
-      - syslog_aggregator
       - nats
       - health_manager_next
-      - collector
-      - login
+      - uaa
     instances: 1
     resource_pool: small
     networks:
@@ -82,17 +80,6 @@ jobs:
       - dns
       - gateway
 
-  # 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
-    resource_pool: small
-    networks:
-      - name: default
-        default: [dns, gateway]
-
   - name: api
     release: cf-release
     template:
@@ -164,26 +151,6 @@ properties:
 
   dea_next: *dea
 
-  service_lifecycle:
-    serialization_data_server:
-    - 0.core.default.demo.microbosh
-
-  syslog_aggregator:
-    address: 0.core.default.demo.microbosh
-    port: 54321
-
-  serialization_data_server:
-    port: 8080
-    logging_level: debug
-    upload_token: qwertyasdfgh
-    upload_timeout: 10
-
-  collector:
-    deployment_name: cf
-    use_tsdb: false
-    use_aws_cloudwatch: false
-    use_datadog: false
-
   nfs_server:
     address: 0.data.default.demo.microbosh
     #network: "*.demo.microbosh"
@@ -266,11 +233,7 @@ properties:
   ccng: *cc
 
   login:
-    protocol: http
-    links:
-      home: http://console.mycloud.com
-      passwd: http://console.mycloud.com/password_resets/new
-      signup: http://console.mycloud.com/register
+    enabled: false
 
   uaa:
     url: http://uaa.mycloud.com
@@ -312,34 +275,7 @@ properties:
     client:
       autoapprove:
         - cf
-        - my
-        - micro
-        - support-signon
-        - login
     clients:
-      login:
-        override: true
-        scope: openid
-        authorities: oauth.login
-        secret: qwertyasdfgh
-        authorized-grant-types: authorization_code,client_credentials,refresh_token
-        redirect-uri: http://login.mycloud.com
-      support-services:
-        scope: scim.write,scim.read,openid,cloud_controller.read,cloud_controller.write
-        secret: qwertyasdfgh
-        authorized-grant-types: authorization_code,client_credentials
-        redirect-uri: http://support-signon.mycloud.com
-        authorities: portal.users.read
-        access-token-validity: 1209600
-        refresh-token-validity: 1209600
-      oauth2service:
-        secret: qwertyasdfgh
-        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: http://rewritten-later.cloudfoundry.com/whatever
-        override: true
-        autoapprove: true
       cf:
         override: true
         authorized-grant-types: password,implicit,refresh_token
@@ -347,14 +283,6 @@ properties:
         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: qwertyasdfgh
-        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.mycloud.com/auth/cloudfoundry/callback
-        autoapprove: true
     scim:
       users:
       - admin|qwertyasdfgh|scim.write,scim.read,openid,cloud_controller.admin

data/spec/deployment_file_spec.rb

@@ -39,43 +39,44 @@ describe Bosh::Cloudfoundry::DeploymentFile do
   # v132 & v133
   # medium & large
 
-  context "generates deployment (aws)" do
-    let(:bosh_cpi) { "aws" }
-    let(:bosh_status) { {"cpi" => bosh_cpi, "uuid" => "UUID"} }
-    let(:attributes) { {
-      name: "demo",
-      dns: "mycloud.com",
-      ip_addresses: ['1.2.3.4'],
-      common_password: "qwertyasdfgh",
-      deployment_size: "medium"
-    } }
-    let(:release_version_cpi) { Bosh::Cloudfoundry::ReleaseVersionCpi.for_cpi(133, bosh_cpi) }
-    let(:release_version_cpi_medium) { Bosh::Cloudfoundry::ReleaseVersionCpiSize.new(release_version_cpi, "medium") }
-    let(:deployment_attributes) do
-      Bosh::Cloudfoundry::DeploymentAttributes.new(mock("director"), bosh_status, release_version_cpi_medium, attributes)
-    end
+  %w[medium large].each do |deployment_size|
+    context "generates deployment (aws)" do
+      let(:bosh_cpi) { "aws" }
+      let(:bosh_status) { {"cpi" => bosh_cpi, "uuid" => "UUID"} }
+      let(:attributes) { {
+        name: "demo",
+        dns: "mycloud.com",
+        ip_addresses: ['1.2.3.4'],
+        common_password: "qwertyasdfgh",
+        deployment_size: deployment_size
+      } }
+      let(:release_version_cpi) { Bosh::Cloudfoundry::ReleaseVersionCpi.for_cpi(133, bosh_cpi) }
+      let(:release_version_cpi_size) { Bosh::Cloudfoundry::ReleaseVersionCpiSize.new(release_version_cpi, deployment_size) }
+      let(:deployment_attributes) do
+        Bosh::Cloudfoundry::DeploymentAttributes.new(mock("director"), bosh_status, release_version_cpi_size, attributes)
+      end
 
-    subject { Bosh::Cloudfoundry::DeploymentFile.new(release_version_cpi_medium, deployment_attributes, bosh_status) }
+      subject { Bosh::Cloudfoundry::DeploymentFile.new(release_version_cpi_size, deployment_attributes, bosh_status) }
 
-    before do
-      subject.biff.stub(:deployment).and_return(home_file("deployments/cf/demo.yml"))
-      deployment_cmd = mock("deployment_cmd")
-      deployment_cmd.stub(:set_current).with(home_file("deployments/cf/demo.yml"))
-      deployment_cmd.stub(:perform)
-      subject.stub(:deployment_cmd).and_return(deployment_cmd)
-    end
+      before do
+        subject.biff.stub(:deployment).and_return(home_file("deployments/cf/demo.yml"))
+        deployment_cmd = mock("deployment_cmd")
+        deployment_cmd.stub(:set_current).with(home_file("deployments/cf/demo.yml"))
+        deployment_cmd.stub(:perform)
+        subject.stub(:deployment_cmd).and_return(deployment_cmd)
+      end
 
-    it "medium size" do
-      in_home_dir do
-        subject.prepare_environment
+      it "#{deployment_size} size" do
+        in_home_dir do
+          subject.prepare_environment
 
-        subject.create_deployment_file
-        files_match(spec_asset("v133/aws/medium.yml"), subject.deployment_file)
+          subject.create_deployment_file
+          files_match(spec_asset("v133/aws/#{deployment_size}.yml"), subject.deployment_file)
 
-        subject.deploy(non_interactive: true)
+          subject.deploy(non_interactive: true)
+        end
       end
     end
-
     # it "large size" do
     #   in_home_dir do
     #     command.add_option(:deployment_size, "large")

data/templates/v132/aws/medium/deployment_file.yml.erb

@@ -338,34 +338,7 @@ properties:
     client:
       autoapprove:
         - cf
-        - my
-        - micro
-        - support-signon
-        - login
     clients:
-      login:
-        override: true
-        scope: openid
-        authorities: oauth.login
-        secret: <%= common_password %>
-        authorized-grant-types: authorization_code,client_credentials,refresh_token
-        redirect-uri: <%= protocol %>://login.<%= dns %>
-      support-services:
-        scope: scim.write,scim.read,openid,cloud_controller.read,cloud_controller.write
-        secret: <%= common_password %>
-        authorized-grant-types: authorization_code,client_credentials
-        redirect-uri: <%= protocol %>://support-signon.<%= dns %>
-        authorities: portal.users.read
-        access-token-validity: 1209600
-        refresh-token-validity: 1209600
-      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
-        autoapprove: true
       cf:
         override: true
         authorized-grant-types: password,implicit,refresh_token
@@ -373,14 +346,6 @@ properties:
         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: <%= 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: <%= protocol %>://servicesmgmt.mycloud.com/auth/cloudfoundry/callback
-        autoapprove: true
     scim:
       users:
       - admin|<%= common_password %>|scim.write,scim.read,openid,cloud_controller.admin

data/templates/v133/aws/large/deployment_file.yml.erb

@@ -68,7 +68,7 @@ update:
 resource_pools:
   - name: small
     network: default
-    size: 9
+    size: 8
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -140,16 +140,6 @@ jobs:
       - name: default
         default: [dns, gateway]           
 
-  - name: login
-    release: cf-release
-    template: 
-      - login
-    instances: 1
-    resource_pool: small
-    networks:
-      - name: default
-        default: [dns, gateway]
-
   - name: cloud_controller
     release: cf-release
     template: 
@@ -239,20 +229,10 @@ properties:
 
   dea_next: *dea
 
-  service_lifecycle:
-    serialization_data_server:
-    - 169.254.1.1 
-
   syslog_aggregator:
     address: 0.syslog-aggregator.default.<%= name %>.microbosh
     port: 54321
 
-  serialization_data_server:
-    port: 8080
-    logging_level: debug
-    upload_token: <%= common_password %>
-    upload_timeout: 10
-
   nfs_server:
     address: 0.nfs-server.default.<%= name %>.microbosh
     network: "*.<%= name %>.microbosh"
@@ -335,11 +315,7 @@ properties:
   ccng: *cc
 
   login:
-    protocol: <%= protocol %>
-    links:
-      home: <%= protocol %>://console.<%= dns %>
-      passwd: <%= protocol %>://console.<%= dns %>/password_resets/new
-      signup: <%= protocol %>://console.<%= dns %>/register
+    enabled: false
 
   uaa:
     url: <%= protocol %>://uaa.<%= dns %>
@@ -376,40 +352,12 @@ properties:
     admin:
       client_secret: <%= common_password %>
     batch:
-      username: batch
+      username: batchuser
       password: <%= common_password %>
     client:
       autoapprove:
         - cf
-        - my
-        - portal
-        - micro
-        - support-signon
-        - login
     clients:
-      login:
-        override: true
-        scope: openid
-        authorities: oauth.login
-        secret: <%= common_password %>
-        authorized-grant-types: authorization_code,client_credentials,refresh_token
-        redirect-uri: <%= protocol %>://login.<%= dns %>
-      support-services:
-        scope: scim.write,scim.read,openid,cloud_controller.read,cloud_controller.write
-        secret: <%= common_password %>
-        authorized-grant-types: authorization_code,client_credentials
-        redirect-uri: <%= protocol %>://support-signon.<%= dns %>
-        authorities: portal.users.read
-        access-token-validity: 1209600
-        refresh-token-validity: 1209600
-      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
-        autoapprove: true
       cf:
         override: true
         authorized-grant-types: password,implicit,refresh_token
@@ -417,14 +365,6 @@ properties:
         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: <%= 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: <%= protocol %>://servicesmgmt.<%= dns %>/auth/cloudfoundry/callback
-        autoapprove: true
     scim:
       users:
       - admin|<%= common_password %>|scim.write,scim.read,openid,cloud_controller.admin