openstack/kolla-ansible
Code Issues Proposed changes

Fix VMware VPN, LBAAS and neutron-server config

Browse Source 
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
This commit is contained in:
Bertrand Lallau 2017-08-18 13:00:32 +02:00
parent 9c43de8955
commit b6aadb9656
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/neutron/templates/neutron-server.json.j2
View File

@ -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": [ "config_files": [
{ {
"source": "{{ container_config_directory }}/neutron.conf", "source": "{{ container_config_directory }}/neutron.conf",

2
ansible/roles/neutron/templates/neutron_lbaas.conf.j2
View File

@ -2,7 +2,7 @@
[service_providers] [service_providers]
{% if enable_octavia | bool %} {% if enable_octavia | bool %}
service_provider = LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default 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 service_provider = LOADBALANCERV2:VMWareEdge:neutron_lbaas.drivers.vmware.edge_driver_v2.EdgeLoadBalancerDriverV2:default
{% else %} {% else %}
service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default

2
ansible/roles/neutron/templates/neutron_vpnaas.conf.j2
View File

@ -1,6 +1,6 @@
{% if enable_neutron_vpnaas | bool %} {% if enable_neutron_vpnaas | bool %}
[service_providers] [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 service_provider = VPN:vmware:vmware_nsx.services.vpnaas.nsxv.ipsec_driver.NSXvIPsecVpnDriver:default
{% else %} {% else %}
service_provider = VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default service_provider = VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default