Adapt to 3.7.0 property changes

genesis-community · Dec 7, 2017 · 4217400 · 4217400
1 parent eaa1b41
commit 4217400
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/base/params.yml b/base/params.yml
@@ -1,7 +1,7 @@
 ---
 params:
   external_domain:   (( param "Please specify the IP/DNS users will use to connect to Concourse" ))
-  num_web_nodes:     (( param "Please specify the number of web nodes you want to allocate" ))
+  num_web_nodes:     1
   external_url:      (( concat "https://" params.external_domain ))
   concourse_network: concourse
   concourse_vm_type: small

diff --git a/base/properties.yml b/base/properties.yml
@@ -19,13 +19,12 @@ instance_groups:
             tcp:
             - name: web_http
               port: 80
-              backend_port: (( grab instance_groups.web.jobs.atc.bind_port ))
+              backend_port: (( grab instance_groups.web.jobs.atc.properties.bind_port ))
               backend_servers: (( grab instance_groups.web.networks.0.static_ips ))
             - name: web_https
               port: 443
-              backend_port: (( grab instance_groups.web.jobs.atc.tls_bind_port ))
+              backend_port: (( grab instance_groups.web.jobs.atc.properties.tls_bind_port ))
               backend_servers: (( grab instance_groups.web.networks.0.static_ips ))
-              backend_ssl: noverify
 
   - name: web
     instances: (( grab params.num_web_nodes ))
@@ -39,8 +38,9 @@ instance_groups:
       - release: concourse
         name: tsa
         properties:
-          host_key: (( vault meta.vault "/tsa/host_key:private" ))
-          host_public_key: (( vault meta.vault "/tsa/host_key:public" ))
+          host_key: 
+            private_key: (( vault meta.vault "/tsa/host_key:private" ))
+            public_key: (( vault meta.vault "/tsa/host_key:public" ))
           authorized_keys:
           - (( vault meta.vault "/tsa/worker_key:public" ))
           token_signing_key: (( grab params.token_signing_key ))
@@ -105,8 +105,9 @@ instance_groups:
         name: groundcrew
         properties:
           tsa:
-            private_key: (( vault meta.vault "/tsa/worker_key:private" ))
-            host_public_key: (( vault meta.vault "/tsa/host_key:public" ))
+            worker_key:
+              private_key: (( vault meta.vault "/tsa/worker_key:private" ))
+              public_key: (( vault meta.vault "/tsa/worker_key:public" ))
       - release: concourse
         name: baggageclaim
         properties: {}

diff --git a/kit.yml b/kit.yml
@@ -39,7 +39,7 @@ params:
     - ask: How many web frontend nodes would you like to deploy and load balance between?
       description: The number of instances of web nodes to allocate.
       param: num_web_nodes
-      validate: 1-5
+      validate: 1,2,3,4,5
 
   provided-cert:
     - ask: What is the SSL cert + key pair for Concourse?