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

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

@@ -68,7 +68,7 @@ compilation:
 resource_pools:
   - name: small
     network: default
-    size: 5
+    size: 4
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -104,11 +104,9 @@ jobs:
   - name: core
     release: cf-release
     template:
-      - syslog_aggregator
       - nats
       - health_manager_next
-      - collector
-      - login
+      - uaa
     instances: 1
     resource_pool: small
     networks:
@@ -117,17 +115,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:
@@ -201,26 +188,6 @@ properties:
 
   dea_next: *dea
 
-  service_lifecycle:
-    serialization_data_server:
-    - 0.core.default.<%= name %>.microbosh
-
-  syslog_aggregator:
-    address: 0.core.default.<%= name %>.microbosh
-    port: 54321
-
-  serialization_data_server:
-    port: 8080
-    logging_level: debug
-    upload_token: <%= common_password %>
-    upload_timeout: 10
-
-  collector:
-    deployment_name: cf
-    use_tsdb: false
-    use_aws_cloudwatch: false
-    use_datadog: false
-
   nfs_server:
     address: 0.data.default.<%= name %>.microbosh
     #network: "*.<%= name %>.microbosh"
@@ -303,11 +270,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 %>
@@ -349,34 +312,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
@@ -384,14 +320,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/openstack/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

data/templates/v133/openstack/medium/deployment_file.yml.erb

@@ -68,7 +68,7 @@ compilation:
 resource_pools:
   - name: small
     network: default
-    size: 5
+    size: 4
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -104,11 +104,9 @@ jobs:
   - name: core
     release: cf-release
     template:
-      - syslog_aggregator
       - nats
       - health_manager_next
-      - collector
-      - login
+      - uaa
     instances: 1
     resource_pool: small
     networks:
@@ -117,17 +115,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:
@@ -201,26 +188,6 @@ properties:
 
   dea_next: *dea
 
-  service_lifecycle:
-    serialization_data_server:
-    - 0.core.default.<%= name %>.microbosh
-
-  syslog_aggregator:
-    address: 0.core.default.<%= name %>.microbosh
-    port: 54321
-
-  serialization_data_server:
-    port: 8080
-    logging_level: debug
-    upload_token: <%= common_password %>
-    upload_timeout: 10
-
-  collector:
-    deployment_name: cf
-    use_tsdb: false
-    use_aws_cloudwatch: false
-    use_datadog: false
-
   nfs_server:
     address: 0.data.default.<%= name %>.microbosh
     #network: "*.<%= name %>.microbosh"
@@ -303,11 +270,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 %>
@@ -349,34 +312,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
@@ -384,14 +320,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/v134/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