--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package mistral
We need the dependency on openstack-pkg-tools (>= 54~) to install correctly.
unblock mistral/3.0.0-4
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 4.9.0-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
diff -Nru mistral-3.0.0/debian/changelog mistral-3.0.0/debian/changelog
--- mistral-3.0.0/debian/changelog 2016-10-06 17:56:44.000000000 +0200
+++ mistral-3.0.0/debian/changelog 2017-04-03 18:07:09.000000000 +0200
@@ -1,3 +1,33 @@
+mistral (3.0.0-4) unstable; urgency=medium
+
+ * Add allow-sqla-1.1.patch to allow SQLA transition.
+ * German debconf translation update (Closes: #842487).
+
+ -- Thomas Goirand <[email protected]> Mon, 03 Apr 2017 18:07:09 +0200
+
+mistral (3.0.0-3) unstable; urgency=medium
+
+ * Team upload.
+ * Bump build dependency on openstack-pkg-tools (Closes: #858705).
+
+ -- David Rabel <[email protected]> Sat, 01 Apr 2017 11:54:37 +0200
+
+mistral (3.0.0-2) unstable; urgency=medium
+
+ [ Corey Bryant ]
+ * d/rules, d/mistral-common.postinst.in, d/mistral-common.postrm:
+ Install missing json files (LP: #1634475).
+ * d/control: Add python-pep8 to Build-Depends.
+
+ [ Thomas Goirand ]
+ * Fixed lsb-base depends.
+
+ [ Gauvain Pocentek ]
+ * d/rules: install missing resources directory, needed when populating the
+ mistral DB
+
+ -- Thomas Goirand <[email protected]> Wed, 19 Oct 2016 11:05:37 +0200
+
mistral (3.0.0-1) unstable; urgency=medium
* New upstream release.
diff -Nru mistral-3.0.0/debian/control mistral-3.0.0/debian/control
--- mistral-3.0.0/debian/control 2016-10-06 17:56:44.000000000 +0200
+++ mistral-3.0.0/debian/control 2017-04-03 18:07:09.000000000 +0200
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 9),
dh-python,
dh-systemd,
- openstack-pkg-tools (>= 53~),
+ openstack-pkg-tools (>= 54~),
po-debconf,
python-all,
python-pbr (>= 1.8),
@@ -55,6 +55,7 @@
python-osprofiler (>= 1.4.0),
python-paramiko (>= 2.0),
python-pecan (>= 1.0.0),
+ python-pep8,
python-requests (>= 2.10.0),
python-requests-mock (>= 1.0),
python-retrying (>= 1.2.3),
diff -Nru mistral-3.0.0/debian/debian_control_vars
mistral-3.0.0/debian/debian_control_vars
--- mistral-3.0.0/debian/debian_control_vars 1970-01-01 01:00:00.000000000
+0100
+++ mistral-3.0.0/debian/debian_control_vars 2017-04-03 18:07:09.000000000
+0200
@@ -0,0 +1 @@
+ostack-lsb-base= lsb-base (>= 3.0.6)
diff -Nru mistral-3.0.0/debian/mistral-common.postinst.in
mistral-3.0.0/debian/mistral-common.postinst.in
--- mistral-3.0.0/debian/mistral-common.postinst.in 2016-10-06
17:56:44.000000000 +0200
+++ mistral-3.0.0/debian/mistral-common.postinst.in 2017-04-03
18:07:09.000000000 +0200
@@ -14,6 +14,7 @@
pkgos_write_new_conf mistral mistral.conf
pkgos_write_new_conf mistral logging.conf
+ pkgos_write_new_conf mistral policy.json
pkgos_write_new_conf mistral wf_trace_logging.conf
db_get mistral/configure_db
if [ "$RET" = "true" ]; then
diff -Nru mistral-3.0.0/debian/mistral-common.postrm
mistral-3.0.0/debian/mistral-common.postrm
--- mistral-3.0.0/debian/mistral-common.postrm 2016-10-06 17:56:44.000000000
+0200
+++ mistral-3.0.0/debian/mistral-common.postrm 2017-04-03 18:07:09.000000000
+0200
@@ -24,6 +24,7 @@
rm -f /etc/mistral/mistral.conf
rm -f /etc/mistral/logging.conf
+ rm -f /etc/mistral/policy.json
rm -f /etc/mistral/wf_trace_logging.conf
rm -rf /var/log/mistral
[ -d /etc/mistral ] && rmdir --ignore-fail-on-non-empty /etc/mistral
diff -Nru mistral-3.0.0/debian/patches/allow-sqla-1.1.patch
mistral-3.0.0/debian/patches/allow-sqla-1.1.patch
--- mistral-3.0.0/debian/patches/allow-sqla-1.1.patch 1970-01-01
01:00:00.000000000 +0100
+++ mistral-3.0.0/debian/patches/allow-sqla-1.1.patch 2017-04-03
18:07:09.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Allow SQLA 1.1
+Author: Thomas Goirand <[email protected]>
+Forwarded: not-needed
+Last-Update: 2017-04-03
+
+--- mistral-3.0.0.orig/requirements.txt
++++ mistral-3.0.0/requirements.txt
+@@ -48,7 +48,7 @@ requests>=2.10.0 # Apache-2.0
+ retrying!=1.3.0,>=1.2.3 # Apache-2.0
+ setuptools!=24.0.0,>=16.0 # PSF/ZPL
+ six>=1.9.0 # MIT
+-SQLAlchemy<1.1.0,>=1.0.10 # MIT
++SQLAlchemy>=1.0.10 # MIT
+ stevedore>=1.16.0 # Apache-2.0
+ WSME>=0.8 # MIT
+ yaql>=1.1.0 # Apache 2.0 License
diff -Nru mistral-3.0.0/debian/patches/series
mistral-3.0.0/debian/patches/series
--- mistral-3.0.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ mistral-3.0.0/debian/patches/series 2017-04-03 18:07:09.000000000 +0200
@@ -0,0 +1 @@
+allow-sqla-1.1.patch
diff -Nru mistral-3.0.0/debian/po/de.po mistral-3.0.0/debian/po/de.po
--- mistral-3.0.0/debian/po/de.po 2016-10-06 17:56:44.000000000 +0200
+++ mistral-3.0.0/debian/po/de.po 2017-04-03 18:07:09.000000000 +0200
@@ -1,14 +1,14 @@
-# German debconf translation of glance.
-# This file is distributed under the same license as the glance package.
+# German debconf translation of mistral.
+# This file is distributed under the same license as the mistral package.
# Copyright (C) 2010 United States Government,2010-2011 OpenStack LLC.
-# Copyright (C) of this file 2012-2014 Chris Leick <[email protected]>.
+# Copyright (C) of this file 2012-2016 Chris Leick <[email protected]>.
#
msgid ""
msgstr ""
-"Project-Id-Version: glance 2013.2.1-1\n"
+"Project-Id-Version: mistral 3.0.0-2\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2016-04-05 11:01+0200\n"
-"PO-Revision-Date: 2014-01-09 22:51+0100\n"
+"PO-Revision-Date: 2016-10-28 20:22+0100\n"
"Last-Translator: Chris Leick <[email protected]>\n"
"Language-Team: German <[email protected]>\n"
"Language: de\n"
@@ -19,26 +19,19 @@
#. Type: boolean
#. Description
#: ../mistral-common.templates:2001
-#, fuzzy
-#| msgid "Set up a database for Glance?"
msgid "Set up a database for Mistral?"
-msgstr "Eine Datenbank für Glance einrichten?"
+msgstr "Eine Datenbank für Mistral einrichten?"
#. Type: boolean
#. Description
#: ../mistral-common.templates:2001
-#, fuzzy
-#| msgid ""
-#| "No database has been set up for glance-registry or glance-api to use. "
-#| "Before continuing, you should make sure you have the following "
-#| "information:"
msgid ""
"No database has been set up for Mistral to use. Before continuing, you "
"should make sure you have the following information:"
msgstr ""
-"Es wurde keine Datenbank für die Benutzung mit der Glance-Registry oder das "
-"Glance-API eingerichtet. Bevor Sie fortfahren, sollten Sie sicherstellen, "
-"dass Sie die folgenden Informationen haben:"
+"Es wurde keine Datenbank für die Benutzung mit Mistral eingerichtet. Bevor "
+"Sie fortfahren, sollten Sie sicherstellen, dass Sie die folgenden "
+"Informationen haben:"
#. Type: boolean
#. Description
@@ -69,16 +62,12 @@
#. Type: boolean
#. Description
#: ../mistral-common.templates:2001
-#, fuzzy
-#| msgid ""
-#| "You can change this setting later on by running \"dpkg-reconfigure -plow "
-#| "glance-common\"."
msgid ""
"You can change this setting later on by running \"dpkg-reconfigure -plow "
"mistral-common\"."
msgstr ""
"Sie können diese Einstellung später ändern, indem Sie »dpkg-reconfigure -"
-"plow glance-common« ausführen."
+"plow mistral-common« ausführen."
#. Type: string
#. Description
@@ -89,16 +78,11 @@
#. Type: string
#. Description
#: ../mistral-common.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please specify the hostname of the authentication server for Glance. "
-#| "Typically this is also the hostname of the OpenStack Identity Service "
-#| "(Keystone)."
msgid ""
"Please specify the hostname of the authentication server. Typically this is "
"also the hostname of the OpenStack Identity Service (Keystone)."
msgstr ""
-"Bitte geben Sie den Rechnernamen des Glance-Authentifizierungsservers an. "
+"Bitte geben Sie den Rechnernamen des Authentifizierungsservers an. "
"Typischerweise ist das gleichzeitig der Rechnername Ihres OpenStack-"
"Identitätsdienstes (Keystone)."
@@ -214,10 +198,8 @@
#. Type: boolean
#. Description
#: ../mistral-api.templates:2001
-#, fuzzy
-#| msgid "Register Glance in the Keystone endpoint catalog?"
msgid "Register Mistral in the Keystone endpoint catalog?"
-msgstr "Glance im Keystone-Endpunktkatalog registrieren?"
+msgstr "Mistral im Keystone-Endpunktkatalog registrieren?"
#. Type: boolean
#. Description
@@ -234,18 +216,15 @@
#. Type: boolean
#. Description
#: ../mistral-api.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Note that you will need to have an up and running Keystone server on "
-#| "which to connect using the Keystone authentication token."
msgid ""
"Note that you will need to have an up and running Keystone server on which "
"to connect using a known admin project name, admin username and password. "
"The admin auth token is not used anymore."
msgstr ""
-"Beachten Sie, dass Sie einen gestarteten und laufenden Keystone-Server haben "
-"müssen, mit dem Sie sich anhand des Keystone-Authentifizierungs-Tokens "
-"verbinden."
+"Beachten Sie, dass Sie einen konfigurierten und laufenden Keystone-Server "
+"haben müssen, mit dem Sie sich anhand eines bekannten "
+"Administratorprojektnamens, Administratorbenutzernamens und Passworts "
+"verbinden. Das Administratorauthentifizierungs-Token wird nicht mehr benutzt."
#. Type: string
#. Description
@@ -256,25 +235,19 @@
#. Type: string
#. Description
#: ../mistral-api.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Please enter the IP address of the Keystone server, so that glance-api "
-#| "can contact Keystone to do the Glance service and endpoint creation."
msgid ""
"Please enter the IP address of the Keystone server, so that mistral-api can "
"contact Keystone to do the Mistral service and endpoint creation."
msgstr ""
-"Bitte geben Sie die IP-Adresse des Keystone-Servers an, so dass Glance-API "
-"Keystone kontaktieren kann, um den Glance-Dienst und den Endpunkt zu "
+"Bitte geben Sie die IP-Adresse des Keystone-Servers an, so dass Mistral-API "
+"Keystone kontaktieren kann, um den Mistral-Dienst und den Endpunkt zu "
"erstellen."
#. Type: string
#. Description
#: ../mistral-api.templates:4001
-#, fuzzy
-#| msgid "Keystone authentication token:"
msgid "Keystone admin name:"
-msgstr "Keystone-Authentifizierungs-Token:"
+msgstr "Keystone-Administratorname:"
#. Type: string
#. Description
@@ -288,35 +261,34 @@
"To register the service endpoint, this package needs to know the Admin "
"login, name, project name, and password to the Keystone server."
msgstr ""
+"Um den Dienstendpunkt zu registrieren, muss dieses Paket den "
+"Administratoranmeldenamen, Namen, Projektnamen und das Passwort für den "
+"Keystone-Server kennen."
#. Type: string
#. Description
#: ../mistral-api.templates:5001
msgid "Keystone admin project name:"
-msgstr ""
+msgstr "Keystone-Administratorprojektname:"
#. Type: password
#. Description
#: ../mistral-api.templates:6001
msgid "Keystone admin password:"
-msgstr ""
+msgstr "Keystone-Administratorpasswort:"
#. Type: string
#. Description
#: ../mistral-api.templates:7001
-#, fuzzy
-#| msgid "Glance endpoint IP address:"
msgid "Mistral endpoint IP address:"
-msgstr "IP-Adresse des Glance-Endpunkts"
+msgstr "IP-Adresse des Mistral-Endpunkts"
#. Type: string
#. Description
#: ../mistral-api.templates:7001
-#, fuzzy
-#| msgid "Please enter the IP address that will be used to contact Glance."
msgid "Please enter the IP address that will be used to contact Mistral."
msgstr ""
-"Bitte geben Sie die IP-Adresse ein, die zum Kontaktieren von Glance benutzt "
+"Bitte geben Sie die IP-Adresse ein, die zum Kontaktieren von Mistral benutzt "
"wird."
#. Type: string
@@ -348,45 +320,3 @@
"OpenStack unterstützt die Verwendung von Verfügbarkeitszonen, bei der jede "
"Region einen Ort repräsentiert. Bitte geben Sie die Zone, die Sie benutzen "
"möchten, bei der Registrierung des Endpunkts an."
-
-#, fuzzy
-#~| msgid ""
-#~| "To configure its endpoint in Keystone, glance-api needs the Keystone "
-#~| "authentication token."
-#~ msgid ""
-#~ "To configure its endpoint in Keystone, mistral-api needs the Keystone "
-#~ "authentication token."
-#~ msgstr ""
-#~ "Glance-API benötigt das Keystone-Authentifizierungs-Token, um seinen "
-#~ "Endpunkt in Keystone zu konfigurieren."
-
-#~ msgid "keystone"
-#~ msgstr "Keystone"
-
-#~ msgid "caching"
-#~ msgstr "Zwischenspeichern"
-
-#~ msgid "keystone+caching"
-#~ msgstr "Keystone+Zwischenspeichern"
-
-#~ msgid "cachemanagement"
-#~ msgstr "Zwischenspeicherverwaltung"
-
-#~ msgid "keystone+cachemanagement"
-#~ msgstr "Keystone+Zwischenspeicherverwaltung"
-
-#~ msgid "Pipeline flavor:"
-#~ msgstr "Pipeline-Variante:"
-
-#~ msgid "Please specify the flavor of the pipeline to be used by Glance."
-#~ msgstr ""
-#~ "Bitte geben Sie die Variante der von Glance zu benutzenden Pipeline an."
-
-#~ msgid ""
-#~ "If you use the OpenStack Identity Service (Keystone), you might want to "
-#~ "select \"keystone\". If you don't use this service, you can safely choose "
-#~ "\"caching\" only."
-#~ msgstr ""
-#~ "Falls Sie den OpenStack-Identitätsdienst (Keystone) verwenden, möchten "
-#~ "Sie möglicherweise »Keystone« auswählen. Falls Sie diesen Dienst nicht "
-#~ "nutzen, können Sie problemlos »Zwischenspeichern« auswählen."
diff -Nru mistral-3.0.0/debian/rules mistral-3.0.0/debian/rules
--- mistral-3.0.0/debian/rules 2016-10-06 17:56:44.000000000 +0200
+++ mistral-3.0.0/debian/rules 2017-04-03 18:07:09.000000000 +0200
@@ -28,6 +28,7 @@
set -e ; for i in logging.conf wf_trace_logging.conf ; do \
install -D -m 0664 etc/$$i.sample
$(CURDIR)/debian/mistral-common/usr/share/mistral-common/$$i ; \
done
+ install -D -m 0664 etc/policy.json
$(CURDIR)/debian/mistral-common/usr/share/mistral-common/policy.json ; \
PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages
oslo-config-generator \
--namespace mistral.config \
--namespace oslo.db \
@@ -46,6 +47,8 @@
dh_install --fail-missing
# As usual, pbr is missing the alembic.ini
cp mistral/db/sqlalchemy/migration/alembic.ini
$(CURDIR)/debian/python-mistral/usr/lib/python2.7/dist-packages/mistral/db/sqlalchemy/migration/
+ cp mistral/actions/openstack/mapping.json
$(CURDIR)/debian/python-mistral/usr/lib/python2.7/dist-packages/mistral/actions/openstack/
+ cp -r mistral/resources
$(CURDIR)/debian/python-mistral/usr/lib/python2.7/dist-packages/mistral/
override_dh_auto_build:
dh_auto_build
--- End Message ---
