aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/mistral/mistral-api/Dockerfile.j22
-rw-r--r--docker/mistral/mistral-base/Dockerfile.j210
-rw-r--r--docker/mistral/mistral-engine/Dockerfile.j22
-rw-r--r--docker/mistral/mistral-executor/Dockerfile.j22
-rw-r--r--docker/zaqar/Dockerfile.j210
5 files changed, 13 insertions, 13 deletions
diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2
index 0b0335fbf..579f005dc 100644
--- a/docker/mistral/mistral-api/Dockerfile.j2
+++ b/docker/mistral/mistral-api/Dockerfile.j2
@@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
- {% set mistral_api_packages = ['openstack-mistral-api'] %}
+ {% set mistral_api_packages = ['openstack-mistral-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% set mistral_api_packages = ['mistral-api'] %}
{% endif %}
diff --git a/docker/mistral/mistral-base/Dockerfile.j2 b/docker/mistral/mistral-base/Dockerfile.j2
index 92aa1cad8..1b1983cd6 100644
--- a/docker/mistral/mistral-base/Dockerfile.j2
+++ b/docker/mistral/mistral-base/Dockerfile.j2
@@ -7,11 +7,11 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
- {% set mistral_base_packages = ['openstack-mistral-common'] %}
-{% elif base_distro in ['ubuntu'] %}
- {% set mistral_base_packages = ['mistral-common'] %}
-{% endif %}
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% set mistral_base_packages = ['openstack-mistral-common'] %}
+ {% elif base_distro in ['ubuntu'] %}
+ {% set mistral_base_packages = ['mistral-common'] %}
+ {% endif %}
{{ macros.install_packages(mistral_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
diff --git a/docker/mistral/mistral-engine/Dockerfile.j2 b/docker/mistral/mistral-engine/Dockerfile.j2
index 2fe8dcd49..458ff881e 100644
--- a/docker/mistral/mistral-engine/Dockerfile.j2
+++ b/docker/mistral/mistral-engine/Dockerfile.j2
@@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
- {% set mistral_engine_packages = ['openstack-mistral-engine'] %}
+ {% set mistral_engine_packages = ['openstack-mistral-engine'] %}
{% elif base_distro in ['ubuntu'] %}
{% set mistral_engine_packages = ['mistral-engine'] %}
{% endif %}
diff --git a/docker/mistral/mistral-executor/Dockerfile.j2 b/docker/mistral/mistral-executor/Dockerfile.j2
index ed4977bae..382d0e33c 100644
--- a/docker/mistral/mistral-executor/Dockerfile.j2
+++ b/docker/mistral/mistral-executor/Dockerfile.j2
@@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
- {% set mistral_executor_packages = ['openstack-mistral-executor'] %}
+ {% set mistral_executor_packages = ['openstack-mistral-executor'] %}
{% elif base_distro in ['ubuntu'] %}
{% set mistral_executor_packages = ['mistral-executor'] %}
{% endif %}
diff --git a/docker/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2
index ebc1a70e8..d6190a5b3 100644
--- a/docker/zaqar/Dockerfile.j2
+++ b/docker/zaqar/Dockerfile.j2
@@ -7,14 +7,14 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
- {% set zaqar_packages = ['openstack-zaqar'] %}
-{% elif base_distro in ['ubuntu'] %}
- {% set zaqar_packages = [
+ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% set zaqar_packages = ['openstack-zaqar'] %}
+ {% elif base_distro in ['ubuntu'] %}
+ {% set zaqar_packages = [
'zaqar-common',
'zaqar-server'
] %}
-{% endif %}
+ {% endif %}
{{ macros.install_packages(zaqar_packages | customizable("packages")) }}
{% elif install_type == 'source' %}