2 files changed, 25 insertions, 2 deletions
diff --git a/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml b/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml
index 9cff9daca..c67058696 100644
--- a/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml
+++ b/roles/openshift_hosted_templates/files/v1.4/enterprise/logging-deployer.yaml
@@ -66,13 +66,21 @@ items:
       - watch
       - delete
       - update
+  - apiVersion: v1
+    kind: ClusterRole
+    metadata:
+      name: rolebinding-reader
+    rules:
+    - resources:
+      - clusterrolebindings
+      verbs:
+      - get
   -
     apiVersion: v1
     kind: RoleBinding
     metadata:
       name: logging-deployer-edit-role
     roleRef:
-      kind: ClusterRole
       name: edit
     subjects:
     - kind: ServiceAccount
@@ -83,11 +91,20 @@ items:
     metadata:
       name: logging-deployer-dsadmin-role
     roleRef:
-      kind: ClusterRole
       name: daemonset-admin
     subjects:
     - kind: ServiceAccount
       name: logging-deployer
+  -
+    apiVersion: v1
+    kind: RoleBinding
+    metadata:
+      name: logging-elasticsearch-view-role
+    roleRef:
+      name: view
+    subjects:
+    - kind: ServiceAccount
+      name: aggregated-logging-elasticsearch
 -
   apiVersion: "v1"
   kind: "Template"
diff --git a/roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml b/roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml
index 97a86c11d..66051755c 100644
--- a/roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml
+++ b/roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml
@@ -86,6 +86,8 @@ objects:
           value: ${HEAPSTER_NODE_ID}
         - name: METRIC_RESOLUTION
           value: ${METRIC_RESOLUTION}
+        - name: STARTUP_TIMEOUT
+          value: ${STARTUP_TIMEOUT}
     dnsPolicy: ClusterFirst
     restartPolicy: Never
     serviceAccount: metrics-deployer
@@ -160,3 +162,7 @@ parameters:
   description: "How often metrics should be gathered. Defaults value of '15s' for 15 seconds"
   name: METRIC_RESOLUTION
   value: "15s"
+-
+  description: "How long in seconds we should wait until Hawkular Metrics and Heapster starts up before attempting a restart"
+  name: STARTUP_TIMEOUT
+  value: "500"