concourse.yml.tt in kite-0.2.0

- old
+ new

@@ -13,29 +13,29 @@
   azs: [z1]
   # vm_extensions: [concourse-lb]
   stemcell: trusty
   networks:
   - name: public
-    static_ips: [<%= @private_subnet[12] %>]
+    static_ips: <%= @static_ips_concourse %>
     default: [dns, gateway]
 
   jobs:
   - name: atc
     release: concourse
     properties:
-      bind_port: 80
+      bind_port: 8080
       external_url: <%= @values['concourse']['url'] %>
       basic_auth_username: <%= @values['concourse']['auth_username'] %>
       basic_auth_password: ((auth_password))
       publicly_viewable: true
 
       vault:
         auth:
           backend: token
           client_token: ((vault_token))
         path_prefix: /concourse
-        url: "http://<%= @private_subnet[11] %>:8200" # expecting Vault to be deployed first
+        url: "http://<%= @static_ip_vault %>:8200" # expecting Vault to be deployed first
 
       postgresql_database: &atc_db atc
 
   - name: tsa
     release: concourse
@@ -45,11 +45,13 @@
   instances: 1
   vm_type: common
   azs: [z1]
   stemcell: trusty
   persistent_disk_type: database
-  networks: [{name: public}]
+  networks:
+  - name: public
+    default: [dns, gateway]
   jobs:
   - name: postgresql
     release: concourse
     properties:
       databases:
@@ -60,11 +62,13 @@
 - name: worker
   instances: 1
   vm_type: worker
   azs: [z1]
   stemcell: trusty
-  networks: [{name: public}]
+  networks:
+  - name: public
+    default: [dns, gateway]
   jobs:
   - name: groundcrew
     release: concourse
     properties:
       additional_resource_types:
@@ -90,5 +94,11 @@
 
 stemcells:
 - alias: trusty
   os: ubuntu-trusty
   version: latest
+
+variables:
+- name: db_password
+  type: password
+- name: auth_password
+  type: password