From 5540933a070b1873735d4ce6bc730e5717c8d8f2 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sat, 14 Nov 2020 23:14:40 -0500 Subject: cloud-init: remove recipe Support has been moved to meta-virt, so we drop this older recipe. Signed-off-by: Bruce Ashfield --- .../cloud-init-source-local-lsb-functions.patch | 64 -------------- .../cloud-init/cloud-init/cloud.cfg | 99 ---------------------- ...istros-add-windriver-skeleton-distro-file.patch | 44 ---------- .../cloud-init/cloud-init_0.7.6.bb | 53 ------------ 4 files changed, 260 deletions(-) delete mode 100644 meta-openstack/recipes-extended/cloud-init/cloud-init/cloud-init-source-local-lsb-functions.patch delete mode 100644 meta-openstack/recipes-extended/cloud-init/cloud-init/cloud.cfg delete mode 100644 meta-openstack/recipes-extended/cloud-init/cloud-init/distros-add-windriver-skeleton-distro-file.patch delete mode 100644 meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb (limited to 'meta-openstack/recipes-extended') diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud-init-source-local-lsb-functions.patch b/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud-init-source-local-lsb-functions.patch deleted file mode 100644 index 869fb31..0000000 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud-init-source-local-lsb-functions.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 72dd3b4b38705442d821fe97a40061f23e748769 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Thu, 6 Mar 2014 01:55:09 -0500 -Subject: [PATCH] cloud-init: source local lsb functions - -Signed-off-by: Bruce Ashfield ---- - sysvinit/debian/cloud-config | 1 + - sysvinit/debian/cloud-final | 1 + - sysvinit/debian/cloud-init | 1 + - sysvinit/debian/cloud-init-local | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/sysvinit/debian/cloud-config b/sysvinit/debian/cloud-config -index 53322748ac65..7874dcfab9b0 100644 ---- a/sysvinit/debian/cloud-config -+++ b/sysvinit/debian/cloud-config -@@ -30,6 +30,7 @@ SCRIPTNAME=/etc/init.d/$NAME - # Depend on lsb-base (>= 3.2-14) to ensure that this file is present - # and status_of_proc is working. - . /lib/lsb/init-functions -+. /etc/init.d/functions - - if init_is_upstart; then - case "$1" in -diff --git a/sysvinit/debian/cloud-final b/sysvinit/debian/cloud-final -index 55afc8b0678a..661314f0b64c 100644 ---- a/sysvinit/debian/cloud-final -+++ b/sysvinit/debian/cloud-final -@@ -32,6 +32,7 @@ SCRIPTNAME=/etc/init.d/$NAME - # Depend on lsb-base (>= 3.2-14) to ensure that this file is present - # and status_of_proc is working. - . /lib/lsb/init-functions -+. /etc/init.d/functions - - if init_is_upstart; then - case "$1" in -diff --git a/sysvinit/debian/cloud-init b/sysvinit/debian/cloud-init -index 48fa04233f00..d3ccec99bacc 100755 ---- a/sysvinit/debian/cloud-init -+++ b/sysvinit/debian/cloud-init -@@ -30,6 +30,7 @@ SCRIPTNAME=/etc/init.d/$NAME - # Depend on lsb-base (>= 3.2-14) to ensure that this file is present - # and status_of_proc is working. - . /lib/lsb/init-functions -+. /etc/init.d/functions - - if init_is_upstart; then - case "$1" in -diff --git a/sysvinit/debian/cloud-init-local b/sysvinit/debian/cloud-init-local -index 802ee8e9f386..c309e8347324 100644 ---- a/sysvinit/debian/cloud-init-local -+++ b/sysvinit/debian/cloud-init-local -@@ -29,6 +29,7 @@ SCRIPTNAME=/etc/init.d/$NAME - # Depend on lsb-base (>= 3.2-14) to ensure that this file is present - # and status_of_proc is working. - . /lib/lsb/init-functions -+. /etc/init.d/functions - - if init_is_upstart; then - case "$1" in --- -1.7.10.4 - diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud.cfg b/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud.cfg deleted file mode 100644 index f868936..0000000 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud.cfg +++ /dev/null @@ -1,99 +0,0 @@ -# The top level settings are used as module -# and system configuration. - -# A set of users which may be applied and/or used by various modules -# when a 'default' entry is found it will reference the 'default_user' -# from the distro configuration specified below -users: - - default - -# If this is set, 'root' will not be able to ssh in and they -# will get a message to login instead as the above $user (ubuntu) -disable_root: False - -# This will cause the set+update hostname module to not operate (if true) -preserve_hostname: false -manage_etc_hosts: %MANAGE_HOSTS% - -datasource_list: - - None - -# Example datasource config -# datasource: -# Ec2: -# metadata_urls: [ 'blah.com' ] -# timeout: 5 # (defaults to 50 seconds) -# max_wait: 10 # (defaults to 120 seconds) - -# The modules that run in the 'init' stage -cloud_init_modules: - - migrator - - seed_random - - bootcmd - - write-files - - growpart - - set_hostname - - update_hostname - - update_etc_hosts - - ca-certs - - rsyslog - - users-groups - - ssh - -# The modules that run in the 'config' stage -cloud_config_modules: -# Emit the cloud config ready event -# this can be used by upstart jobs for 'start on cloud-config'. - - emit_upstart - - disk_setup - - mounts - - ssh-import-id - - locale - - set-passwords - - grub-dpkg - - apt-pipelining - - apt-configure - - package-update-upgrade-install - - landscape - - timezone - - puppet - - chef - - salt-minion - - mcollective - - disable-ec2-metadata - - runcmd - - byobu - -# The modules that run in the 'final' stage -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 - -# set the hostname -hostname: %HOSTNAME% - -# System and/or distro specific settings -# (not accessible to handlers/transforms) -system_info: - # This will affect which distro class gets used - distro: windriver - # Default user name + that default users groups (if added/used) - default_user: - name: root - lock_passwd: False - groups: [adm, audio, cdrom, dialout, dip, floppy, netdev, plugdev, sudo, video] - sudo: ["ALL=(ALL) NOPASSWD:ALL"] - shell: /bin/bash - # Other config here will be given to the distro class and/or path classes - paths: - cloud_dir: /var/lib/cloud/ - templates_dir: /etc/cloud/templates/ - ssh_svcname: ssh diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init/distros-add-windriver-skeleton-distro-file.patch b/meta-openstack/recipes-extended/cloud-init/cloud-init/distros-add-windriver-skeleton-distro-file.patch deleted file mode 100644 index f52faf3..0000000 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init/distros-add-windriver-skeleton-distro-file.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6ad7caf6410237f3b1bed6ff4d9f0423e69afcd6 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Mon, 10 Mar 2014 00:57:18 -0400 -Subject: [PATCH] distros: add windriver skeleton distro file - -Signed-off-by: Bruce Ashfield ---- - cloudinit/distros/windriver.py | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - create mode 100644 cloudinit/distros/windriver.py - -diff --git a/cloudinit/distros/windriver.py b/cloudinit/distros/windriver.py -new file mode 100644 -index 000000000000..8eec13fe2207 ---- /dev/null -+++ b/cloudinit/distros/windriver.py -@@ -0,0 +1,24 @@ -+# vi: ts=4 expandtab -+# -+# Copyright (C) 2014 WindRiver -+# -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License version 3, as -+# published by the Free Software Foundation. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see . -+ -+from cloudinit.distros import debian -+from cloudinit import log as logging -+ -+LOG = logging.getLogger(__name__) -+ -+ -+class Distro(debian.Distro): -+ pass --- -1.7.10.4 - diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb deleted file mode 100644 index 8bbbef1..0000000 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "Init scripts for use on cloud images" -HOMEPAGE = "https://launchpad.net/cloud-init" -SECTION = "devel/python" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" - -PR = "r0" - -SRC_URI = "https://launchpad.net/cloud-init/trunk/${PV}/+download/${BPN}-${PV}.tar.gz \ - file://cloud-init-source-local-lsb-functions.patch \ - file://distros-add-windriver-skeleton-distro-file.patch \ - file://cloud.cfg" - -SRC_URI[md5sum] = "cd392e943dd0165e90a6d56afd0e4ad3" -SRC_URI[sha256sum] = "9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7" - -S = "${WORKDIR}/${BPN}-${PV}" - -DISTUTILS_INSTALL_ARGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--init-system=sysvinit_deb', '', d)}" -DISTUTILS_INSTALL_ARGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--init-system=systemd', '', d)}" - -MANAGE_HOSTS ?= "False" -HOSTNAME ?= "" - -do_install_prepend() { - sed -e 's:/lib/${BPN}:${base_libdir}/${BPN}:' -i ${S}/setup.py -} - -do_install_append() { - install -m 0755 ${WORKDIR}/cloud.cfg ${D}${sysconfdir}/cloud/cloud.cfg - - sed -e "s:%MANAGE_HOSTS%:${MANAGE_HOSTS}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg - sed -e "s:%HOSTNAME%:${HOSTNAME}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg - - ln -s ${libdir}/${BPN}/uncloud-init ${D}${sysconfdir}/cloud/uncloud-init - ln -s ${libdir}/${BPN}/write-ssh-key-fingerprints ${D}${sysconfdir}/cloud/write-ssh-key-fingerprints -} - -inherit setuptools3 update-rc.d - -PACKAGES += "${PN}-systemd" - -FILES_${PN} += "${sysconfdir}/* \ - ${datadir}/*" - -FILES_${PN}-systemd += "${systemd_unitdir}/*" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${BPN} = "cloud-init" - -RDEPENDS_${PN} = "sysklogd \ - python3 \ - " -- cgit v1.2.3-54-g00ecf