diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2015-11-12 10:42:39 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2015-11-12 10:42:39 -0500 |
| commit | 5ed42612965d72b87638ebe2fa96bec89199c4fa (patch) | |
| tree | c58b76b1a9b42ee4adba2a07d5917e519fef9691 /roles/os_zabbix/tasks | |
| parent | 7869fb8c26a96c1e0ee74b930fd0da8a9952cb52 (diff) | |
| parent | 597ba24415d6b7faa7ca02d200c8aed3c08b925a (diff) | |
| download | openshift-5ed42612965d72b87638ebe2fa96bec89199c4fa.tar.gz openshift-5ed42612965d72b87638ebe2fa96bec89199c4fa.tar.bz2 openshift-5ed42612965d72b87638ebe2fa96bec89199c4fa.tar.xz openshift-5ed42612965d72b87638ebe2fa96bec89199c4fa.zip | |
Merge pull request #878 from openshift/master
Master to prod
Diffstat (limited to 'roles/os_zabbix/tasks')
| -rw-r--r-- | roles/os_zabbix/tasks/main.yml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/roles/os_zabbix/tasks/main.yml b/roles/os_zabbix/tasks/main.yml index 82bf78b57..59c89bb02 100644 --- a/roles/os_zabbix/tasks/main.yml +++ b/roles/os_zabbix/tasks/main.yml @@ -16,6 +16,7 @@ - include_vars: template_app_zabbix_server.yml - include_vars: template_app_zabbix_agent.yml - include_vars: template_performance_copilot.yml +- include_vars: template_aws.yml - name: Include Template Heartbeat include: ../../lib_zabbix/tasks/create_template.yml @@ -88,3 +89,11 @@ server: "{{ ozb_server }}" user: "{{ ozb_user }}" password: "{{ ozb_password }}" + +- name: Include Template AWS + include: ../../lib_zabbix/tasks/create_template.yml + vars: + template: "{{ g_template_aws }}" + server: "{{ ozb_server }}" + user: "{{ ozb_user }}" + password: "{{ ozb_password }}" |