Merge "Enable new LBaaS panel in Horizon"

defaults/main.yml

@@ -184,14 +184,15 @@ horizon_requires_pip_packages:
 
 horizon_pip_packages:
   - django-appconf
+  - django-openstack-auth
   - greenlet
   - horizon
   - keystonemiddleware
   - MySQL-python
   - PyMySQL
+  - neutron-lbaas-dashboard
   - oslo.config
   - ply
   - pycrypto
   - python-memcached
   - python-keystoneclient
-  - django-openstack-auth

releasenotes/notes/lbaasv2-horizon-panel-8f99026b025ca2fd.yaml

@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    The new LBaaS v2 dashboard is available in Horizon. Deployers can enable
+    the panel by setting the following Ansible variable:
+
+    .. code-block:: yaml
+
+        horizon_enable_neutron_lbaas: True

tasks/horizon_post_install.yml

@@ -56,6 +56,15 @@
   tags:
     - horizon-branding
 
+- name: Enable the neutron-lbaas-dashboard Horizon panel
+  file:
+    src: "{{ horizon_venv_lib_dir }}/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py"
+    path: "{{ horizon_venv_lib_dir }}/openstack_dashboard/local/enabled/_1481_project_ng_loadbalancersv2_panel.py"
+    state: "{{ (horizon_enable_neutron_lbaas | bool) | ternary('link', 'absent') }}"
+  notify: Restart apache2
+  tags:
+    - horizon-configs
+
 - name: Create horizon links
   file:
     src: "{{ item.src }}"

templates/horizon_local_settings.py.j2

@@ -269,7 +269,6 @@ OPENSTACK_NEUTRON_NETWORK = {
     'enable_ipv6': {{ horizon_enable_ipv6 | bool }},
     'enable_distributed_router': False,
     'enable_ha_router': False,
-    'enable_lb': {{ horizon_enable_neutron_lbaas | bool }},
     'enable_firewall': {{ horizon_enable_neutron_fwaas | bool }},
     'enable_vpn': {{ horizon_enable_neutron_vpnaas | bool }},
     'enable_fip_topology_check': True,