diff options
author | wutianwei <wutianwei1@huawei.com> | 2017-06-27 19:49:07 +0800 |
---|---|---|
committer | wutianwei <wutianwei1@huawei.com> | 2017-06-30 12:10:05 +0800 |
commit | 5371004738b1430e56a3e7679284a5e822255d2e (patch) | |
tree | 036ee67714b08a7cc62e35deda0ef66a889ec6a0 /deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2 | |
parent | 7107ed60659e23863ffcd227600bf741489f24d8 (diff) |
setup ovs create network flavor
1. replace the linuxbridge with openvswitch
2. create the network and flavors
3. fix the haproxy when public endpoint using http
Change-Id: I6fe93d0c4d5305e5dcab8d2e6c628eb5fa23ab56
Signed-off-by: wutianwei <wutianwei1@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2')
-rw-r--r-- | deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2 | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2 b/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2 index 38e14784..2a24113b 100644 --- a/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2 +++ b/deploy/adapters/ansible/roles/config-deployment/templates/openstack_user_config.yml.j2 @@ -37,16 +37,24 @@ global_overrides: range: "1:1000" net_name: "vxlan" group_binds: +{% if "linuxbridge" == NEUTRON_MECHANISM_DRIVERS[0] %} - neutron_linuxbridge_agent +{% else %} + - neutron_openvswitch_agent +{% endif %} - network: container_bridge: "br-vlan" container_type: "veth" container_interface: "eth12" host_bind_override: "eth12" type: "flat" - net_name: "flat" + net_name: "{{ public_net_info.provider_network }}" group_binds: +{% if "linuxbridge" == NEUTRON_MECHANISM_DRIVERS[0] %} - neutron_linuxbridge_agent +{% else %} + - neutron_openvswitch_agent +{% endif %} - network: container_bridge: "br-vlan" container_type: "veth" @@ -55,7 +63,11 @@ global_overrides: range: "1:1" net_name: "vlan" group_binds: +{% if "linuxbridge" == NEUTRON_MECHANISM_DRIVERS[0] %} - neutron_linuxbridge_agent +{% else %} + - neutron_openvswitch_agent +{% endif %} - network: container_bridge: "br-storage" container_type: "veth" |