diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-08-11 15:41:29 +0000 |
|---|---|---|
| committer | Vladislav Belogrudov <vladislav.belogrudov@oracle.com> | 2016-08-24 14:45:14 +0000 |
| commit | 158a852998495c9289ff9899adc7dfbf9a06910a (patch) | |
| tree | 257b3e7a70a241a3968fc6877c82797afea636e5 | |
| parent | cc4150292c66b99aaf63a63e7438fa1cee3be129 (diff) | |
| download | kolla-158a852998495c9289ff9899adc7dfbf9a06910a.tar.gz kolla-158a852998495c9289ff9899adc7dfbf9a06910a.zip | |
Add defaults for interfaces to all.yml
The values for 'network_interface' and 'neutron_external_interface' are
missing from all.yml, meaning it is impossible to override them on a per
node / per group basis. (globals.yml get's top precedence).
Make these consistent with the rest of the variables and move the
defaults into all.yml. Operators can still override / update these in
globals.yml as before, but those wanting more flexibility now have it
via host / group variables.
Change-Id: I2575921f76a8e245106da765757c70353bd6762c
Closes-Bug: #1604129
| -rw-r--r-- | ansible/group_vars/all.yml | 2 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 671e8a197..deb05069f 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -100,6 +100,8 @@ keepalived_virtual_router_id: "51" #################### # Networking options #################### +network_interface: "eth0" +neutron_external_interface: "eth1" kolla_external_vip_interface: "{{ network_interface }}" api_interface: "{{ network_interface }}" storage_interface: "{{ network_interface }}" diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 7bede69d8..e60cdf036 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -58,7 +58,13 @@ kolla_internal_vip_address: "10.10.10.254" # This interface is what all your api services will be bound to by default. # Additionally, all vxlan/tunnel and storage network traffic will go over this # interface by default. This interface must contain an IPv4 address. -network_interface: "eth0" +# It is possible for hosts to have non-matching names of interfaces - these can +# be set in an inventory file per host or per group or stored separately, see +# http://docs.ansible.com/ansible/intro_inventory.html +# Yet another way to workaround the naming problem is to create a bond for the +# interface on all hosts and give the bond name here. Similar strategy can be +# followed for other types of interfaces. +#network_interface: "eth0" # These can be adjusted for even more customization. The default is the same as # the 'network_interface'. These interfaces must contain an IPv4 address. @@ -72,7 +78,7 @@ network_interface: "eth0" # though an IP address can exist on this interface, it will be unusable in most # configurations. It is recommended this interface not be configured with any IP # addresses for that reason. -neutron_external_interface: "eth1" +#neutron_external_interface: "eth1" # Valid options are [ openvswitch, linuxbridge ] #neutron_plugin_agent: "openvswitch" |