diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-02 15:39:56 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-02 15:39:56 -0400 |
| commit | cc65f03c894af8c40cf9c25128c9834f6cbdd02b (patch) | |
| tree | cb7d113579bb1db1f685408b198397a89052b892 /roles/os_zabbix/tasks | |
| parent | ef6b36d14a00757754aaf001a8acad8354cf62ff (diff) | |
| parent | a4d5e59c413746cb1715b15a9e158be3f3a94a54 (diff) | |
| download | openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.tar.gz openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.tar.bz2 openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.tar.xz openshift-cc65f03c894af8c40cf9c25128c9834f6cbdd02b.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade
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 a503b24d7..82bf78b57 100644 --- a/roles/os_zabbix/tasks/main.yml +++ b/roles/os_zabbix/tasks/main.yml @@ -15,6 +15,7 @@ - include_vars: template_ops_tools.yml - include_vars: template_app_zabbix_server.yml - include_vars: template_app_zabbix_agent.yml +- include_vars: template_performance_copilot.yml - name: Include Template Heartbeat include: ../../lib_zabbix/tasks/create_template.yml @@ -79,3 +80,11 @@ server: "{{ ozb_server }}" user: "{{ ozb_user }}" password: "{{ ozb_password }}" + +- name: Include Template Performance Copilot + include: ../../lib_zabbix/tasks/create_template.yml + vars: + template: "{{ g_template_performance_copilot }}" + server: "{{ ozb_server }}" + user: "{{ ozb_user }}" + password: "{{ ozb_password }}" |