diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-14 15:23:19 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-11-14 15:23:19 -0500 |
| commit | 6b6cc9cfb47b97e84cf6cf3efe99b950b5a9e7d2 (patch) | |
| tree | 3eef0efca97d7f87a9a901a32982b99b288474f0 | |
| parent | 137ec439de2196c75b047e4b19698d2b5c3e0aa4 (diff) | |
| download | openshift-6b6cc9cfb47b97e84cf6cf3efe99b950b5a9e7d2.tar.gz openshift-6b6cc9cfb47b97e84cf6cf3efe99b950b5a9e7d2.tar.bz2 openshift-6b6cc9cfb47b97e84cf6cf3efe99b950b5a9e7d2.tar.xz openshift-6b6cc9cfb47b97e84cf6cf3efe99b950b5a9e7d2.zip | |
Sync latest enterprise/metrics-deployer.yaml
| -rw-r--r-- | roles/openshift_hosted_templates/files/v1.4/enterprise/metrics-deployer.yaml | 6 | ||||
| -rw-r--r-- | roles/openshift_hosted_templates/files/v1.4/origin/metrics-deployer.yaml | 6 |
2 files changed, 12 insertions, 0 deletions
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" diff --git a/roles/openshift_hosted_templates/files/v1.4/origin/metrics-deployer.yaml b/roles/openshift_hosted_templates/files/v1.4/origin/metrics-deployer.yaml index 5f2290419..54691572a 100644 --- a/roles/openshift_hosted_templates/files/v1.4/origin/metrics-deployer.yaml +++ b/roles/openshift_hosted_templates/files/v1.4/origin/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" |