Merge "Fix deprecated ERB references"

templates/agent.yaml.erb

@@ -23,7 +23,7 @@ Main:
 <%- end -%>
   dimensions:
 <%- @dimensions.each_pair do |key, value| -%>
-    <%= key %>: <%= value %>
+    <%= @key %>: <%= @value %>
 <%- end -%>
   recent_point_threshold: <%= @recent_point_threshold %>
   check_freq: <%= @check_freq %>
@@ -48,4 +48,4 @@ Logging:
 <%- if @syslog_host and @syslog_port -%>
   syslog_host: <%= @syslog_host %>
   syslog_port: <%= @syslog_port %>
-<%- end -%>
+<%- end -%>

templates/checks/host_alive.yaml.erb

@@ -1,7 +1,7 @@
 ---
 init_config:
-  ssh_port: <%= ssh_port %>
-  ssh_timeout: <%= ssh_timeout %>
-  ping_timeout: <%= ping_timeout %>
+  ssh_port: <%= @ssh_port %>
+  ssh_timeout: <%= @ssh_timeout %>
+  ping_timeout: <%= @ping_timeout %>
 
 instances:

templates/checks/libvirt.yaml.erb

@@ -1,15 +1,15 @@
 ---
 init_config:
-  admin_password: <%= admin_password %>
-  admin_tenant_name: <%= admin_tenant_name %>
-  admin_user: <%= admin_user %>
-  identity_uri: <%= identity_uri %>
+  admin_password: <%= @admin_password %>
+  admin_tenant_name: <%= @admin_tenant_name %>
+  admin_user: <%= @admin_user %>
+  identity_uri: <%= @identity_uri %>
 <%- if @region_name -%>
   region_name: <%= @region_name %>
 <%- end -%>
-  cache_dir: <%= cache_dir %>
-  nova_refresh: <%= nova_refresh %>
-  vm_probation: <%= vm_probation %>
+  cache_dir: <%= @cache_dir %>
+  nova_refresh: <%= @nova_refresh %>
+  vm_probation: <%= @vm_probation %>
 
 instances:
- - {}
+ - {}

templates/checks/nagios_wrapper.erb

@@ -12,6 +12,6 @@
 <%- if @dimensions -%>
    dimensions: 
 <%- @dimensions.each do |key, value| -%>
-      <%= key %>: <%= value %>
+      <%= @key %>: <%= @value %>
+<%- end -%>
 <%- end -%>
-<%- end -%>