From 813fd851bbfd66670275dbffc9d911b7c00f5e55 Mon Sep 17 00:00:00 2001 From: gongnan Date: Fri, 27 Aug 2021 10:09:24 +0800 Subject: [PATCH] openeuler trove support --- docker/trove/trove-api/Dockerfile.j2 | 2 +- docker/trove/trove-base/Dockerfile.j2 | 2 +- docker/trove/trove-conductor/Dockerfile.j2 | 2 +- docker/trove/trove-guestagent/Dockerfile.j2 | 2 +- docker/trove/trove-taskmanager/Dockerfile.j2 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/trove/trove-api/Dockerfile.j2 b/docker/trove/trove-api/Dockerfile.j2 index a10ec361..4695255b 100644 --- a/docker/trove/trove-api/Dockerfile.j2 +++ b/docker/trove/trove-api/Dockerfile.j2 @@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel', 'openeuler'] %} {% set trove_api_packages = ['openstack-trove-api'] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set trove_api_packages = ['trove-api'] %} diff --git a/docker/trove/trove-base/Dockerfile.j2 b/docker/trove/trove-base/Dockerfile.j2 index 61356e7f..513c9d9f 100644 --- a/docker/trove/trove-base/Dockerfile.j2 +++ b/docker/trove/trove-base/Dockerfile.j2 @@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel', 'openeuler'] %} {% set trove_base_packages = ['openstack-trove-common'] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set trove_base_packages = ['trove-common'] %} diff --git a/docker/trove/trove-conductor/Dockerfile.j2 b/docker/trove/trove-conductor/Dockerfile.j2 index 0cc12415..ec0bd65e 100644 --- a/docker/trove/trove-conductor/Dockerfile.j2 +++ b/docker/trove/trove-conductor/Dockerfile.j2 @@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel', 'openeuler'] %} {% set trove_conductor_packages = ['openstack-trove-conductor'] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set trove_conductor_packages = ['trove-conductor'] %} diff --git a/docker/trove/trove-guestagent/Dockerfile.j2 b/docker/trove/trove-guestagent/Dockerfile.j2 index 1f59a1a4..892a465b 100644 --- a/docker/trove/trove-guestagent/Dockerfile.j2 +++ b/docker/trove/trove-guestagent/Dockerfile.j2 @@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel', 'openeuler'] %} {% set trove_guestagent_packages = ['openstack-trove-guestagent'] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set trove_guestagent_packages = ['trove-guestagent'] %} diff --git a/docker/trove/trove-taskmanager/Dockerfile.j2 b/docker/trove/trove-taskmanager/Dockerfile.j2 index 09e9eaa4..b5923fda 100644 --- a/docker/trove/trove-taskmanager/Dockerfile.j2 +++ b/docker/trove/trove-taskmanager/Dockerfile.j2 @@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel', 'openeuler'] %} {% set trove_taskmanager_packages = ['openstack-trove-taskmanager'] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set trove_taskmanager_packages = ['trove-taskmanager'] %} -- Gitee