Merge "Update lbaas url for Queens, logging handler"
This commit is contained in:
commit
d828493fad
|
@ -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]'
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -356,7 +356,7 @@ LOGGING = {
|
|||
'handlers': {
|
||||
'null': {
|
||||
'level': 'DEBUG',
|
||||
'class': 'django.utils.log.NullHandler',
|
||||
'class': 'logging.NullHandler',
|
||||
},
|
||||
'console': {
|
||||
# Set the level to "DEBUG" for verbose output logging.
|
||||
|
|
Loading…
Reference in New Issue