Merge "Fix deprecated ERB references"
This commit is contained in:
commit
6f62c62023
@ -23,7 +23,7 @@ Main:
|
|||||||
<%- end -%>
|
<%- end -%>
|
||||||
dimensions:
|
dimensions:
|
||||||
<%- @dimensions.each_pair do |key, value| -%>
|
<%- @dimensions.each_pair do |key, value| -%>
|
||||||
<%= key %>: <%= value %>
|
<%= @key %>: <%= @value %>
|
||||||
<%- end -%>
|
<%- end -%>
|
||||||
recent_point_threshold: <%= @recent_point_threshold %>
|
recent_point_threshold: <%= @recent_point_threshold %>
|
||||||
check_freq: <%= @check_freq %>
|
check_freq: <%= @check_freq %>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
init_config:
|
init_config:
|
||||||
ssh_port: <%= ssh_port %>
|
ssh_port: <%= @ssh_port %>
|
||||||
ssh_timeout: <%= ssh_timeout %>
|
ssh_timeout: <%= @ssh_timeout %>
|
||||||
ping_timeout: <%= ping_timeout %>
|
ping_timeout: <%= @ping_timeout %>
|
||||||
|
|
||||||
instances:
|
instances:
|
||||||
|
@ -1,15 +1,15 @@
|
|||||||
---
|
---
|
||||||
init_config:
|
init_config:
|
||||||
admin_password: <%= admin_password %>
|
admin_password: <%= @admin_password %>
|
||||||
admin_tenant_name: <%= admin_tenant_name %>
|
admin_tenant_name: <%= @admin_tenant_name %>
|
||||||
admin_user: <%= admin_user %>
|
admin_user: <%= @admin_user %>
|
||||||
identity_uri: <%= identity_uri %>
|
identity_uri: <%= @identity_uri %>
|
||||||
<%- if @region_name -%>
|
<%- if @region_name -%>
|
||||||
region_name: <%= @region_name %>
|
region_name: <%= @region_name %>
|
||||||
<%- end -%>
|
<%- end -%>
|
||||||
cache_dir: <%= cache_dir %>
|
cache_dir: <%= @cache_dir %>
|
||||||
nova_refresh: <%= nova_refresh %>
|
nova_refresh: <%= @nova_refresh %>
|
||||||
vm_probation: <%= vm_probation %>
|
vm_probation: <%= @vm_probation %>
|
||||||
|
|
||||||
instances:
|
instances:
|
||||||
- {}
|
- {}
|
@ -12,6 +12,6 @@
|
|||||||
<%- if @dimensions -%>
|
<%- if @dimensions -%>
|
||||||
dimensions:
|
dimensions:
|
||||||
<%- @dimensions.each do |key, value| -%>
|
<%- @dimensions.each do |key, value| -%>
|
||||||
<%= key %>: <%= value %>
|
<%= @key %>: <%= @value %>
|
||||||
<%- end -%>
|
<%- end -%>
|
||||||
<%- end -%>
|
<%- end -%>
|
Loading…
Reference in New Issue
Block a user