From 6ce3faa7d345409c056f21606734b7adbf61b8fd Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Mon, 8 Aug 2022 16:16:36 +0200 Subject: [PATCH] Remove create_instance override Horizon removed the Django-based implementation of launch instance [1] which was overriden by cloudkitty-dashboard. Remove override to avoid breaking Horizon when cloudkitty-dashboard is enabled. [1] https://review.opendev.org/c/openstack/horizon/+/816303 Change-Id: Ib6516cfb4d9bbe75ddb62969f62629712afca38b Story: 2009924 Task: 44788 --- .../enabled/_11_project_rating_panel.py | 3 -- cloudkittydashboard/overrides.py | 37 ------------------- ...te-instance-override-8a2cfc152365d5d5.yaml | 5 +++ 3 files changed, 5 insertions(+), 40 deletions(-) delete mode 100644 cloudkittydashboard/overrides.py create mode 100644 releasenotes/notes/create-instance-override-8a2cfc152365d5d5.yaml diff --git a/cloudkittydashboard/enabled/_11_project_rating_panel.py b/cloudkittydashboard/enabled/_11_project_rating_panel.py index 5e0bb26..7dd8f79 100644 --- a/cloudkittydashboard/enabled/_11_project_rating_panel.py +++ b/cloudkittydashboard/enabled/_11_project_rating_panel.py @@ -19,6 +19,3 @@ PANEL = 'rating' # Python panel class of the PANEL to be added. ADD_PANEL = \ 'cloudkittydashboard.dashboards.project.rating.panel.Project_rating' - -UPDATE_HORIZON_CONFIG = {'customization_module': - "cloudkittydashboard.overrides"} diff --git a/cloudkittydashboard/overrides.py b/cloudkittydashboard/overrides.py deleted file mode 100644 index 01a713a..0000000 --- a/cloudkittydashboard/overrides.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright 2015 Objectif Libre -# -# 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 django.utils.translation import gettext_lazy as _ -from openstack_dashboard.dashboards.project.instances.workflows \ - import create_instance - - -# Instances Panel -class InstancePredictivePricing(create_instance.SetInstanceDetailsAction): - class Meta(object): - name = _("Details") - help_text_template = ("project/rating/" - "_launch_details_price.html") - - def get_help_text(self, extra_context=None): - extra = extra_context or {} - extra['price'] = 0 - extra = super(InstancePredictivePricing, - self).get_help_text(extra_context=extra) - return extra - - -create_instance.SetInstanceDetails.action_class = InstancePredictivePricing diff --git a/releasenotes/notes/create-instance-override-8a2cfc152365d5d5.yaml b/releasenotes/notes/create-instance-override-8a2cfc152365d5d5.yaml new file mode 100644 index 0000000..752a806 --- /dev/null +++ b/releasenotes/notes/create-instance-override-8a2cfc152365d5d5.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes compatibility with Horizon 21.0.0 and newer following the removal of + the Django-based implementation of launch instance.