Fixes for airship-seaworthy manifests

Change-Id: I961886cbaa3a0ce03e836d2392cf81bb74afc26c

global/v4.0/software/config/versions.yaml

@@ -457,8 +457,8 @@ data:
         ks_service: docker.io/openstackhelm/heat:ocata
         ks_user: docker.io/openstackhelm/heat:ocata
         image_repo_sync: docker.io/docker:17.07.0
-        helm: docker.io/lachlanevenson/k8s-helm:v2.7.2
-        tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
+        helm: docker.io/lachlanevenson/k8s-helm:v2.9.1
+        tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
       promenade:
         promenade: quay.io/airshipit/promenade:7a06bef72c0bfd799c2353b8213627f6a0826251
         ks_user: docker.io/openstackhelm/heat:ocata
@@ -541,8 +541,8 @@ data:
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         rabbit_init: docker.io/rabbitmq:3.7-management
         image_repo_sync: docker.io/docker:17.07.0
-      tiller:
-        tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
+      tillen:
+        tiller: gcr.io/kubernetes-helm/tiller:v2.9.1
       mariadb:
         mariadb: docker.io/mariadb:10.2.13
         ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0

site/airship-seaworthy/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml

@@ -0,0 +1,16 @@
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: elasticsearch
+  layeringDefinition:
+    abstract: false
+    layer: site
+    parentSelector:
+      hosttype: elasticsearch-global
+    actions:
+      - method: merge
+        path: .
+  storagePolicy: cleartext
+data: {}
+...

site/airship-seaworthy/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml

@@ -0,0 +1,16 @@
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: fluent-logging
+  layeringDefinition:
+    abstract: false
+    layer: site
+    parentSelector:
+      hosttype: fluent-logging-global
+    actions:
+      - method: merge
+        path: .
+  storagePolicy: cleartext
+data: {}
+...