packages/cloud-init
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

Browse Source
This commit is contained in:
zhuchunyi 2019-11-06 19:04:31 +08:00
parent c0d939f1cf
commit b80c98d930
2 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cloud-init-17.1-fix-local-ipv4-only.patch → EC2-Limit-network-config-to-fallback-nic-fix-local-i.patch
View File

@ -1,7 +1,7 @@
From a16fb4e1e1379db61a1ee40513f2ad10c9b38ef9 Mon Sep 17 00:00:00 2001 From eb292c18c3d83b9f7e5d1fd81b0e8aefaab0cc2d Mon Sep 17 00:00:00 2001
From: Chad Smith <chad.smith@canonical.com> From: Chad Smith <chad.smith@canonical.com>
Date: Tue, 31 Oct 2017 12:42:15 -0600 Date: Tue, 31 Oct 2017 12:42:15 -0600
Subject: [PATCH 4/4] EC2: Limit network config to fallback nic, fix local-ipv4 Subject: [PATCH] EC2: Limit network config to fallback nic, fix local-ipv4
only instances. only instances.
VPC instances have the option to specific local only IPv4 addresses. Allow VPC instances have the option to specific local only IPv4 addresses. Allow
@ -11,10 +11,9 @@ configured on an instance.
Also limit network_configuration to only the primary (fallback) nic. Also limit network_configuration to only the primary (fallback) nic.
LP: #1728152 LP: #1728152
(cherry picked from commit eb292c18c3d83b9f7e5d1fd81b0e8aefaab0cc2d)
--- ---
cloudinit/sources/DataSourceEc2.py | 24 ++++- cloudinit/sources/DataSourceEc2.py | 24 +++-
tests/unittests/test_datasource/test_ec2.py | 136 ++++++++++++++++++++++++++-- tests/unittests/test_datasource/test_ec2.py | 136 +++++++++++++++++++-
2 files changed, 149 insertions(+), 11 deletions(-) 2 files changed, 149 insertions(+), 11 deletions(-)
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
@ -294,5 +293,5 @@ index a7301dbf..6af699a6 100644
"""Config both dhcp4 and dhcp6 when both vpc-ipv6 and ipv4 exists.""" """Config both dhcp4 and dhcp6 when both vpc-ipv6 and ipv4 exists."""
macs_to_nics = {self.mac1: 'eth9'} macs_to_nics = {self.mac1: 'eth9'}
-- --
2.14.3 2.19.1

45
cloud-init.spec
View File

@ -1,35 +1,31 @@
Name: cloud-init Name: cloud-init
Version: 17.1 Version: 17.1
Release: 8 Release: 9
Summary: the defacto multi-distribution package that handles early initialization of a cloud instance. Summary: the defacto multi-distribution package that handles early initialization of a cloud instance.
License: ASL 2.0 or GPLv3 License: ASL 2.0 or GPLv3
URL: http://launchpad.net/cloud-init URL: http://launchpad.net/cloud-init
Source0: https://launchpad.net/cloud-init/trunk/17.1/+download/cloud-init-17.1.tar.gz Source0: https://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz
#Source1 is from fedora 29: https://src.fedoraproject.org/rpms/cloud-init/tree/f29
Source1: cloud-init-tmpfiles.conf Source1: cloud-init-tmpfiles.conf
#Patch0,Patch1,Patch2 and Patch3 are from fedora 29:
#https://src.fedoraproject.org/rpms/cloud-init/tree/f29
Patch0: cloud-init-17.1-disable-lxd-tests.patch Patch0: cloud-init-17.1-disable-lxd-tests.patch
Patch1: cloud-init-17.1-nm-controlled.patch Patch1: cloud-init-17.1-nm-controlled.patch
Patch2: cloud-init-17.1-no-override-default-network.patch Patch2: cloud-init-17.1-no-override-default-network.patch
Patch3: cloud-init-17.1-fix-local-ipv4-only.patch
Patch6000: ntp-fix-config-module-schema-to-allow-empty-ntp-conf.patch Patch6000: EC2-Limit-network-config-to-fallback-nic-fix-local-i.patch
Patch6001: resizefs-Fix-regression-when-system-booted-with-root.patch Patch6001: ntp-fix-config-module-schema-to-allow-empty-ntp-conf.patch
Patch6002: hosts-Fix-openSUSE-and-SLES-setup-for-etc-hosts-and-.patch Patch6002: resizefs-Fix-regression-when-system-booted-with-root.patch
Patch6003: EC2-Fix-bug-using-fallback_nic-and-metadata-when-res.patch Patch6003: hosts-Fix-openSUSE-and-SLES-setup-for-etc-hosts-and-.patch
Patch6004: Fix-ssh-keys-validation-in-ssh_util.patch Patch6004: EC2-Fix-bug-using-fallback_nic-and-metadata-when-res.patch
Patch6005: stages-fix-tracebacks-if-a-module-stage-is-undefined.patch Patch6005: Fix-ssh-keys-validation-in-ssh_util.patch
Patch6006: stages-Fix-bug-causing-datasource-to-have-incorrect-.patch Patch6006: stages-fix-tracebacks-if-a-module-stage-is-undefined.patch
Patch6007: stages-Fix-bug-causing-datasource-to-have-incorrect-.patch
Patch9001: bugfix-cloud-init-add-euleros-os.patch Patch9000: bugfix-cloud-init-add-euleros-os.patch
Patch9002: bugfix-sort-requirements.patch Patch9001: bugfix-sort-requirements.patch
Patch9003: add-variable-to-forbid-tmp-dir.patch Patch9002: add-variable-to-forbid-tmp-dir.patch
BuildArch: noarch BuildRequires: pkgconfig(systemd) python3-devel python3-setuptools systemd
BuildRequires: pkgconfig python3-devel python3-setuptools systemd
BuildRequires: iproute python3-configobj python3-httpretty >= 0.8.14-2 BuildRequires: iproute python3-configobj python3-httpretty >= 0.8.14-2
BuildRequires: python3-jinja2 python3-jsonpatch python3-jsonschema BuildRequires: python3-jinja2 python3-jsonpatch python3-jsonschema
BuildRequires: python3-mock python3-nose python3-oauthlib python3-prettytable BuildRequires: python3-mock python3-nose python3-oauthlib python3-prettytable
@ -42,6 +38,8 @@ Requires: python3-jsonschema python3-oauthlib python3-prettytable util-linux
Requires: python3-pyserial python3-pyyaml python3-requests python3-six shadow Requires: python3-pyserial python3-pyyaml python3-requests python3-six shadow
%{?systemd_requires} %{?systemd_requires}
BuildArch: noarch
%description %description
Cloud-init is the defacto multi-distribution package that handles early Cloud-init is the defacto multi-distribution package that handles early
initialization of a cloud instance. initialization of a cloud instance.
@ -60,7 +58,7 @@ sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python3|' \
%py3_install -- --init-system=systemd %py3_install -- --init-system=systemd
python3 tools/render-cloudcfg --variant euleros > %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg python3 tools/render-cloudcfg --variant euleros > %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg
install -d %{buildroot}/var/lib/cloud install -d %{buildroot}/var/lib/cloud
install -d %{buildroot}/run/cloud-init install -d %{buildroot}/run/%{name}
install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/%{name}.conf install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/%{name}.conf
install -D -m 0644 tools/21-cloudinit.conf %{buildroot}/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf install -D -m 0644 tools/21-cloudinit.conf %{buildroot}/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
@ -70,6 +68,8 @@ rm -f $RPM_BUILD_DIR/%{name}-%{version}/tests/unittests/test_handler/test_handle
nosetests-%{python3_version} tests/unittests/ nosetests-%{python3_version} tests/unittests/
%pre
%preun %preun
%systemd_preun cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service %systemd_preun cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service
@ -116,7 +116,7 @@ fi
%{_libexecdir}/%{name} %{_libexecdir}/%{name}
%{_bindir}/cloud-init* %{_bindir}/cloud-init*
%{python3_sitelib}/* %{python3_sitelib}/*
%dir /run/cloud-init %dir /run/%{name}
%dir /var/lib/cloud %dir /var/lib/cloud
%files help %files help
@ -126,5 +126,8 @@ fi
%exclude /usr/share/doc/* %exclude /usr/share/doc/*
%changelog %changelog
* Tue Oct 22 2019 openEuler Buildteam <buildteam@openeuler.org> - 17.1-9
- Package rebuild.
* Tue Sep 17 2019 openEuler Buildteam <buildteam@openeuler.org> - 17.1-8 * Tue Sep 17 2019 openEuler Buildteam <buildteam@openeuler.org> - 17.1-8
- Package init - Package init.