Missing init script of VPNaaS

The playbook runs fine but it's missing the init
script of the neutron-vpn-agent which is necessary
to handle the new VPN services created.

Also there
is a wrong service_name "neutron-vpnaas-agent" instead
of "neutron-vpn-agent" (which are the binary that are
in the python libs folder).

Correction of the
neutron_driver_vpnaas using the neutron_vpnaas package
instead of the neutron package (deprecated).

vpnaas_agent.ini - added external_network_bridge and
interface_driver that were missing

Change-Id: I953f873bcdc17f2b78bb5753753b2f52d29082e1
This commit is contained in:
Pedro Magalhães 2016-04-27 10:21:26 +01:00
parent 4709ac7a1e
commit 9a3022d959
3 changed files with 21 additions and 2 deletions

View File

@ -197,7 +197,7 @@ neutron_services:
config_type: "ini"
neutron-vpnaas-agent:
group: neutron_l3_agent
service_name: neutron-vpnaas-agent
service_name: neutron-vpn-agent
service_en: "{{ neutron_vpnaas | bool }}"
service_conf: vpnaas_agent.ini
service_group: neutron_agent
@ -258,7 +258,7 @@ neutron_driver_metering: neutron.services.metering.drivers.iptables.iptables_dri
neutron_driver_dhcp: neutron.agent.linux.dhcp.Dnsmasq
neutron_driver_quota: neutron.db.quota.driver.DbQuotaDriver
neutron_driver_firewall: neutron.agent.linux.iptables_firewall.IptablesFirewallDriver
neutron_driver_vpnaas: neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver
neutron_driver_vpnaas: neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver
## Quotas
neutron_default_quota: -1

View File

@ -124,3 +124,17 @@
- neutron_services['neutron-lbaasv2-agent'].service_en | bool
tags:
- upstart-init
- include: neutron_upstart_common_init.yml
vars:
program_name: "{{ neutron_services['neutron-vpnaas-agent'].service_name }}"
program_config_options: "{{ neutron_services['neutron-vpnaas-agent'].config_options }}"
service_name: "{{ neutron_service_name }}"
system_user: "{{ neutron_system_user_name }}"
system_group: "{{ neutron_system_group_name }}"
service_home: "{{ neutron_system_home_folder }}"
when:
- inventory_hostname in groups[neutron_services['neutron-vpnaas-agent']['group']]
- neutron_services['neutron-vpnaas-agent'].service_en | bool
tags:
- upstart-init

View File

@ -1,4 +1,9 @@
# {{ ansible_managed }}
[DEFAULT]
external_network_bridge = {{ neutron_external_network_bridge }}
interface_driver = {{ neutron_driver_interface }}
[vpnagent]
vpn_device_driver = {{ neutron_driver_vpnaas }}