Add option to auto enable from VPNaaS in Horizon

This change simple provides an option to inspect the neutron_plugin_base
and enable vpnaas within horizon if the option is found.

Depends-On: I2343f91e5ae1664fc8ab9ba1fbc3196b4d92078c
Depends-On: Ie9f89f7d2a942df40841d72c82f3a34315c6bed9
Change-Id: Ie21eaf940f54a0c2175ab3232d84cd3ea7fd8128
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2016-04-13 12:42:58 -05:00 committed by Jesse Pretorius (odyssey4me)
parent 7990d77fa9
commit ca73998d4f
3 changed files with 10 additions and 1 deletions

View File

@ -142,7 +142,7 @@ to manually delete load balancers, pools, and members before switching LBaaS
versions. Those objects will need to be re-created afterwards.
Virtual Private Network Service (Optional)
---------------------------------------------------
------------------------------------------
The following procedure describes how to modify the
``/etc/openstack_deploy/user_variables.yml`` file to enable VPNaaS.

View File

@ -221,6 +221,7 @@ horizon_enable_cinder_backup: "{% if cinder_service_backup_program_enabled is de
#TODO(odyssey4me): Remove the classpath from this conditional in the Newton cycle.
horizon_enable_neutron_lbaas: "{% if neutron_plugin_base is defined and ('lbaas' in neutron_plugin_base or 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPlugin' in neutron_plugin_base) %}True{% else %}False{% endif %}"
horizon_enable_neutron_fwaas: "{% if neutron_plugin_base is defined and 'firewall' in neutron_plugin_base %}True{% else %}False{% endif %}"
horizon_enable_neutron_vpnaas: "{% if neutron_plugin_base is defined and 'vpnaas' in neutron_plugin_base %}True{% else %}False{% endif %}"
horizon_rabbitmq_userid: horizon
horizon_rabbitmq_vhost: /horizon

View File

@ -0,0 +1,8 @@
---
features:
- Neutron VPN as a Service (VPNaaS) can now optionally be deployed and
configured. Please see the `OpenStack Networking Guide
<http://docs.openstack.org/mitaka/networking-guide/>`_ for details
about the what the service is and what it provides. See the
`VPNaaS Install Guide <http://docs.openstack.org/developer/openstack-ansible/install-guide/configure-network-services.html#virtual-private-network-service-optional>`_
for implementation details.