You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
cloud-init/SOURCES/cloud-init-22.1-add_msvsphe...

152 lines
5.7 KiB

diff --git a/cloudinit/config/cc_ntp.py b/cloudinit/config/cc_ntp.py
index 25bba76..aaf1228 100644
--- a/cloudinit/config/cc_ntp.py
+++ b/cloudinit/config/cc_ntp.py
@@ -33,6 +33,7 @@ distros = [
"eurolinux",
"fedora",
"miraclelinux",
+ "msvsphere",
"openEuler",
"opensuse",
"photon",
diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py
index 7a23268..58e938e 100644
--- a/cloudinit/config/cc_yum_add_repo.py
+++ b/cloudinit/config/cc_yum_add_repo.py
@@ -19,7 +19,7 @@ entry, the config entry will be skipped.
**Module frequency:** always
**Supported distros:** almalinux, centos, cloudlinux, eurolinux, fedora,
- miraclelinux, openEuler, photon, rhel, rocky, virtuozzo
+ miraclelinux, msvsphere, openEuler, photon, rhel, rocky, virtuozzo
**Config keys**::
@@ -43,6 +43,7 @@ distros = [
"cloudlinux",
"eurolinux",
"fedora",
+ "msvsphere",
"openEuler",
"photon",
"rhel",
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index 76acd6a..798e428 100755
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -46,6 +46,7 @@ OSFAMILIES = {
"eurolinux",
"fedora",
"miraclelinux",
+ "msvsphere",
"openEuler",
"photon",
"rhel",
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
index b50035b..b1e0045 100644
--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
@@ -28,6 +28,7 @@ KNOWN_DISTROS = [
"eurolinux",
"fedora",
"miraclelinux",
+ "msvsphere",
"openEuler",
"rhel",
"rocky",
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 4cb2155..36d901f 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -585,6 +585,7 @@ def _get_variant(info):
"eurolinux",
"fedora",
"miraclelinux",
+ "msvsphere",
"openeuler",
"photon",
"rhel",
diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
index 80ab4f9..26b5ce1 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", "msvsphere", "openEuler", "rhel", "rocky", "virtuozzo"] %}
{% if variant == "rhel" %}
mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service,_netdev', '0', '2']
{% else %}
@@ -194,7 +194,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", "msvsphere", "openbsd", "openEuler",
"photon", "rhel", "rocky", "suse", "ubuntu", "virtuozzo"] %}
distro: {{ variant }}
{% elif variant in ["dragonfly"] %}
@@ -249,7 +249,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", "msvsphere", "openEuler", "rhel", "rocky", "suse", "virtuozzo"] %}
# Default user name + that default users groups (if added/used)
default_user:
{% if variant == "amazon" %}
diff --git a/doc/rtd/topics/availability.rst b/doc/rtd/topics/availability.rst
index d8ca9d1..8a5e604 100644
--- a/doc/rtd/topics/availability.rst
+++ b/doc/rtd/topics/availability.rst
@@ -27,7 +27,7 @@ OpenBSD and DragonFlyBSD:
- NetBSD
- OpenBSD
- Photon OS
-- RHEL/CentOS/AlmaLinux/Rocky Linux/EuroLinux
+- RHEL/CentOS/AlmaLinux/Rocky Linux/EuroLinux/MSVSphere
- SLES/openSUSE
- Ubuntu
diff --git a/systemd/cloud-init-generator.tmpl b/systemd/cloud-init-generator.tmpl
index 74d4742..0d39ed0 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", "msvsphere", "openEuler", "rhel", "rocky", "virtuozzo"] %}
local dsidentify="/usr/libexec/cloud-init/ds-identify"
{% else %}
local dsidentify="/usr/lib/cloud-init/ds-identify"
diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
index fc984d5..4a453eb 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", "msvsphere", "openEuler", "rhel", "rocky", "virtuozzo"] %}
After=network.service
After=NetworkManager.service
After=NetworkManager-wait-online.service
diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg
index afe999e..c727370 100755
--- a/tools/render-cloudcfg
+++ b/tools/render-cloudcfg
@@ -22,6 +22,7 @@ def main():
"freebsd",
"gentoo",
"miraclelinux",
+ "msvsphere",
"netbsd",
"openbsd",
"openEuler",