diff options
| author | Russell Teague <rteague@redhat.com> | 2017-11-22 15:29:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 15:29:37 -0500 |
| commit | 50637899d574cd1c47749eea96288085d0e68a27 (patch) | |
| tree | 822700d42a612427479ecbc7b73d4b14e27e84d5 | |
| parent | df88cb93618dff4ff28bad4a3d42a70676cfba23 (diff) | |
| parent | 236501cf3dc1fce2ab3e78af1e22079b436c3d1e (diff) | |
| download | openshift-50637899d574cd1c47749eea96288085d0e68a27.tar.gz openshift-50637899d574cd1c47749eea96288085d0e68a27.tar.bz2 openshift-50637899d574cd1c47749eea96288085d0e68a27.tar.xz openshift-50637899d574cd1c47749eea96288085d0e68a27.zip | |
Merge pull request #6235 from mtnbikenc/include-deprecation-openshift-prometheus
Include Deprecation - openshift-prometheus
| -rw-r--r-- | playbooks/openshift-prometheus/config.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_prometheus/tasks/main.yaml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/openshift-prometheus/config.yml b/playbooks/openshift-prometheus/config.yml index 8ee57ce8d..c7814207c 100644 --- a/playbooks/openshift-prometheus/config.yml +++ b/playbooks/openshift-prometheus/config.yml @@ -1,4 +1,4 @@ --- -- include: ../init/main.yml +- import_playbook: ../init/main.yml -- include: private/config.yml +- import_playbook: private/config.yml diff --git a/roles/openshift_prometheus/tasks/main.yaml b/roles/openshift_prometheus/tasks/main.yaml index a62babaa7..38798e1f5 100644 --- a/roles/openshift_prometheus/tasks/main.yaml +++ b/roles/openshift_prometheus/tasks/main.yaml @@ -20,10 +20,10 @@ mode: 0755 changed_when: False -- include: install_prometheus.yaml +- include_tasks: install_prometheus.yaml when: openshift_prometheus_state == 'present' -- include: uninstall_prometheus.yaml +- include_tasks: uninstall_prometheus.yaml when: openshift_prometheus_state == 'absent' - name: Delete temp directory |