Merge "Fix VPNaaS setup" into stable/newton
This commit is contained in:
commit
104ce992ac
|
@ -192,6 +192,7 @@ This is the current matrix of available tests:
|
||||||
| nova | X | X | X |
|
| nova | X | X | X |
|
||||||
| neutron | X | X | X |
|
| neutron | X | X | X |
|
||||||
| lbaasv2 | | X | |
|
| lbaasv2 | | X | |
|
||||||
|
| vpnaas | | X | |
|
||||||
| cinder | X | | |
|
| cinder | X | | |
|
||||||
| ceilometer | | | X |
|
| ceilometer | | | X |
|
||||||
| aodh | | | X |
|
| aodh | | | X |
|
||||||
|
|
|
@ -40,5 +40,9 @@ class packstack::neutron::api ()
|
||||||
class { '::neutron::services::lbaas': }
|
class { '::neutron::services::lbaas': }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $neutron_vpnaas_enabled {
|
||||||
|
class { '::neutron::services::vpnaas': }
|
||||||
|
}
|
||||||
|
|
||||||
Class['::neutron::server'] -> File['/etc/neutron/api-paste.ini']
|
Class['::neutron::server'] -> File['/etc/neutron/api-paste.ini']
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,9 +3,5 @@ class packstack::neutron::vpnaas ()
|
||||||
class { '::neutron::agents::vpnaas':
|
class { '::neutron::agents::vpnaas':
|
||||||
enabled => true,
|
enabled => true,
|
||||||
vpn_device_driver => 'neutron_vpnaas.services.vpn.device_drivers.libreswan_ipsec.LibreSwanDriver',
|
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'],
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,7 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
|
||||||
--nagios-install=n \
|
--nagios-install=n \
|
||||||
--glance-backend=swift \
|
--glance-backend=swift \
|
||||||
--os-neutron-lbaas-install=y \
|
--os-neutron-lbaas-install=y \
|
||||||
|
--os-neutron-vpnaas-install=y \
|
||||||
--os-sahara-install=y \
|
--os-sahara-install=y \
|
||||||
--os-trove-install=y \
|
--os-trove-install=y \
|
||||||
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.4-x86_64-vmlinuz" \
|
--provision-uec-kernel-url="/tmp/cirros/cirros-0.3.4-x86_64-vmlinuz" \
|
||||||
|
|
Loading…
Reference in New Issue