From c14a70e1f617ad05dc4a811c1a018ad4685121b3 Mon Sep 17 00:00:00 2001 From: Marvin Vogt Date: Thu, 27 Oct 2022 14:37:17 +0200 Subject: [PATCH 1/3] Add OpenStack IPv6 metadata URL and try urls asynchronously --- cloudinit/sources/DataSourceOpenStack.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cloudinit/sources/DataSourceOpenStack.py b/cloudinit/sources/DataSourceOpenStack.py index 915ed0c04d0..a07e355ccd4 100644 --- a/cloudinit/sources/DataSourceOpenStack.py +++ b/cloudinit/sources/DataSourceOpenStack.py @@ -18,7 +18,7 @@ LOG = logging.getLogger(__name__) # Various defaults/constants... -DEF_MD_URL = "http://169.254.169.254" +DEF_MD_URLS = ["http://[fe80::a9fe:a9fe]", "http://169.254.169.254"] DEFAULT_IID = "iid-dsopenstack" DEFAULT_METADATA = { "instance-id": DEFAULT_IID, @@ -74,7 +74,7 @@ def __str__(self): return mstr def wait_for_metadata_service(self): - urls = self.ds_cfg.get("metadata_urls", [DEF_MD_URL]) + urls = self.ds_cfg.get("metadata_urls", DEF_MD_URLS) filtered = [x for x in urls if util.is_resolvable_url(x)] if set(filtered) != set(urls): LOG.debug( @@ -85,7 +85,7 @@ def wait_for_metadata_service(self): urls = filtered else: LOG.warning("Empty metadata url list! using default list") - urls = [DEF_MD_URL] + urls = DEF_MD_URLS md_urls = [] url2base = {} @@ -100,6 +100,7 @@ def wait_for_metadata_service(self): urls=md_urls, max_wait=url_params.max_wait_seconds, timeout=url_params.timeout_seconds, + connect_synchronously=False, ) if avail_url: LOG.debug("Using metadata source: '%s'", url2base[avail_url]) From 022b0f74648853401782f80580c34403be21a5ae Mon Sep 17 00:00:00 2001 From: Marvin Vogt Date: Fri, 28 Oct 2022 15:23:17 +0200 Subject: [PATCH 2/3] Add username to CLA signatures --- tools/.github-cla-signers | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers index bdab85b5f78..cc93cc83e86 100644 --- a/tools/.github-cla-signers +++ b/tools/.github-cla-signers @@ -128,3 +128,4 @@ xnox yangzz-97 yawkat zhuzaifangxuele +srv6d From 490ef2d1b961b6c27cf64cd5b720025c0b5aa0cb Mon Sep 17 00:00:00 2001 From: Marvin Vogt Date: Mon, 31 Oct 2022 10:02:48 +0100 Subject: [PATCH 3/3] Sort username alphabetically and match capitalization --- tools/.github-cla-signers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers index cc93cc83e86..4138c1f8ca2 100644 --- a/tools/.github-cla-signers +++ b/tools/.github-cla-signers @@ -95,6 +95,7 @@ riedel rongz609 s-makin SadeghHayeri +SRv6d sarahwzadara scorpion44 shaardie @@ -128,4 +129,3 @@ xnox yangzz-97 yawkat zhuzaifangxuele -srv6d