587 lines
20 KiB
Diff
587 lines
20 KiB
Diff
From 5e1e568d7085fd4443b4e3ccc492f5e31747e270 Mon Sep 17 00:00:00 2001
|
|
From: Amy Chen <xiachen@redhat.com>
|
|
Date: Wed, 20 Apr 2022 10:59:48 +0800
|
|
Subject: Add initial redhat setup
|
|
|
|
Merged patches (22.1)
|
|
- d18029bf Add netifaces package as a Requires in cloud-init.spec.template
|
|
- 31adf961 Add gdisk and openssl as deps to fix UEFI / Azure initialization
|
|
- f4a2905d Add dhcp-client as a dependency
|
|
- 290e14cc cloud-init.spec.template: update %systemd_postun parameter
|
|
- 9be4ae9b (tag: cloud-init-21.1-1.el8) Update to cloud-init-21.1-1.el8
|
|
|
|
Conflicts:
|
|
cloudinit/config/cc_chef.py Using double quotes instead of single quotes
|
|
|
|
cloudinit/settings.py
|
|
- Using rhel settings
|
|
- Using double quotes instead of single quotes
|
|
|
|
setup.py
|
|
- Following the changes of 21.1 rebase
|
|
- Using double quotes instead of single quotes
|
|
|
|
redhat/cloud-init.spec.template
|
|
- Add the drop-in to the right cloud-init.spec used by our package builder, which is downstream-only part of the bz 2002492 fix.
|
|
|
|
redhat/Makefile.common
|
|
- Backport the build handling fixes from patch "Update to cloud-init-21.1-1.el8"
|
|
|
|
Signed-off-by: Amy Chen <xiachen@redhat.com>
|
|
|
|
Merged patches (21.1):
|
|
- 915d30ad Change gating file to correct rhel version
|
|
- 311f318d Removing net-tools dependency
|
|
- 74731806 Adding man pages to Red Hat spec file
|
|
- 758d333d Removing blocking test from yaml configuration file
|
|
- c7e7c59c Changing permission of cloud-init-generator to 755
|
|
- 8b85abbb Installing man pages in the correct place with correct permissions
|
|
- c6808d8d Fix unit failure of cloud-final.service if NetworkManager was not present.
|
|
- 11866ef6 Report full specific version with "cloud-init --version"
|
|
|
|
Rebase notes (18.5):
|
|
- added bash_completition file
|
|
- added cloud-id file
|
|
|
|
Merged patches (20.3):
|
|
- 01900d0 changing ds-identify patch from /usr/lib to /usr/libexec
|
|
- 7f47ca3 Render the generator from template instead of cp
|
|
|
|
Merged patches (19.4):
|
|
- 4ab5a61 Fix for network configuration not persisting after reboot
|
|
- 84cf125 Removing cloud-user from wheel
|
|
- 31290ab Adding gating tests for Azure, ESXi and AWS
|
|
|
|
Merged patches (18.5):
|
|
- 2d6b469 add power-state-change module to cloud_final_modules
|
|
- 764159f Adding systemd mount options to wait for cloud-init
|
|
- da4d99e Adding disk_setup to rhel/cloud.cfg
|
|
- f5c6832 Enable cloud-init by default on vmware
|
|
|
|
Conflicts:
|
|
cloudinit/config/cc_chef.py:
|
|
- Updated header documentation text
|
|
- Replacing double quotes by simple quotes
|
|
|
|
setup.py:
|
|
- Adding missing cmdclass info
|
|
|
|
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
---
|
|
.gitignore | 1 +
|
|
cloudinit/config/cc_chef.py | 65 ++-
|
|
cloudinit/settings.py | 7 +-
|
|
redhat/.gitignore | 1 +
|
|
redhat/Makefile | 71 +++
|
|
redhat/Makefile.common | 37 ++
|
|
redhat/cloud-init-tmpfiles.conf | 1 +
|
|
redhat/cloud-init.spec.template | 696 ++++++++++++++++++++++++++
|
|
redhat/gating.yaml | 8 +
|
|
redhat/rpmbuild/BUILD/.gitignore | 3 +
|
|
redhat/rpmbuild/RPMS/.gitignore | 3 +
|
|
redhat/rpmbuild/SOURCES/.gitignore | 3 +
|
|
redhat/rpmbuild/SPECS/.gitignore | 3 +
|
|
redhat/rpmbuild/SRPMS/.gitignore | 3 +
|
|
redhat/scripts/frh.py | 25 +
|
|
redhat/scripts/git-backport-diff | 327 ++++++++++++
|
|
redhat/scripts/git-compile-check | 215 ++++++++
|
|
redhat/scripts/process-patches.sh | 92 ++++
|
|
redhat/scripts/tarball_checksum.sh | 3 +
|
|
rhel/README.rhel | 5 +
|
|
rhel/cloud-init-tmpfiles.conf | 1 +
|
|
rhel/cloud.cfg | 69 +++
|
|
rhel/systemd/cloud-config.service | 18 +
|
|
rhel/systemd/cloud-config.target | 11 +
|
|
rhel/systemd/cloud-final.service | 24 +
|
|
rhel/systemd/cloud-init-local.service | 31 ++
|
|
rhel/systemd/cloud-init.service | 25 +
|
|
rhel/systemd/cloud-init.target | 7 +
|
|
setup.py | 28 +-
|
|
tools/read-version | 28 +-
|
|
30 files changed, 1756 insertions(+), 55 deletions(-)
|
|
create mode 100644 redhat/.gitignore
|
|
create mode 100644 redhat/Makefile
|
|
create mode 100644 redhat/Makefile.common
|
|
create mode 100644 redhat/cloud-init-tmpfiles.conf
|
|
create mode 100644 redhat/cloud-init.spec.template
|
|
create mode 100644 redhat/gating.yaml
|
|
create mode 100644 redhat/rpmbuild/BUILD/.gitignore
|
|
create mode 100644 redhat/rpmbuild/RPMS/.gitignore
|
|
create mode 100644 redhat/rpmbuild/SOURCES/.gitignore
|
|
create mode 100644 redhat/rpmbuild/SPECS/.gitignore
|
|
create mode 100644 redhat/rpmbuild/SRPMS/.gitignore
|
|
create mode 100755 redhat/scripts/frh.py
|
|
create mode 100755 redhat/scripts/git-backport-diff
|
|
create mode 100755 redhat/scripts/git-compile-check
|
|
create mode 100755 redhat/scripts/process-patches.sh
|
|
create mode 100755 redhat/scripts/tarball_checksum.sh
|
|
create mode 100644 rhel/README.rhel
|
|
create mode 100644 rhel/cloud-init-tmpfiles.conf
|
|
create mode 100644 rhel/cloud.cfg
|
|
create mode 100644 rhel/systemd/cloud-config.service
|
|
create mode 100644 rhel/systemd/cloud-config.target
|
|
create mode 100644 rhel/systemd/cloud-final.service
|
|
create mode 100644 rhel/systemd/cloud-init-local.service
|
|
create mode 100644 rhel/systemd/cloud-init.service
|
|
create mode 100644 rhel/systemd/cloud-init.target
|
|
|
|
diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
|
|
index fdb3a6e3..d028c548 100644
|
|
--- a/cloudinit/config/cc_chef.py
|
|
+++ b/cloudinit/config/cc_chef.py
|
|
@@ -6,7 +6,70 @@
|
|
#
|
|
# This file is part of cloud-init. See LICENSE file for license information.
|
|
|
|
-"""Chef: module that configures, starts and installs chef."""
|
|
+"""
|
|
+Chef
|
|
+----
|
|
+**Summary:** module that configures, starts and installs chef.
|
|
+
|
|
+This module enables chef to be installed (from packages or
|
|
+from gems, or from omnibus). Before this occurs chef configurations are
|
|
+written to disk (validation.pem, client.pem, firstboot.json, client.rb),
|
|
+and needed chef folders/directories are created (/etc/chef and /var/log/chef
|
|
+and so-on). Then once installing proceeds correctly if configured chef will
|
|
+be started (in daemon mode or in non-daemon mode) and then once that has
|
|
+finished (if ran in non-daemon mode this will be when chef finishes
|
|
+converging, if ran in daemon mode then no further actions are possible since
|
|
+chef will have forked into its own process) then a post run function can
|
|
+run that can do finishing activities (such as removing the validation pem
|
|
+file).
|
|
+
|
|
+**Internal name:** ``cc_chef``
|
|
+
|
|
+**Module frequency:** per always
|
|
+
|
|
+**Supported distros:** all
|
|
+
|
|
+**Config keys**::
|
|
+
|
|
+ chef:
|
|
+ directories: (defaulting to /etc/chef, /var/log/chef, /var/lib/chef,
|
|
+ /var/cache/chef, /var/backups/chef, /run/chef)
|
|
+ validation_cert: (optional string to be written to file validation_key)
|
|
+ special value 'system' means set use existing file
|
|
+ validation_key: (optional the path for validation_cert. default
|
|
+ /etc/chef/validation.pem)
|
|
+ firstboot_path: (path to write run_list and initial_attributes keys that
|
|
+ should also be present in this configuration, defaults
|
|
+ to /etc/chef/firstboot.json)
|
|
+ exec: boolean to run or not run chef (defaults to false, unless
|
|
+ a gem installed is requested
|
|
+ where this will then default
|
|
+ to true)
|
|
+
|
|
+ chef.rb template keys (if falsey, then will be skipped and not
|
|
+ written to /etc/chef/client.rb)
|
|
+
|
|
+ chef:
|
|
+ client_key:
|
|
+ encrypted_data_bag_secret:
|
|
+ environment:
|
|
+ file_backup_path:
|
|
+ file_cache_path:
|
|
+ json_attribs:
|
|
+ log_level:
|
|
+ log_location:
|
|
+ node_name:
|
|
+ omnibus_url:
|
|
+ omnibus_url_retries:
|
|
+ omnibus_version:
|
|
+ pid_file:
|
|
+ server_url:
|
|
+ show_time:
|
|
+ ssl_verify_mode:
|
|
+ validation_cert:
|
|
+ validation_key:
|
|
+ validation_name:
|
|
+"""
|
|
|
|
import itertools
|
|
import json
|
|
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
|
|
index ecc1403b..39650a5b 100644
|
|
--- a/cloudinit/settings.py
|
|
+++ b/cloudinit/settings.py
|
|
@@ -50,13 +50,16 @@ CFG_BUILTIN = {
|
|
],
|
|
"def_log_file": "/var/log/cloud-init.log",
|
|
"log_cfgs": [],
|
|
- "syslog_fix_perms": ["syslog:adm", "root:adm", "root:wheel", "root:root"],
|
|
+ "mount_default_fields": [None, None, "auto", "defaults,nofail", "0", "2"],
|
|
+ "ssh_deletekeys": False,
|
|
+ "ssh_genkeytypes": [],
|
|
+ "syslog_fix_perms": [],
|
|
"system_info": {
|
|
"paths": {
|
|
"cloud_dir": "/var/lib/cloud",
|
|
"templates_dir": "/etc/cloud/templates/",
|
|
},
|
|
- "distro": "ubuntu",
|
|
+ "distro": "rhel",
|
|
"network": {"renderers": None},
|
|
},
|
|
"vendor_data": {"enabled": True, "prefix": []},
|
|
diff --git a/rhel/README.rhel b/rhel/README.rhel
|
|
new file mode 100644
|
|
index 00000000..aa29630d
|
|
--- /dev/null
|
|
+++ b/rhel/README.rhel
|
|
@@ -0,0 +1,5 @@
|
|
+The following cloud-init modules are currently unsupported on this OS:
|
|
+ - apt_update_upgrade ('apt_update', 'apt_upgrade', 'apt_mirror', 'apt_preserve_sources_list', 'apt_old_mirror', 'apt_sources', 'debconf_selections', 'packages' options)
|
|
+ - byobu ('byobu_by_default' option)
|
|
+ - chef
|
|
+ - grub_dpkg
|
|
diff --git a/rhel/cloud-init-tmpfiles.conf b/rhel/cloud-init-tmpfiles.conf
|
|
new file mode 100644
|
|
index 00000000..0c6d2a3b
|
|
--- /dev/null
|
|
+++ b/rhel/cloud-init-tmpfiles.conf
|
|
@@ -0,0 +1 @@
|
|
+d /run/cloud-init 0700 root root - -
|
|
diff --git a/rhel/cloud.cfg b/rhel/cloud.cfg
|
|
new file mode 100644
|
|
index 00000000..82e8bf62
|
|
--- /dev/null
|
|
+++ b/rhel/cloud.cfg
|
|
@@ -0,0 +1,69 @@
|
|
+users:
|
|
+ - default
|
|
+
|
|
+disable_root: 1
|
|
+ssh_pwauth: 0
|
|
+
|
|
+mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service', '0', '2']
|
|
+resize_rootfs_tmp: /dev
|
|
+ssh_deletekeys: 0
|
|
+ssh_genkeytypes: ~
|
|
+syslog_fix_perms: ~
|
|
+disable_vmware_customization: false
|
|
+
|
|
+cloud_init_modules:
|
|
+ - disk_setup
|
|
+ - migrator
|
|
+ - bootcmd
|
|
+ - write-files
|
|
+ - growpart
|
|
+ - resizefs
|
|
+ - set_hostname
|
|
+ - update_hostname
|
|
+ - update_etc_hosts
|
|
+ - rsyslog
|
|
+ - users-groups
|
|
+ - ssh
|
|
+
|
|
+cloud_config_modules:
|
|
+ - mounts
|
|
+ - locale
|
|
+ - set-passwords
|
|
+ - rh_subscription
|
|
+ - yum-add-repo
|
|
+ - package-update-upgrade-install
|
|
+ - timezone
|
|
+ - puppet
|
|
+ - chef
|
|
+ - salt-minion
|
|
+ - mcollective
|
|
+ - disable-ec2-metadata
|
|
+ - runcmd
|
|
+
|
|
+cloud_final_modules:
|
|
+ - rightscale_userdata
|
|
+ - scripts-per-once
|
|
+ - scripts-per-boot
|
|
+ - scripts-per-instance
|
|
+ - scripts-user
|
|
+ - ssh-authkey-fingerprints
|
|
+ - keys-to-console
|
|
+ - phone-home
|
|
+ - final-message
|
|
+ - power-state-change
|
|
+
|
|
+system_info:
|
|
+ default_user:
|
|
+ name: cloud-user
|
|
+ lock_passwd: true
|
|
+ gecos: Cloud User
|
|
+ groups: [adm, systemd-journal]
|
|
+ sudo: ["ALL=(ALL) NOPASSWD:ALL"]
|
|
+ shell: /bin/bash
|
|
+ distro: rhel
|
|
+ paths:
|
|
+ cloud_dir: /var/lib/cloud
|
|
+ templates_dir: /etc/cloud/templates
|
|
+ ssh_svcname: sshd
|
|
+
|
|
+# vim:syntax=yaml
|
|
diff --git a/rhel/systemd/cloud-config.service b/rhel/systemd/cloud-config.service
|
|
new file mode 100644
|
|
index 00000000..f3dcd4be
|
|
--- /dev/null
|
|
+++ b/rhel/systemd/cloud-config.service
|
|
@@ -0,0 +1,18 @@
|
|
+[Unit]
|
|
+Description=Apply the settings specified in cloud-config
|
|
+After=network-online.target cloud-config.target
|
|
+Wants=network-online.target cloud-config.target
|
|
+ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
|
+ConditionKernelCommandLine=!cloud-init=disabled
|
|
+
|
|
+[Service]
|
|
+Type=oneshot
|
|
+ExecStart=/usr/bin/cloud-init modules --mode=config
|
|
+RemainAfterExit=yes
|
|
+TimeoutSec=0
|
|
+
|
|
+# Output needs to appear in instance console output
|
|
+StandardOutput=journal+console
|
|
+
|
|
+[Install]
|
|
+WantedBy=cloud-init.target
|
|
diff --git a/rhel/systemd/cloud-config.target b/rhel/systemd/cloud-config.target
|
|
new file mode 100644
|
|
index 00000000..ae9b7d02
|
|
--- /dev/null
|
|
+++ b/rhel/systemd/cloud-config.target
|
|
@@ -0,0 +1,11 @@
|
|
+# cloud-init normally emits a "cloud-config" upstart event to inform third
|
|
+# parties that cloud-config is available, which does us no good when we're
|
|
+# using systemd. cloud-config.target serves as this synchronization point
|
|
+# instead. Services that would "start on cloud-config" with upstart can
|
|
+# instead use "After=cloud-config.target" and "Wants=cloud-config.target"
|
|
+# as appropriate.
|
|
+
|
|
+[Unit]
|
|
+Description=Cloud-config availability
|
|
+Wants=cloud-init-local.service cloud-init.service
|
|
+After=cloud-init-local.service cloud-init.service
|
|
diff --git a/rhel/systemd/cloud-final.service b/rhel/systemd/cloud-final.service
|
|
new file mode 100644
|
|
index 00000000..e281c0cf
|
|
--- /dev/null
|
|
+++ b/rhel/systemd/cloud-final.service
|
|
@@ -0,0 +1,24 @@
|
|
+[Unit]
|
|
+Description=Execute cloud user/final scripts
|
|
+After=network-online.target cloud-config.service rc-local.service
|
|
+Wants=network-online.target cloud-config.service
|
|
+ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
|
+ConditionKernelCommandLine=!cloud-init=disabled
|
|
+
|
|
+[Service]
|
|
+Type=oneshot
|
|
+ExecStart=/usr/bin/cloud-init modules --mode=final
|
|
+RemainAfterExit=yes
|
|
+TimeoutSec=0
|
|
+KillMode=process
|
|
+# Restart NetworkManager if it is present and running.
|
|
+ExecStartPost=/bin/sh -c 'u=NetworkManager.service; \
|
|
+ out=$(systemctl show --property=SubState $u) || exit; \
|
|
+ [ "$out" = "SubState=running" ] || exit 0; \
|
|
+ systemctl reload-or-try-restart $u'
|
|
+
|
|
+# Output needs to appear in instance console output
|
|
+StandardOutput=journal+console
|
|
+
|
|
+[Install]
|
|
+WantedBy=cloud-init.target
|
|
diff --git a/rhel/systemd/cloud-init-local.service b/rhel/systemd/cloud-init-local.service
|
|
new file mode 100644
|
|
index 00000000..8f9f6c9f
|
|
--- /dev/null
|
|
+++ b/rhel/systemd/cloud-init-local.service
|
|
@@ -0,0 +1,31 @@
|
|
+[Unit]
|
|
+Description=Initial cloud-init job (pre-networking)
|
|
+DefaultDependencies=no
|
|
+Wants=network-pre.target
|
|
+After=systemd-remount-fs.service
|
|
+Requires=dbus.socket
|
|
+After=dbus.socket
|
|
+Before=NetworkManager.service network.service
|
|
+Before=network-pre.target
|
|
+Before=shutdown.target
|
|
+Before=firewalld.target
|
|
+Conflicts=shutdown.target
|
|
+RequiresMountsFor=/var/lib/cloud
|
|
+ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
|
+ConditionKernelCommandLine=!cloud-init=disabled
|
|
+
|
|
+[Service]
|
|
+Type=oneshot
|
|
+ExecStartPre=/bin/mkdir -p /run/cloud-init
|
|
+ExecStartPre=/sbin/restorecon /run/cloud-init
|
|
+ExecStartPre=/usr/bin/touch /run/cloud-init/enabled
|
|
+ExecStart=/usr/bin/cloud-init init --local
|
|
+ExecStart=/bin/touch /run/cloud-init/network-config-ready
|
|
+RemainAfterExit=yes
|
|
+TimeoutSec=0
|
|
+
|
|
+# Output needs to appear in instance console output
|
|
+StandardOutput=journal+console
|
|
+
|
|
+[Install]
|
|
+WantedBy=cloud-init.target
|
|
diff --git a/rhel/systemd/cloud-init.service b/rhel/systemd/cloud-init.service
|
|
new file mode 100644
|
|
index 00000000..d0023a05
|
|
--- /dev/null
|
|
+++ b/rhel/systemd/cloud-init.service
|
|
@@ -0,0 +1,25 @@
|
|
+[Unit]
|
|
+Description=Initial cloud-init job (metadata service crawler)
|
|
+Wants=cloud-init-local.service
|
|
+Wants=sshd-keygen.service
|
|
+Wants=sshd.service
|
|
+After=cloud-init-local.service
|
|
+After=NetworkManager.service network.service
|
|
+Before=network-online.target
|
|
+Before=sshd-keygen.service
|
|
+Before=sshd.service
|
|
+Before=systemd-user-sessions.service
|
|
+ConditionPathExists=!/etc/cloud/cloud-init.disabled
|
|
+ConditionKernelCommandLine=!cloud-init=disabled
|
|
+
|
|
+[Service]
|
|
+Type=oneshot
|
|
+ExecStart=/usr/bin/cloud-init init
|
|
+RemainAfterExit=yes
|
|
+TimeoutSec=0
|
|
+
|
|
+# Output needs to appear in instance console output
|
|
+StandardOutput=journal+console
|
|
+
|
|
+[Install]
|
|
+WantedBy=cloud-init.target
|
|
diff --git a/rhel/systemd/cloud-init.target b/rhel/systemd/cloud-init.target
|
|
new file mode 100644
|
|
index 00000000..083c3b6f
|
|
--- /dev/null
|
|
+++ b/rhel/systemd/cloud-init.target
|
|
@@ -0,0 +1,7 @@
|
|
+# cloud-init target is enabled by cloud-init-generator
|
|
+# To disable it you can either:
|
|
+# a.) boot with kernel cmdline of 'cloud-init=disabled'
|
|
+# b.) touch a file /etc/cloud/cloud-init.disabled
|
|
+[Unit]
|
|
+Description=Cloud-init target
|
|
+After=multi-user.target
|
|
diff --git a/setup.py b/setup.py
|
|
index a9132d2c..3c377eaa 100755
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -139,21 +139,6 @@ INITSYS_FILES = {
|
|
"sysvinit_deb": [f for f in glob("sysvinit/debian/*") if is_f(f)],
|
|
"sysvinit_openrc": [f for f in glob("sysvinit/gentoo/*") if is_f(f)],
|
|
"sysvinit_suse": [f for f in glob("sysvinit/suse/*") if is_f(f)],
|
|
- "systemd": [
|
|
- render_tmpl(f)
|
|
- for f in (
|
|
- glob("systemd/*.tmpl")
|
|
- + glob("systemd/*.service")
|
|
- + glob("systemd/*.socket")
|
|
- + glob("systemd/*.target")
|
|
- )
|
|
- if (is_f(f) and not is_generator(f))
|
|
- ],
|
|
- "systemd.generators": [
|
|
- render_tmpl(f, mode=0o755)
|
|
- for f in glob("systemd/*")
|
|
- if is_f(f) and is_generator(f)
|
|
- ],
|
|
"upstart": [f for f in glob("upstart/*") if is_f(f)],
|
|
}
|
|
INITSYS_ROOTS = {
|
|
@@ -163,10 +148,6 @@ INITSYS_ROOTS = {
|
|
"sysvinit_deb": "etc/init.d",
|
|
"sysvinit_openrc": "etc/init.d",
|
|
"sysvinit_suse": "etc/init.d",
|
|
- "systemd": pkg_config_read("systemd", "systemdsystemunitdir"),
|
|
- "systemd.generators": pkg_config_read(
|
|
- "systemd", "systemdsystemgeneratordir"
|
|
- ),
|
|
"upstart": "etc/init/",
|
|
}
|
|
INITSYS_TYPES = sorted([f.partition(".")[0] for f in INITSYS_ROOTS.keys()])
|
|
@@ -281,15 +262,13 @@ data_files = [
|
|
(
|
|
USR_LIB_EXEC + "/cloud-init",
|
|
[
|
|
- "tools/ds-identify",
|
|
"tools/hook-hotplug",
|
|
"tools/uncloud-init",
|
|
"tools/write-ssh-key-fingerprints",
|
|
],
|
|
),
|
|
(
|
|
- USR + "/share/bash-completion/completions",
|
|
- ["bash_completion/cloud-init"],
|
|
+ ETC + "/bash_completion.d", ["bash_completion/cloud-init"],
|
|
),
|
|
(USR + "/share/doc/cloud-init", [f for f in glob("doc/*") if is_f(f)]),
|
|
(
|
|
@@ -308,8 +287,7 @@ if not platform.system().endswith("BSD"):
|
|
ETC + "/NetworkManager/dispatcher.d/",
|
|
["tools/hook-network-manager"],
|
|
),
|
|
- (ETC + "/dhcp/dhclient-exit-hooks.d/", ["tools/hook-dhclient"]),
|
|
- (LIB + "/udev/rules.d", [f for f in glob("udev/*.rules")]),
|
|
+ ("/usr/lib/udev/rules.d", [f for f in glob("udev/*.rules")]),
|
|
(
|
|
ETC + "/systemd/system/sshd-keygen@.service.d/",
|
|
["systemd/disable-sshd-keygen-if-cloud-init-active.conf"],
|
|
@@ -339,8 +317,6 @@ setuptools.setup(
|
|
scripts=["tools/cloud-init-per"],
|
|
license="Dual-licensed under GPLv3 or Apache 2.0",
|
|
data_files=data_files,
|
|
- install_requires=requirements,
|
|
- cmdclass=cmdclass,
|
|
entry_points={
|
|
"console_scripts": [
|
|
"cloud-init = cloudinit.cmd.main:main",
|
|
diff --git a/tools/read-version b/tools/read-version
|
|
index 02c90643..79755f78 100755
|
|
--- a/tools/read-version
|
|
+++ b/tools/read-version
|
|
@@ -71,32 +71,8 @@ version_long = None
|
|
is_release_branch_ci = (
|
|
os.environ.get("TRAVIS_PULL_REQUEST_BRANCH", "").startswith("upstream/")
|
|
)
|
|
-if is_gitdir(_tdir) and which("git") and not is_release_branch_ci:
|
|
- flags = []
|
|
- if use_tags:
|
|
- flags = ['--tags']
|
|
- cmd = ['git', 'describe', '--abbrev=8', '--match=[0-9]*'] + flags
|
|
-
|
|
- try:
|
|
- version = tiny_p(cmd).strip()
|
|
- except RuntimeError:
|
|
- version = None
|
|
-
|
|
- if version is None or not version.startswith(src_version):
|
|
- sys.stderr.write("git describe version (%s) differs from "
|
|
- "cloudinit.version (%s)\n" % (version, src_version))
|
|
- sys.stderr.write(
|
|
- "Please get the latest upstream tags.\n"
|
|
- "As an example, this can be done with the following:\n"
|
|
- "$ git remote add upstream https://git.launchpad.net/cloud-init\n"
|
|
- "$ git fetch upstream --tags\n"
|
|
- )
|
|
- sys.exit(1)
|
|
-
|
|
- version_long = tiny_p(cmd + ["--long"]).strip()
|
|
-else:
|
|
- version = src_version
|
|
- version_long = None
|
|
+version = src_version
|
|
+version_long = None
|
|
|
|
# version is X.Y.Z[+xxx.gHASH]
|
|
# version_long is None or X.Y.Z-xxx-gHASH
|
|
--
|
|
2.31.1
|
|
|