Merge "Remove unused designateclient"
This commit is contained in:
commit
32559e514d
|
@ -12,8 +12,6 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from designatedashboard import exceptions
|
|
||||||
|
|
||||||
# The name of the panel to be added to HORIZON_CONFIG. Required.
|
# The name of the panel to be added to HORIZON_CONFIG. Required.
|
||||||
PANEL = 'dnszones'
|
PANEL = 'dnszones'
|
||||||
# The name of the dashboard the PANEL associated with. Required.
|
# The name of the dashboard the PANEL associated with. Required.
|
||||||
|
@ -21,12 +19,6 @@ PANEL_DASHBOARD = 'project'
|
||||||
# The name of the panel group the PANEL is associated with.
|
# The name of the panel group the PANEL is associated with.
|
||||||
PANEL_GROUP = 'dns'
|
PANEL_GROUP = 'dns'
|
||||||
|
|
||||||
ADD_EXCEPTIONS = {
|
|
||||||
'recoverable': exceptions.RECOVERABLE,
|
|
||||||
'not_found': exceptions.NOT_FOUND,
|
|
||||||
'unauthorized': exceptions.UNAUTHORIZED,
|
|
||||||
}
|
|
||||||
|
|
||||||
ADD_INSTALLED_APPS = ['designatedashboard']
|
ADD_INSTALLED_APPS = ['designatedashboard']
|
||||||
|
|
||||||
# Python panel class of the PANEL to be added.
|
# Python panel class of the PANEL to be added.
|
||||||
|
|
|
@ -12,8 +12,6 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from designatedashboard import exceptions
|
|
||||||
|
|
||||||
# The name of the panel to be added to HORIZON_CONFIG. Required.
|
# The name of the panel to be added to HORIZON_CONFIG. Required.
|
||||||
PANEL = 'reverse_dns'
|
PANEL = 'reverse_dns'
|
||||||
# The name of the dashboard the PANEL associated with. Required.
|
# The name of the dashboard the PANEL associated with. Required.
|
||||||
|
@ -21,12 +19,6 @@ PANEL_DASHBOARD = 'project'
|
||||||
# The name of the panel group the PANEL is associated with.
|
# The name of the panel group the PANEL is associated with.
|
||||||
PANEL_GROUP = 'dns'
|
PANEL_GROUP = 'dns'
|
||||||
|
|
||||||
ADD_EXCEPTIONS = {
|
|
||||||
'recoverable': exceptions.RECOVERABLE,
|
|
||||||
'not_found': exceptions.NOT_FOUND,
|
|
||||||
'unauthorized': exceptions.UNAUTHORIZED,
|
|
||||||
}
|
|
||||||
|
|
||||||
# Python panel class of the PANEL to be added.
|
# Python panel class of the PANEL to be added.
|
||||||
ADD_PANEL = (
|
ADD_PANEL = (
|
||||||
'designatedashboard.dashboards.project.ngdns.reverse_dns.panel.ReverseDns')
|
'designatedashboard.dashboards.project.ngdns.reverse_dns.panel.ReverseDns')
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
# Copyright (c) 2014 Rackspace Hosting.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
||||||
# implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
from designateclient import exceptions as designateclient
|
|
||||||
|
|
||||||
from openstack_dashboard import exceptions
|
|
||||||
|
|
||||||
NOT_FOUND = exceptions.NOT_FOUND + (
|
|
||||||
designateclient.ResourceNotFound,
|
|
||||||
designateclient.NotFound,
|
|
||||||
)
|
|
||||||
RECOVERABLE = exceptions.RECOVERABLE + (
|
|
||||||
designateclient.BadRequest,
|
|
||||||
designateclient.Conflict,
|
|
||||||
)
|
|
||||||
UNAUTHORIZED = exceptions.UNAUTHORIZED + (
|
|
||||||
designateclient.Forbidden,
|
|
||||||
)
|
|
|
@ -21,12 +21,3 @@ settings.POLICY_FILES.update({
|
||||||
settings.DEFAULT_POLICY_FILES.update({
|
settings.DEFAULT_POLICY_FILES.update({
|
||||||
'dns': 'default_policies/designate.yaml'
|
'dns': 'default_policies/designate.yaml'
|
||||||
})
|
})
|
||||||
|
|
||||||
# Sample
|
|
||||||
# settings.LOGGING['loggers'].update({
|
|
||||||
# 'designateclient': {
|
|
||||||
# 'handlers': ['console'],
|
|
||||||
# 'level': 'DEBUG',
|
|
||||||
# 'propagate': False,
|
|
||||||
# }
|
|
||||||
# })
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``python-designateclient`` library is no longer required.
|
|
@ -6,6 +6,5 @@
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||||
python-designateclient>=2.7.0 # Apache-2.0
|
|
||||||
|
|
||||||
horizon>=17.1.0 # Apache-2.0
|
horizon>=17.1.0 # Apache-2.0
|
||||||
|
|
Loading…
Reference in New Issue