From 09d7658e42058067644d1d515ac8d211fede2174 Mon Sep 17 00:00:00 2001
From: Samuel Cassiba <s@cassiba.com>
Date: Fri, 2 Mar 2018 17:59:26 -0800
Subject: [PATCH] Update lbaas url for Queens, logging handler

* remove postgres references
* update lbaas url to stable/queens
* update logging handler to reflect the current state of things

Change-Id: Ie298fec4dc1ed35119ffe844f356d1c72cfaa6f8
---
 recipes/neutron-lbaas-dashboard.rb      | 2 +-
 spec/horizon_spec.rb                    | 3 +--
 spec/neutron-lbaas-dashboard_spec.rb    | 2 +-
 templates/default/local_settings.py.erb | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/recipes/neutron-lbaas-dashboard.rb b/recipes/neutron-lbaas-dashboard.rb
index d0d41ae..2d3e1c2 100644
--- a/recipes/neutron-lbaas-dashboard.rb
+++ b/recipes/neutron-lbaas-dashboard.rb
@@ -31,7 +31,7 @@ python_package 'neutron-lbaas-dashboard' do
 end
 
 remote_file "#{django_path}/openstack_dashboard/local/enabled/_1481_project_ng_loadbalancersv2_panel.py" do
-  source 'https://raw.githubusercontent.com/openstack/neutron-lbaas-dashboard/stable/pike/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py'
+  source 'https://raw.githubusercontent.com/openstack/neutron-lbaas-dashboard/stable/queens/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py'
   owner 'root'
   mode 0o0644
   notifies :run, 'execute[openstack-dashboard collectstatic]'
diff --git a/spec/horizon_spec.rb b/spec/horizon_spec.rb
index d4d46df..477592f 100644
--- a/spec/horizon_spec.rb
+++ b/spec/horizon_spec.rb
@@ -431,8 +431,7 @@ describe 'openstack-dashboard::horizon' do
         end
 
         { 'mysql' => 'django.db.backends.mysql',
-          'sqlite' => 'django.db.backends.sqlite3',
-          'postgresql' => 'django.db.backends.postgresql_psycopg2' }.each do |service_type, backend|
+          'sqlite' => 'django.db.backends.sqlite3' }.each do |service_type, backend|
           context "#{service_type} database settings" do
             before do
               allow_any_instance_of(Chef::Recipe).to receive(:db)
diff --git a/spec/neutron-lbaas-dashboard_spec.rb b/spec/neutron-lbaas-dashboard_spec.rb
index 5674484..44fb30c 100644
--- a/spec/neutron-lbaas-dashboard_spec.rb
+++ b/spec/neutron-lbaas-dashboard_spec.rb
@@ -30,7 +30,7 @@ describe 'openstack-dashboard::neutron-lbaas-dashboard' do
       ).with(
         mode: 0o0644,
         owner: 'root',
-        source: 'https://raw.githubusercontent.com/openstack/neutron-lbaas-dashboard/stable/pike/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py'
+        source: 'https://raw.githubusercontent.com/openstack/neutron-lbaas-dashboard/stable/queens/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py'
       )
     end
 
diff --git a/templates/default/local_settings.py.erb b/templates/default/local_settings.py.erb
index 8d4f6b7..f465563 100644
--- a/templates/default/local_settings.py.erb
+++ b/templates/default/local_settings.py.erb
@@ -355,7 +355,7 @@ LOGGING = {
     'handlers': {
         'null': {
             'level': 'DEBUG',
-            'class': 'django.utils.log.NullHandler',
+            'class': 'logging.NullHandler',
         },
         'console': {
             # Set the level to "DEBUG" for verbose output logging.