Bug#990530: unblock: horizon/18.6.2-4 and all of its plugins
On 7/4/21 8:21 PM, Thomas Goirand wrote: > On 7/1/21 10:48 PM, Sebastian Ramacher wrote: >>> magnum-ui/7.0.0-2 >> >> This seems to be missing an upload. > > magnum-ui uploaded. unblock: magnum-ui/7.0.0-2 >>> sahara-dashboard/13.0.0-2 >> >> This introduces piuparts regressions. It has a wrong Breaks: version, this is fixed: unblock: sahara-dashboard/13.0.0-2 >> >>> vitrage-dashboard/3.2.0-3 >> >> This only seems to have a changelog entry. Indeed. Fixed: unblock: vitrage-dashboard/2.0.0-4 Cheers, Thomas Goirand (zigo)
Bug#990530: unblock: horizon/18.6.2-4 and all of its plugins
On 7/1/21 10:48 PM, Sebastian Ramacher wrote: >> magnum-ui/7.0.0-2 > > This seems to be missing an upload. magnum-ui uploaded. >> sahara-dashboard/13.0.0-2 > > This introduces piuparts regressions. > >> vitrage-dashboard/3.2.0-3 > > This only seems to have a changelog entry. I'll fix these tomorrow morning and let will let you know. Cheers, Thomas Goirand (zigo)
Bug#990530: unblock: horizon/18.6.2-4 and all of its plugins
Hi Thomas
On 2021-07-01 13:36:01 +0200, Thomas Goirand wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian@packages.debian.org
> Usertags: unblock
>
> Dear release team,
>
> As per the discussion at:
> https://bugs.debian.org/988188
>
> I have uploaded an update of Horizon and all of its plugins.
> The debdiff for Horizon is attached.
>
> Below, you'll find (inline) a debdiff for cloudkitty-dashboard showing
> what I am updaging in a typical Horizon plugin. I don't think it's necessary
> to provide a debdiff for each individual plugin, as they all look the
> same. However, please note that for heat-dashboard, I also added this
> patch (to warn users that this part of the plugin is broken on Chrome):
>
> ---
> heat-dashboard-4.0.0.orig/heat_dashboard/content/template_generator/templates/template_generator/index.html
> +++
> heat-dashboard-4.0.0/heat_dashboard/content/template_generator/templates/template_generator/index.html
> @@ -5,6 +5,7 @@
> {% block page_header %}
>
> {% trans "Template Generator" %}
> +(Not compatible with Chrome based browsers)
> {% trans "Please drag and drop resource icons into center canvas
> to define resource for template." %}
>
> {% endblock %}
>
> and also, for sahara-dashboard, I removed the Breaks+Replaces:
> python-sahara-dashboard, as this is obsolete since the Python 2
> version of this Horizon plugin doesn't exist in Buster (so the
> transition is over). Otherwise, all plugins have recieved similar
> updates.
>
> Here's the list of unblocks:
All unblocked, except those commented below.
>
> unblock horizon/3:18.6.2-4
> unblock cloudkitty-dashboard/11.0.0-2
> designate-dashboard/11.0.0-2
> freezer-web-ui/9.0.0-2
> heat-dashboard/4.0.0-2
> ironic-ui/4.2.0-3
> magnum-ui/7.0.0-2
This seems to be missing an upload.
> manila-ui/4.0.0-2
> mistral-dashboard/11.0.0-2
> murano-dashboard/1:10.0.0-2
> neutron-vpnaas-dashboard/3.0.0-2
> octavia-dashboard/6.0.0-2
> sahara-dashboard/13.0.0-2
This introduces piuparts regressions.
> senlin-dashboard/2.0.0-2
> trove-dashboard/15.0.0-2
> vitrage-dashboard/3.2.0-3
This only seems to have a changelog entry.
Cheers
> watcher-dashboard/4.0.0-2
> zaqar-ui/8.0.0-2
>
> A typical plugin fix looks like this (here, cloudkitty-dashboard):
>
> diff --git a/debian/changelog b/debian/changelog
> index f08809f..adaf71e 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,9 @@
> +cloudkitty-dashboard (11.0.0-2) unstable; urgency=medium
> +
> + * Fix installation of files in the enable folder.
> +
> + -- Thomas Goirand Wed, 30 Jun 2021 11:20:03 +0200
> +
> cloudkitty-dashboard (11.0.0-1) unstable; urgency=medium
>
>* New upstream release.
> diff --git a/debian/control b/debian/control
> index 7525cc7..6295d6a 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -41,6 +41,8 @@ Depends:
> python3-xstatic-rickshaw,
> ${misc:Depends},
> ${python3:Depends},
> +Breaks:
> + python3-django-horizon (<< 3:18.6.2-4~),
> Description: OpenStack data processing cluster as a service - dashboard
> plugin
> The Sahara project provides a simple means to provision a data-intensive
> application cluster (Hadoop or Spark) on top of OpenStack. It's the ex
> diff --git a/debian/python3-cloudkitty-dashboard.install
> b/debian/python3-cloudkitty-dashboard.install
> index 94ac7fd..9b4d16b 100644
> --- a/debian/python3-cloudkitty-dashboard.install
> +++ b/debian/python3-cloudkitty-dashboard.install
> @@ -1,2 +1 @@
> -/etc/openstack-dashboard/*
> /usr/*
> diff --git a/debian/python3-cloudkitty-dashboard.maintscript
> b/debian/python3-cloudkitty-dashboard.maintscript
> new file mode 100644
> index 000..24bcd97
> --- /dev/null
> +++ b/debian/python3-cloudkitty-dashboard.maintscript
> @@ -0,0 +1,9 @@
> +rm_conffile /etc/openstack-dashboard/enable/_10_admin_group.py
> +rm_conffile /etc/openstack-dashboard/enable/_10_project_group.py
> +rm_conffile /etc/openstack-dashboard/enable/_11_admin_hashmap_panel.py
> +rm_conffile /etc/openstack-dashboard/enable/_11_admin_rating_panel.py
> +rm_conffile /etc/openstack-dashboard/enable/_11_admin_summary_panel.py
> +rm_conffile /etc/openstack-dashboard/enable/_11_project_rating_panel.py
> +rm_conffile /etc/openstack-dashboard/enable/_12_project_reporting_panel.py
> +rm_conffile /etc/openstack-dashboard/enable/_13_admin_pyscripts_panel.py
> +rm_conffile /etc/openstack-dashboard/enable/_31000_cloudkitty.py
> diff --git a/debian/rules b/debian/rules
> index 37b6a8d..b253002 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -23,11 +23,9 @@ override_dh_install:
> python$$i setup.py install --install-layout=deb --root
> $(CURDIR)/debian/tmp ; \
> done
>
> - # Move config files to standard location
> - install -d -m 755 $(CURDIR)/debian/tmp/etc/openstack-dashboard/enabled
> -
> # Copy config enabled to openstack-dashboard enabled location
> - cp
>
Bug#990530: unblock: horizon/18.6.2-4 and all of its plugins
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Dear release team,
As per the discussion at:
https://bugs.debian.org/988188
I have uploaded an update of Horizon and all of its plugins.
The debdiff for Horizon is attached.
Below, you'll find (inline) a debdiff for cloudkitty-dashboard showing
what I am updaging in a typical Horizon plugin. I don't think it's necessary
to provide a debdiff for each individual plugin, as they all look the
same. However, please note that for heat-dashboard, I also added this
patch (to warn users that this part of the plugin is broken on Chrome):
---
heat-dashboard-4.0.0.orig/heat_dashboard/content/template_generator/templates/template_generator/index.html
+++
heat-dashboard-4.0.0/heat_dashboard/content/template_generator/templates/template_generator/index.html
@@ -5,6 +5,7 @@
{% block page_header %}
{% trans "Template Generator" %}
+(Not compatible with Chrome based browsers)
{% trans "Please drag and drop resource icons into center canvas to
define resource for template." %}
{% endblock %}
and also, for sahara-dashboard, I removed the Breaks+Replaces:
python-sahara-dashboard, as this is obsolete since the Python 2
version of this Horizon plugin doesn't exist in Buster (so the
transition is over). Otherwise, all plugins have recieved similar
updates.
Here's the list of unblocks:
unblock horizon/3:18.6.2-4
unblock cloudkitty-dashboard/11.0.0-2
designate-dashboard/11.0.0-2
freezer-web-ui/9.0.0-2
heat-dashboard/4.0.0-2
ironic-ui/4.2.0-3
magnum-ui/7.0.0-2
manila-ui/4.0.0-2
mistral-dashboard/11.0.0-2
murano-dashboard/1:10.0.0-2
neutron-vpnaas-dashboard/3.0.0-2
octavia-dashboard/6.0.0-2
sahara-dashboard/13.0.0-2
senlin-dashboard/2.0.0-2
trove-dashboard/15.0.0-2
vitrage-dashboard/3.2.0-3
watcher-dashboard/4.0.0-2
zaqar-ui/8.0.0-2
A typical plugin fix looks like this (here, cloudkitty-dashboard):
diff --git a/debian/changelog b/debian/changelog
index f08809f..adaf71e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cloudkitty-dashboard (11.0.0-2) unstable; urgency=medium
+
+ * Fix installation of files in the enable folder.
+
+ -- Thomas Goirand Wed, 30 Jun 2021 11:20:03 +0200
+
cloudkitty-dashboard (11.0.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 7525cc7..6295d6a 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,8 @@ Depends:
python3-xstatic-rickshaw,
${misc:Depends},
${python3:Depends},
+Breaks:
+ python3-django-horizon (<< 3:18.6.2-4~),
Description: OpenStack data processing cluster as a service - dashboard plugin
The Sahara project provides a simple means to provision a data-intensive
application cluster (Hadoop or Spark) on top of OpenStack. It's the ex
diff --git a/debian/python3-cloudkitty-dashboard.install
b/debian/python3-cloudkitty-dashboard.install
index 94ac7fd..9b4d16b 100644
--- a/debian/python3-cloudkitty-dashboard.install
+++ b/debian/python3-cloudkitty-dashboard.install
@@ -1,2 +1 @@
-/etc/openstack-dashboard/*
/usr/*
diff --git a/debian/python3-cloudkitty-dashboard.maintscript
b/debian/python3-cloudkitty-dashboard.maintscript
new file mode 100644
index 000..24bcd97
--- /dev/null
+++ b/debian/python3-cloudkitty-dashboard.maintscript
@@ -0,0 +1,9 @@
+rm_conffile /etc/openstack-dashboard/enable/_10_admin_group.py
+rm_conffile /etc/openstack-dashboard/enable/_10_project_group.py
+rm_conffile /etc/openstack-dashboard/enable/_11_admin_hashmap_panel.py
+rm_conffile /etc/openstack-dashboard/enable/_11_admin_rating_panel.py
+rm_conffile /etc/openstack-dashboard/enable/_11_admin_summary_panel.py
+rm_conffile /etc/openstack-dashboard/enable/_11_project_rating_panel.py
+rm_conffile /etc/openstack-dashboard/enable/_12_project_reporting_panel.py
+rm_conffile /etc/openstack-dashboard/enable/_13_admin_pyscripts_panel.py
+rm_conffile /etc/openstack-dashboard/enable/_31000_cloudkitty.py
diff --git a/debian/rules b/debian/rules
index 37b6a8d..b253002 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,11 +23,9 @@ override_dh_install:
python$$i setup.py install --install-layout=deb --root
$(CURDIR)/debian/tmp ; \
done
- # Move config files to standard location
- install -d -m 755 $(CURDIR)/debian/tmp/etc/openstack-dashboard/enabled
-
# Copy config enabled to openstack-dashboard enabled location
- cp
$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/cloudkittydashboard/enabled/_[0-9]*.py
$(CURDIR)/debian/tmp/etc/openstack-dashboard/enabled/
+ mkdir -p
$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/openstack_dashboard/local/enabled
+ cp
$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/cloudkittydashboard/enabled/_[0-9]*.py
$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/openstack_dashboard/local/enabled
dh_install
dh_missing --fail-missing
diff -Nru
