Remove checkbox for skip vrouter vips

In this plugin we disable all the VIPs auto-allocations including
'vrouter' ones. So there's actualy no possibility keep them and
thus additional configuration elements are not needed.

Change-Id: Ib7dffe65f957822c39c1817de866213d5ebd226d
This commit is contained in:
Aleksandr Didenko 2016-03-15 11:17:13 +01:00
parent 2cddead87e
commit ef5abfdad0
2 changed files with 0 additions and 20 deletions

View File

@ -17,20 +17,16 @@ network_metadata:
management: management:
ipaddr: <%= @external_lb['management_ip'] %> ipaddr: <%= @external_lb['management_ip'] %>
namespace: false namespace: false
<% if @external_lb['skip_vrouter_vip'] -%>
vrouter: vrouter:
namespace: false namespace: false
ipaddr: <%= @master_ip %> ipaddr: <%= @master_ip %>
<% end -%> <% end -%>
<% end -%>
<% if @external_lb['external_public_vip'] -%> <% if @external_lb['external_public_vip'] -%>
public: public:
ipaddr: <%= @external_lb['public_ip'] %> ipaddr: <%= @external_lb['public_ip'] %>
namespace: false namespace: false
<% if @external_lb['skip_vrouter_pub_vip'] -%>
vrouter_pub: vrouter_pub:
namespace: false namespace: false
<% end -%>
run_ping_checker: false run_ping_checker: false
<% end -%> <% end -%>
<% if @external_lb['external_public_vip'] and @external_lb['enable_fake_floating'] -%> <% if @external_lb['external_public_vip'] and @external_lb['enable_fake_floating'] -%>

View File

@ -5,14 +5,6 @@ attributes:
value: true value: true
label: "Use external LB for public VIP" label: "Use external LB for public VIP"
description: "Whether we should use external LB for public VIP." description: "Whether we should use external LB for public VIP."
skip_vrouter_pub_vip:
type: "checkbox"
weight: 20
value: true
label: "Skip vrouter public VIP"
description: "If you're moving controllers in different racks then you should disable vrouter VIPs because they won't work. All the routing is configured via rack switches."
restrictions:
- condition: "settings:external_loadbalancer.external_public_vip.value == false"
public_ip: public_ip:
value: "10.10.1.1" value: "10.10.1.1"
label: "Public host" label: "Public host"
@ -27,14 +19,6 @@ attributes:
value: true value: true
label: "Use external LB for management VIP" label: "Use external LB for management VIP"
description: "Whether we should use external LB for management VIP." description: "Whether we should use external LB for management VIP."
skip_vrouter_vip:
type: "checkbox"
weight: 50
value: true
label: "Skip vrouter management VIP"
description: "If you're moving controllers in different racks then you should disable vrouter VIPs because they won't work. All the routing is configured via rack switches."
restrictions:
- condition: "settings:external_loadbalancer.external_management_vip.value == false"
management_ip: management_ip:
value: "10.10.2.1" value: "10.10.2.1"
label: "Management host" label: "Management host"