From ad06096448a585a16ad73b610b0adc81b597ccec Mon Sep 17 00:00:00 2001
From: "Q.hongtao" <qihongtao@inspur.com>
Date: Tue, 7 Apr 2020 09:30:42 +0800
Subject: [PATCH] Add vitrage-persistor image

Kolla was missing vitrage-persistor image required by Vitrage
for data storage.

Change-Id: Id5e143636f9a81e7294b775f3d8b9134bee58054
Closes-Bug: #1869319
---
 .../vitrage/vitrage-persistor/Dockerfile.j2   | 42 +++++++++++++++++++
 .../notes/bug-1869319-aa032c1330b540dc.yaml   |  6 +++
 2 files changed, 48 insertions(+)
 create mode 100644 docker/vitrage/vitrage-persistor/Dockerfile.j2
 create mode 100644 releasenotes/notes/bug-1869319-aa032c1330b540dc.yaml

diff --git a/docker/vitrage/vitrage-persistor/Dockerfile.j2 b/docker/vitrage/vitrage-persistor/Dockerfile.j2
new file mode 100644
index 0000000000..f07d930f33
--- /dev/null
+++ b/docker/vitrage/vitrage-persistor/Dockerfile.j2
@@ -0,0 +1,42 @@
+FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+{% endblock %}
+
+{% block vitrage_persistor_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% if install_type == 'binary' %}
+
+    {% if base_package_type == 'rpm' %}
+
+        {% set vitrage_persistor_packages = [
+            'openstack-vitrage-persistor'
+        ] %}
+
+{{ macros.install_packages(vitrage_persistor_packages | customizable("packages")) }}
+
+    {% elif base_package_type == 'deb' %}
+    {% if base_distro == 'debian' %}
+
+        {% set vitrage_persistor_packages = [
+            'vitrage-persistor'
+        ] %}
+
+{{ macros.install_packages(vitrage_persistor_packages | customizable("packages")) }}
+
+    {% else %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+    {% endif %}
+    {% endif %}
+
+{% endif %}
+
+{% block vitrage_persistor_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER vitrage
diff --git a/releasenotes/notes/bug-1869319-aa032c1330b540dc.yaml b/releasenotes/notes/bug-1869319-aa032c1330b540dc.yaml
new file mode 100644
index 0000000000..1e6cd825f1
--- /dev/null
+++ b/releasenotes/notes/bug-1869319-aa032c1330b540dc.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Adds missing ``vitrage-persistor`` image, required by Vitrage
+    deployments for storing data.
+    `LP#1869319 <https://launchpad.net/bugs/1869319>`__