Merge pull request #64 from dpavlos/nagios_config

ARGO-389 Central nagios UMD plugins

roles/monitoring_engine/tasks/main.yml

@@ -14,6 +14,11 @@
   yum: name={{ item.name }} state=latest enablerepo={{ item.repo }}
   with_items: nagios_plugins
   
+- name: Install Nagios UMD plugins
+  yum: name={{ item.name }} state=latest
+  with_items: nagios_plugins_umd
+  when: nagios_plugins_umd is defined
+
 - name: Copy nagios.cfg file
   template: src=nagios.cfg.j2
             dest=/etc/nagios/nagios.cfg

roles/monitoring_engine/templates/ncg.conf.j2

@@ -37,7 +37,7 @@ BACKUP_INSTANCE = {{ backup_instance }}
     INCLUDE_EMPTY_HOSTS = {{ include_empty_hosts }}
     ENABLE_NOTIFICATIONS = {{ enable_notifications }}
     CHECK_HOSTS = {{ check_hosts }}
-    TENANT = {{ tenant }}
+    TENANT = {{ tenant_name }}
   </Nagios>
 </NCG::ConfigGen>