From f16f0e3a184fffd17f15209848ca41ead9e5f22f Mon Sep 17 00:00:00 2001
From: gongnan <gongnan1993@163.com>
Date: Thu, 19 Aug 2021 10:53:56 +0800
Subject: [PATCH] openeuler ironic support

---
 docker/ironic-inspector/Dockerfile.j2        |  2 +-
 docker/ironic/ironic-api/Dockerfile.j2       |  4 ++--
 docker/ironic/ironic-base/Dockerfile.j2      |  2 +-
 docker/ironic/ironic-conductor/Dockerfile.j2 | 24 +++++++++++++++++++
 docker/ironic/ironic-pxe/Dockerfile.j2       | 25 +++++++++++++-------
 5 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/docker/ironic-inspector/Dockerfile.j2 b/docker/ironic-inspector/Dockerfile.j2
index 884b4dd0..cbbd1d9e 100644
--- a/docker/ironic-inspector/Dockerfile.j2
+++ b/docker/ironic-inspector/Dockerfile.j2
@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='ironic-inspector') }}
 
 {% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel', 'openeuler'] %}
         {% set ironic_inspector_packages = ['openstack-ironic-inspector'] %}
     {% elif base_distro in ['debian', 'ubuntu'] %}
         {% set ironic_inspector_packages = [
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
index 3aa5a0a4..fe1bf980 100644
--- a/docker/ironic/ironic-api/Dockerfile.j2
+++ b/docker/ironic/ironic-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 ironic_api_packages = [
             'httpd',
             'mod_ssl',
@@ -39,7 +39,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.install_packages(ironic_api_packages | customizable("packages")) }}
 
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+{% if base_distro in ['centos', 'oraclelinux', 'rhel', 'openeuler'] %}
 RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
     && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
 
diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2
index dfd9317c..5d322446 100644
--- a/docker/ironic/ironic-base/Dockerfile.j2
+++ b/docker/ironic/ironic-base/Dockerfile.j2
@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='ironic') }}
 
 {% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel', 'openeuler'] %}
         {% set ironic_base_packages = ['openstack-ironic-common'] %}
     {% elif base_distro in ['debian', 'ubuntu'] %}
         {% set ironic_base_packages = ['ironic-common'] %}
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index 43457c75..744faf19 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -31,6 +31,30 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'util-linux',
             'xfsprogs',
         ] %}
+    
+    {% elif base_distro == 'openeuler' %}
+        {% set ironic_conductor_packages = [
+            'ansible',
+            'dosfstools',
+            'e2fsprogs',
+            'gdisk',
+            'ipmitool',
+            'openssh-clients',
+            'openstack-ironic-conductor',
+            'parted',
+            'psmisc',
+            'python2-pysnmp',
+            'python2-dracclient',
+            'python2-ironic-inspector-client',
+            'python2-proliantutils',
+            'python2-scciclient',
+            'python2-sushy',
+            'systemd-python',
+            'util-linux',
+            'xfsprogs',
+            'qemu'
+        ] %}
+    
     {% elif base_distro in ['debian', 'ubuntu'] %}
         # TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk,
         # ImcSdk package, python-sushy
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2
index 28dcb536..a0beee37 100644
--- a/docker/ironic/ironic-pxe/Dockerfile.j2
+++ b/docker/ironic/ironic-pxe/Dockerfile.j2
@@ -5,14 +5,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
-    {% set ironic_pxe_packages = [
-        'httpd',
-        'ipxe-bootimgs',
-        'mod_ssl',
-        'mod_wsgi',
-        'tftp-server'
-    ] %}
+{% if base_distro in ['centos', 'oraclelinux', 'rhel', 'openeuler'] %}
+    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+        {% set ironic_pxe_packages = [
+            'httpd',
+            'ipxe-bootimgs',
+            'mod_ssl',
+            'mod_wsgi',
+            'tftp-server'
+        ] %}
+    {% elif base_distro in ['openeuler'] %}
+        {% set ironic_pxe_packages = [
+            'httpd',
+            'mod_ssl',
+            'mod_wsgi',
+            'tftp-server'
+        ] %}
+    {% endif %}
 
     {% if base_arch == 'x86_64' %}
         {% set ironic_pxe_packages = ironic_pxe_packages + [
-- 
Gitee