diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-17 11:26:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-17 11:26:44 -0400 |
| commit | 1827ab832d47abcedeceafb9098fbcfaa19b4bd5 (patch) | |
| tree | 5548e6e6dc826bbd07ddf5dff6a2070c7ca7cc0f | |
| parent | e5e936e60e9221142b0cd394b4c8e5f45cb9dd6e (diff) | |
| parent | 884522dbee5be7565b4c75e7f31496848133847b (diff) | |
| download | openshift-1827ab832d47abcedeceafb9098fbcfaa19b4bd5.tar.gz openshift-1827ab832d47abcedeceafb9098fbcfaa19b4bd5.tar.bz2 openshift-1827ab832d47abcedeceafb9098fbcfaa19b4bd5.tar.xz openshift-1827ab832d47abcedeceafb9098fbcfaa19b4bd5.zip | |
Merge pull request #5106 from kwoodson/metrics_stdinclude
Merged by openshift-bot
| -rw-r--r-- | playbooks/byo/openshift-cluster/openshift-metrics.yml | 6 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_metrics.yml | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/playbooks/byo/openshift-cluster/openshift-metrics.yml b/playbooks/byo/openshift-cluster/openshift-metrics.yml index 5ad3a1a01..1135c8c11 100644 --- a/playbooks/byo/openshift-cluster/openshift-metrics.yml +++ b/playbooks/byo/openshift-cluster/openshift-metrics.yml @@ -1,4 +1,10 @@ --- - include: initialize_groups.yml + tags: + - always + +- include: ../../common/openshift-cluster/std_include.yml + tags: + - always - include: ../../common/openshift-cluster/openshift_metrics.yml diff --git a/playbooks/common/openshift-cluster/openshift_metrics.yml b/playbooks/common/openshift-cluster/openshift_metrics.yml index 2c8ad5b75..1dc180c26 100644 --- a/playbooks/common/openshift-cluster/openshift_metrics.yml +++ b/playbooks/common/openshift-cluster/openshift_metrics.yml @@ -1,6 +1,4 @@ --- -- include: evaluate_groups.yml - - name: OpenShift Metrics hosts: oo_first_master roles: |