From b6aadb9656d5880ec63bb430ecced7c563f2e5ce Mon Sep 17 00:00:00 2001 From: Bertrand Lallau Date: Fri, 18 Aug 2017 13:00:32 +0200 Subject: [PATCH] Fix VMware VPN, LBAAS and neutron-server config As describe here in vmware-guide: https://github.com/openstack/kolla-ansible/blob/master/doc/vmware-guide.rst#L116 VMware NSX-V (neutron_plugin_agent: "vmware_nsxv") supports Neutron LBaaS and VPNaaS services. neutron_plugin_agent valid options are [ openvswitch, linuxbridge, vmware_nsxv, vmware_dvs, opendaylight ]: https://github.com/openstack/kolla-ansible/blob/master/ansible/group_vars/all.yml#L125 Change-Id: I50667862adc7a3d51465a482b513e924f12b75cd Closes-Bug: #1711576 --- ansible/roles/neutron/templates/neutron-server.json.j2 | 2 +- ansible/roles/neutron/templates/neutron_lbaas.conf.j2 | 2 +- ansible/roles/neutron/templates/neutron_vpnaas.conf.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/neutron/templates/neutron-server.json.j2 b/ansible/roles/neutron/templates/neutron-server.json.j2 index 9f83c71f9d..ebe1d170c9 100644 --- a/ansible/roles/neutron/templates/neutron-server.json.j2 +++ b/ansible/roles/neutron/templates/neutron-server.json.j2 @@ -1,5 +1,5 @@ { - "command": "neutron-server --config-file /etc/neutron/neutron.conf {% if neutron_plugin_agent in ['openvswitch', 'linuxbridge', 'opendaylight'] %} --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/neutron_lbaas.conf --config-file /etc/neutron/neutron_vpnaas.conf {% elif neutron_plugin_agent in ['vmware_nsx', 'vmware_dvs'] %} --config-file /etc/neutron/plugins/vmware/nsx.ini {% endif %} --config-file /etc/neutron/fwaas_driver.ini", + "command": "neutron-server --config-file /etc/neutron/neutron.conf {% if neutron_plugin_agent in ['openvswitch', 'linuxbridge', 'opendaylight'] %} --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/neutron_lbaas.conf --config-file /etc/neutron/neutron_vpnaas.conf {% elif neutron_plugin_agent in ['vmware_nsxv', 'vmware_dvs'] %} --config-file /etc/neutron/plugins/vmware/nsx.ini {% endif %} --config-file /etc/neutron/fwaas_driver.ini", "config_files": [ { "source": "{{ container_config_directory }}/neutron.conf", diff --git a/ansible/roles/neutron/templates/neutron_lbaas.conf.j2 b/ansible/roles/neutron/templates/neutron_lbaas.conf.j2 index a62c745906..118be28727 100644 --- a/ansible/roles/neutron/templates/neutron_lbaas.conf.j2 +++ b/ansible/roles/neutron/templates/neutron_lbaas.conf.j2 @@ -2,7 +2,7 @@ [service_providers] {% if enable_octavia | bool %} service_provider = LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default -{% elif neutron_plugin_agent == 'vmware_nsx' %} +{% elif neutron_plugin_agent == 'vmware_nsxv' %} service_provider = LOADBALANCERV2:VMWareEdge:neutron_lbaas.drivers.vmware.edge_driver_v2.EdgeLoadBalancerDriverV2:default {% else %} service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default diff --git a/ansible/roles/neutron/templates/neutron_vpnaas.conf.j2 b/ansible/roles/neutron/templates/neutron_vpnaas.conf.j2 index cd76b836c5..6fbb6156a2 100644 --- a/ansible/roles/neutron/templates/neutron_vpnaas.conf.j2 +++ b/ansible/roles/neutron/templates/neutron_vpnaas.conf.j2 @@ -1,6 +1,6 @@ {% if enable_neutron_vpnaas | bool %} [service_providers] -{% if neutron_plugin_agent == 'vmware_nsx' %} +{% if neutron_plugin_agent == 'vmware_nsxv' %} service_provider = VPN:vmware:vmware_nsx.services.vpnaas.nsxv.ipsec_driver.NSXvIPsecVpnDriver:default {% else %} service_provider = VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default