Skip to content

Srv6d openstack dualstack #1805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
holmanb merged 3 commits into from
Nov 17, 2022
Merged

Srv6d openstack dualstack #1805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c14a70e
Add OpenStack IPv6 metadata URL and try urls asynchronously
SRv6d Oct 27, 2022
022b0f7
Add username to CLA signatures
SRv6d Oct 28, 2022
490ef2d
Sort username alphabetically and match capitalization
SRv6d Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cloudinit/sources/DataSourceOpenStack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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(
Expand All @@ -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 = {}
Expand All @@ -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])
Expand Down
1 change: 1 addition & 0 deletions tools/.github-cla-signers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ riedel
rongz609
s-makin
SadeghHayeri
SRv6d
sarahwzadara
scorpion44
shaardie
Expand Down