Merge "Fix VPNaaS setup"

This commit is contained in:
Jenkins 2017-03-10 11:12:54 +00:00 committed by Gerrit Code Review
commit 9faa38259d
4 changed files with 6 additions and 4 deletions

View File

@ -192,6 +192,7 @@ This is the current matrix of available tests:
| nova | X | X | X |
| neutron | X | X | X |
| lbaasv2 | | X | |
| vpnaas | | X | |
| cinder | X | | |
| ceilometer | | | X |
| aodh | | | X |

View File

@ -40,5 +40,9 @@ class packstack::neutron::api ()
class { '::neutron::services::lbaas': }
}
if $neutron_vpnaas_enabled {
class { '::neutron::services::vpnaas': }
}
Class['::neutron::server'] -> File['/etc/neutron/api-paste.ini']
}

View File

@ -3,9 +3,5 @@ class packstack::neutron::vpnaas ()
class { '::neutron::agents::vpnaas':
enabled => true,
vpn_device_driver => 'neutron_vpnaas.services.vpn.device_drivers.libreswan_ipsec.LibreSwanDriver',
} ->
class { '::neutron::services::vpnaas':
service_providers => 'VPN:libreswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default',
notify => Service['neutron-server'],
}
}

View File

@ -29,6 +29,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
--nagios-install=n \
--glance-backend=swift \
--os-neutron-lbaas-install=y \
--os-neutron-vpnaas-install=y \
--os-sahara-install=y \
--os-trove-install=y \
--keystone-token-format=UUID \