openstack
/
project-config
Code Issues Proposed changes

Add openEuler disto support for elements 

This patch add openEuler disto support for the diskimage-builder
elements in project-config

Change-Id: I7d7804376c4579b550c865a3ad5719fea1ec703b
This commit is contained in:
wangxiyuan 2021-12-15 10:32:30 +08:00
parent 1a1bcee6cc
commit c28cce5d75
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nodepool/elements/infra-package-needs/pkg-map
View File

@ -31,6 +31,18 @@
"redhat-rpm-config": "redhat-rpm-config",
"redhat-lsb-core": "redhat-lsb-core"
},
"openeuler": {
"cron": "cronie",
"build-essential": "glibc-devel gcc make",
"dnsutils": "bind-utils",
"iproute2": "iproute",
"iputils-ping": "iputils",
"ntp": "ntp ntp-perl",
"python-dev": "python-devel",
"python3-dev": "python3-devel",
"iptables": "iptables-services",
"haveged": "haveged"
},
"gentoo": {
"build-essential": "",
"cron": "sys-process/cronie",

6
nodepool/elements/nodepool-base/finalise.d/89-boot-settings
View File

@ -68,7 +68,7 @@ mv /tmp/forwarding.conf /etc/unbound/
chown root:root /etc/unbound/forwarding.conf
chmod a+r /etc/unbound/forwarding.conf
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora) ]] ; then
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler) ]] ; then
LOG_FILE="/var/lib/unbound/unbound.log"
else
LOG_FILE="/var/log/unbound.log"
@ -82,7 +82,7 @@ server:
verbosity: 5"
echo "$UNBOUND_LOGGING_CONF" > /tmp/unbound-logging.conf
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|opensuse) ]] ; then
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|opensuse|openeuler) ]] ; then
UNBOUND_CONFD=/etc/unbound/conf.d
elif [[ "$DISTRO_NAME" =~ 'gentoo' ]] ; then
UNBOUND_CONFD=/etc/unbound/conf.d
@ -185,7 +185,7 @@ sed -i -e 's/dlv-anchor-file:/#dlv-anchor-file:/g' /etc/unbound/unbound.conf
# Tripleo uses dhcp
dhcp_file=''
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora) ]] ; then
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler) ]] ; then
dhcp_file=/etc/dhcp/dhclient-eth0.conf
elif [[ "$DISTRO_NAME" =~ (debian|ubuntu|gentoo) ]] ; then
dhcp_file=/etc/dhcp/dhclient.conf

2
nodepool/elements/nodepool-base/install.d/20-iptables
View File

@ -24,7 +24,7 @@ if [[ "$DISTRO_NAME" =~ (debian|ubuntu) ]] ; then
rules_dir=/etc/iptables
ipv4_rules=${rules_dir}/rules.v4
ipv6_rules=${rules_dir}/rules.v6
elif [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora) ]] ; then
elif [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler) ]] ; then
rules_dir=/etc/sysconfig
ipv4_rules=${rules_dir}/iptables
ipv6_rules=${rules_dir}/ip6tables

4
nodepool/elements/nodepool-base/post-install.d/20-iptables
View File

@ -22,7 +22,7 @@ set -e
if [[ "$DISTRO_NAME" =~ (debian|ubuntu) ]] ; then
service_name=netfilter-persistent
elif [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora) ]] ; then
elif [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler) ]] ; then
service_name=iptables
elif [[ "$DISTRO_NAME" == 'opensuse' ]] ; then
# handle iptables through init.d instead of a service
@ -48,7 +48,7 @@ case "$DIB_INIT_SYSTEM" in
else
systemctl enable ${service_name}.service
fi
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora) ]] ; then
if [[ "$DISTRO_NAME" =~ (centos|rhel7|fedora|openeuler) ]] ; then
systemctl enable ip6tables.service
fi
;;