Moved ocfp runtime releases into overlay, using upstream when available

hooks/addon-ocfp-runtime-configs-syslog~osl

@@ -22,12 +22,19 @@ bosh::upload::runtime::configs() {
   export GENESIS_SECRETS_MOUNT
 
   describe >&2 "Uploading 'ocfp-syslog' runtime config."
+  upstream_syslog_release="$(
+    spruce merge --go-patch --cherry-pick releases \
+      <(echo '--- {"releases": [], "instance_groups": [{"name":"bosh", "jobs": [{"name": "bosh"}]}]}') \
+      bosh-deployment/syslog.yml
+  )"
   genesis_bosh -A update-runtime-config --tty \
-    --name="ocfp-syslog" <( spruce merge -m "ocfp/configs/runtime/syslog.yml" )
+    --name="ocfp-syslog" \
+    <( spruce merge -m "ocfp/configs/runtime/syslog.yml" "overlay/releases/syslog.yml" )
 
   describe >&2 "Uploading 'ocfp-windows-syslog' runtime config."
   genesis_bosh -A update-runtime-config --tty \
-    --name="ocfp-windows-syslog" <( spruce merge -m "ocfp/configs/runtime/windows-syslog.yml" )
+    --name="ocfp-windows-syslog" \
+    <( spruce merge -m "ocfp/configs/runtime/windows-syslog.yml" "overlay/releases/windows-syslog.yml" )
 }
 
 parse::args() {

hooks/addon-ocfp-runtime-configs-system-metrics~osm

@@ -24,7 +24,8 @@ bosh::upload::runtime::configs() {
 
   describe >&2 "Uploading 'ocfp-system-metrics' runtime config."
   genesis_bosh -A update-runtime-config --tty \
-    --name="ocfp-system-metrics" <( spruce merge -m "ocfp/configs/runtime/system-metrics.yml" )
+    --name="ocfp-system-metrics" \
+    <( spruce merge -m "ocfp/configs/runtime/system-metrics.yml" "overlay/releases/system-metrics.yml" )
 }
 
 parse::args() {

hooks/addon-ocfp-runtime-configs~orc

@@ -21,11 +21,13 @@ check::deployment::exists() {
 bosh::upload::runtime::configs() {
   describe >&2 "Uploading 'ocfp-bosh-dns' runtime config."
   genesis_bosh -A update-runtime-config --tty \
-    --name="ocfp-bosh-dns" <( cat "bosh-deployment/runtime-configs/dns.yml" )
+    --name="ocfp-bosh-dns" \
+    <( spruce merge -m -g "bosh-deployment/runtime-configs/dns.yml" "overlay/releases/bosh-dns.yml" )
 
   describe >&2 "Uploading 'ocfp-toolbelt' runtime config."
   genesis_bosh -A update-runtime-config --tty \
-    --name="ocfp-toolbelt" <( cat "ocfp/configs/runtime/toolbelt.yml" )
+    --name="ocfp-toolbelt" \
+    <( spruce merge -m "ocfp/configs/runtime/toolbelt.yml" "overlay/releases/toolbelt.yml" )
 }
 
 parse::args() {

ocfp/configs/runtime/syslog.yml

@@ -20,8 +20,3 @@ addons:
             port:    (( vault $GENESIS_SECRETS_MOUNT "syslog:port" ))
             respect_file_permissions: false
             transport: tcp
-releases:
-  - name: "syslog"
-    version: "12.0.5"
-    url: "https://bosh.io/d/github.com/cloudfoundry/syslog-release?v=12.0.5"
-    sha1: "4e74f590c80002dcdaf93635dc025fe51ea106eb"

ocfp/configs/runtime/system-metrics.yml

@@ -28,10 +28,3 @@ addons:
               cert: (( grab meta.cf.system_metrics.cert ))
               key: (( grab meta.cf.system_metrics.key ))
         release: system-metrics
-
-releases:
-  - name: system-metrics
-    version: 2.2.2
-    sha1: ccf8ab12868b648ebf0239eff89e0d984b06419c
-    url: "https://bosh.io/d/github.com/cloudfoundry/system-metrics-release?v=2.2.2"
-

ocfp/configs/runtime/toolbelt.yml

@@ -30,8 +30,3 @@ addons:
   jobs:
   - name: toolbelt-veritas
     release: toolbelt
-
-releases:
-- name:    "toolbelt"
-  version: "3.7.0"
-

ocfp/configs/runtime/windows-syslog.yml

@@ -17,9 +17,3 @@ addons:
             transport: tcp
       - name: event_logger
         release: windows-syslog
-
-releases:
-  - name: "windows-syslog"
-    version: "1.1.10"
-    url: "https://bosh.io/d/github.com/cloudfoundry/windows-syslog-release?v=1.1.10"
-    sha1: "6f9d175780bc017813aa9a6d2667f5b506697b1b"

ocfp/meta.yml

@@ -73,10 +73,3 @@ meta:
       database: (( vault meta.vault "/db/uaa:database" ))
       tls:      enabled
       ca:       (( vault meta.vault "/db/uaa:ca" ))
-
-  releases: # NOTE: This is because of runtime config
-    toolbelt:
-      version: "3.7.0"
-      sha1: "377b390b7f5d358a2dae463109350250a769eb3f"
-      url: (( concat "https://bosh.io/d/github.com/cloudfoundry-community/toolbelt-boshrelease?v=" meta.releases.toolbelt.version ))
-

ocfp/ocfp.yml

@@ -5,11 +5,3 @@ params: # TODO: ocfp-no-trusted-certs feature
   # Required for add-secrets - see kit.yml
   ca_validity_period:   "10y"
   cert_validity_period: "10y"
-
-releases:
-- (( append ))
-- name: "toolbelt"
-  version: (( grab meta.releases.toolbelt.version ))
-  sha1:    (( grab meta.releases.toolbelt.sha1    ))
-  url:     (( grab meta.releases.toolbelt.url     ))
-

overlay/releases/bosh-dns.yml

@@ -1,5 +1 @@
-releases:
-- name: bosh-dns
-  sha1: 5677c1116e73b3b17f6ed8bad6896fe7c07d6c59
-  url: https://bosh.io/d/github.com/cloudfoundry/bosh-dns-release?v=1.36.1
-  version: 1.36.1
+--- {} # No release overlay needed at this time

overlay/releases/syslog.yml

@@ -0,0 +1 @@
+--- {}

overlay/releases/system-metrics.yml

@@ -0,0 +1,5 @@
+releases:
+- name: "system-metrics"
+  version: "2.3.1"
+  url: "https://bosh.io/d/github.com/cloudfoundry/system-metrics-release?v=2.3.1"
+  sha1: "2104028a5155832d5e64054d28ecbc0c41603d99"

overlay/releases/toolbelt.yml

@@ -0,0 +1,5 @@
+releases:
+  toolbelt:
+    version: "3.7.0"
+    sha1: "377b390b7f5d358a2dae463109350250a769eb3f"
+    url: (( concat "https://bosh.io/d/github.com/cloudfoundry-community/toolbelt-boshrelease?v=" releases.toolbelt.version ))

overlay/releases/windows-syslog.yml

@@ -0,0 +1,5 @@
+releases:
+- name: "windows-syslog"
+  version: "1.1.14"
+  url: "https://bosh.io/d/github.com/cloudfoundry/windows-syslog-release?v=1.1.14"
+  sha1: "5c620b5f968f65e86d034983b60d616192f3b471"