Merge pull request #526 from odyssey4me/minor-user-config-usability-fix

Minor usability tweak to rpc_user_config - group lb entries
This commit is contained in:
Kevin Carter 2014-11-17 14:44:34 -06:00
commit af97673605
2 changed files with 4 additions and 4 deletions

View File

@ -43,6 +43,8 @@ global_overrides:
internal_lb_vip_address: 172.29.236.1 internal_lb_vip_address: 172.29.236.1
# External DMZ VIP address # External DMZ VIP address
external_lb_vip_address: 192.168.1.1 external_lb_vip_address: 192.168.1.1
# Name of load balancer
lb_name: lb_name_in_core
# Bridged interface to use with tunnel type networks # Bridged interface to use with tunnel type networks
tunnel_bridge: "br-vxlan" tunnel_bridge: "br-vxlan"
# Bridged interface to build containers with # Bridged interface to build containers with
@ -109,8 +111,6 @@ global_overrides:
type: "vlan" type: "vlan"
range: "1:1" range: "1:1"
net_name: "vlan" net_name: "vlan"
# Name of load balancer
lb_name: lb_name_in_core
# User defined Infrastructure Hosts, this should be a required group # User defined Infrastructure Hosts, this should be a required group
infra_hosts: infra_hosts:

View File

@ -43,6 +43,8 @@ global_overrides:
internal_lb_vip_address: 172.29.236.10 internal_lb_vip_address: 172.29.236.10
# External DMZ VIP address # External DMZ VIP address
external_lb_vip_address: 192.168.1.1 external_lb_vip_address: 192.168.1.1
# Name of load balancer
lb_name: lb_name_in_core
# Bridged interface to use with tunnel type networks # Bridged interface to use with tunnel type networks
tunnel_bridge: "br-vxlan" tunnel_bridge: "br-vxlan"
# Bridged interface to build containers with # Bridged interface to build containers with
@ -109,8 +111,6 @@ global_overrides:
type: "vlan" type: "vlan"
range: "1:1" range: "1:1"
net_name: "vlan" net_name: "vlan"
# Name of load balancer
lb_name: lb_name_in_core
# Other options you may want # Other options you may want
debug: True debug: True
### Cinder default volume type option ### Cinder default volume type option