From 098429a75ea00df1d8a5670e45df6babfc37f327 Mon Sep 17 00:00:00 2001 From: chengquan Date: Thu, 8 Aug 2019 16:11:58 +0800 Subject: [PATCH] cloud-init: cloud-init add openEuler os reason: add openEuler into distros Signed-off-by: chengquan --- cloudinit/config/cc_ntp.py | 2 +- cloudinit/config/cc_resolv_conf.py | 2 +- cloudinit/config/cc_rh_subscription.py | 2 +- cloudinit/config/cc_spacewalk.py | 2 +- cloudinit/config/cc_yum_add_repo.py | 2 +- cloudinit/distros/__init__.py | 2 +- cloudinit/distros/openeuler.py | 12 ++++++++++++ config/cloud.cfg.tmpl | 8 ++++---- systemd/cloud-init-generator.tmpl | 2 +- systemd/cloud-init.service.tmpl | 2 +- tools/render-cloudcfg | 2 +- tests/unittests/test_cli.py | 2 +- 12 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 cloudinit/distros/openeuler.py diff --git a/cloudinit/config/cc_ntp.py b/cloudinit/config/cc_ntp.py index 25bba76..8f576f3 100644 --- a/cloudinit/config/cc_ntp.py +++ b/cloudinit/config/cc_ntp.py @@ -33,7 +33,7 @@ distros = [ "eurolinux", "fedora", "miraclelinux", - "openEuler", + "openeuler", "opensuse", "photon", "rhel", diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py index b2970d5..d24cd3a 100644 --- a/cloudinit/config/cc_resolv_conf.py +++ b/cloudinit/config/cc_resolv_conf.py @@ -54,7 +54,7 @@ LOG = logging.getLogger(__name__) frequency = PER_INSTANCE -distros = ["alpine", "fedora", "opensuse", "photon", "rhel", "sles"] +distros = ["alpine", "fedora", "opensuse", "photon", "rhel", "sles", 'openeuler'] RESOLVE_CONFIG_TEMPLATE_MAP = { "/etc/resolv.conf": "resolv.conf", diff --git a/cloudinit/config/cc_rh_subscription.py b/cloudinit/config/cc_rh_subscription.py index b81a7a9..74392ca 100644 --- a/cloudinit/config/cc_rh_subscription.py +++ b/cloudinit/config/cc_rh_subscription.py @@ -43,7 +43,7 @@ from cloudinit import subp, util LOG = logging.getLogger(__name__) -distros = ["fedora", "rhel"] +distros = ["fedora", "rhel", "openeuler"] def handle(name, cfg, _cloud, log, _args): diff --git a/cloudinit/config/cc_spacewalk.py b/cloudinit/config/cc_spacewalk.py index 3fa6c38..4374599 100644 --- a/cloudinit/config/cc_spacewalk.py +++ b/cloudinit/config/cc_spacewalk.py @@ -29,7 +29,7 @@ For more information about spacewalk see: https://fedorahosted.org/spacewalk/ from cloudinit import subp -distros = ["redhat", "fedora"] +distros = ["redhat", "fedora", "openeuler"] required_packages = ["rhn-setup"] def_ca_cert_path = "/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT" diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py index 7a23268..971e97c 100644 --- a/cloudinit/config/cc_yum_add_repo.py +++ b/cloudinit/config/cc_yum_add_repo.py @@ -43,7 +43,7 @@ distros = [ "cloudlinux", "eurolinux", "fedora", - "openEuler", + "openeuler", "photon", "rhel", "rocky", diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py index 76acd6a..b75bb9c 100755 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py @@ -46,7 +46,7 @@ OSFAMILIES = { "eurolinux", "fedora", "miraclelinux", - "openEuler", + "openeuler", "photon", "rhel", "rocky", diff --git a/cloudinit/distros/openeuler.py b/cloudinit/distros/openeuler.py new file mode 100644 index 0000000..7505ca4 --- /dev/null +++ b/cloudinit/distros/openeuler.py @@ -0,0 +1,12 @@ +# Copyright (c) Huawei Technologies Co., Ltd. 2019-2019. All rights reserved. +# This file is part of cloud-init. See LICENSE file for license information. + +from cloudinit.distros import rhel +from cloudinit import log as logging + +LOG = logging.getLogger(__name__) + +class Distro(rhel.Distro): + pass + +# vi: ts=4 expandtab diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl index fb4b456..6702801 100644 --- a/config/cloud.cfg.tmpl +++ b/config/cloud.cfg.tmpl @@ -33,7 +33,7 @@ disable_root: true {% endif %} {% if variant in ["almalinux", "alpine", "amazon", "centos", "cloudlinux", "eurolinux", - "fedora", "miraclelinux", "openEuler", "rhel", "rocky", "virtuozzo"] %} + "fedora", "miraclelinux", "openeuler", "rhel", "rocky", "virtuozzo"] %} mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2'] {% if variant == "amazon" %} resize_rootfs: noblock @@ -111,7 +111,7 @@ cloud_config_modules: - locale {% endif %} - set-passwords -{% if variant in ["rhel", "fedora", "photon"] %} +{% if variant in ["rhel", "fedora", "photon", "openeuler"] %} {% if variant not in ["photon"] %} - spacewalk {% endif %} @@ -177,7 +177,7 @@ cloud_final_modules: system_info: # This will affect which distro class gets used {% if variant in ["almalinux", "alpine", "amazon", "arch", "centos", "cloudlinux", "debian", - "eurolinux", "fedora", "freebsd", "gentoo", "netbsd", "miraclelinux", "openbsd", "openEuler", + "eurolinux", "fedora", "freebsd", "gentoo", "netbsd", "miraclelinux", "openbsd", "openeuler", "photon", "rhel", "rocky", "suse", "ubuntu", "virtuozzo"] %} distro: {{ variant }} {% elif variant in ["dragonfly"] %} @@ -232,7 +232,7 @@ system_info: security: http://ports.ubuntu.com/ubuntu-ports ssh_svcname: ssh {% elif variant in ["almalinux", "alpine", "amazon", "arch", "centos", "cloudlinux", "eurolinux", - "fedora", "gentoo", "miraclelinux", "openEuler", "rhel", "rocky", "suse", "virtuozzo"] %} + "fedora", "gentoo", "miraclelinux", "openeuler", "rhel", "rocky", "suse", "virtuozzo"] %} # Default user name + that default users groups (if added/used) default_user: {% if variant == "amazon" %} diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl index e71e567..ce4f183 100644 --- a/systemd/cloud-init.service.tmpl +++ b/systemd/cloud-init.service.tmpl @@ -13,7 +13,7 @@ After=systemd-networkd-wait-online.service After=networking.service {% endif %} {% if variant in ["almalinux", "centos", "cloudlinux", "eurolinux", "fedora", - "miraclelinux", "openEuler", "rhel", "rocky", "virtuozzo"] %} + "miraclelinux", "openeuler", "rhel", "rocky", "virtuozzo"] %} After=network.service After=NetworkManager.service {% endif %} diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg index 176df36..6e79e95 100755 --- a/tools/render-cloudcfg +++ b/tools/render-cloudcfg @@ -24,7 +24,7 @@ def main(): "miraclelinux", "netbsd", "openbsd", - "openEuler", + "openeuler", "photon", "rhel", "suse", diff --git a/tests/unittests/test_cli.py b/tests/unittests/test_cli.py index bed73a9..01945cc 100644 --- a/tests/unittests/test_cli.py +++ b/tests/unittests/test_cli.py @@ -257,7 +257,7 @@ class TestCLI(test_helpers.FilesystemMockingTestCase): "**Supported distros:** all", "**Supported distros:** almalinux, alpine, centos, " "cloudlinux, debian, eurolinux, fedora, miraclelinux, " - "openEuler, opensuse, photon, rhel, rocky, sles, ubuntu, " + "openeuler, opensuse, photon, rhel, rocky, sles, ubuntu, " "virtuozzo", "**Config schema**:\n **resize_rootfs:** " "(true/false/noblock)", diff --git a/systemd/cloud-init-generator.tmpl b/systemd/cloud-init-generator.tmpl index 74d4742..a7cf381 100644 --- a/systemd/cloud-init-generator.tmpl +++ b/systemd/cloud-init-generator.tmpl @@ -84,7 +84,7 @@ default() { check_for_datasource() { local ds_rc="" {% if variant in ["almalinux", "centos", "cloudlinux", "eurolinux", "fedora", - "miraclelinux", "openEuler", "rhel", "rocky", "virtuozzo"] %} + "miraclelinux", "openeuler", "rhel", "rocky", "virtuozzo"] %} local dsidentify="/usr/libexec/cloud-init/ds-identify" {% else %} local dsidentify="/usr/lib/cloud-init/ds-identify" -- 1.8.3.1