Skip to content
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.

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

openstack provider: ignore ec2 metadata if not present #1131

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions docs/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Major changes:
Minor changes:

- ProxmoxVE: Fixed instance boot without config drive
- OpenStack: do not fail if ec2 metadata is not found

Packaging changes:

Expand Down
23 changes: 16 additions & 7 deletions src/providers/openstack/configdrive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,19 @@ impl OpenstackConfigDrive {
}

/// The metadata is stored as key:value pair in ec2/latest/meta-data.json file
fn read_metadata_ec2(&self) -> Result<MetadataEc2JSON> {
fn read_metadata_ec2(&self) -> Result<Option<MetadataEc2JSON>> {
use std::io::ErrorKind::NotFound;

let filename = self.metadata_dir("ec2").join("meta-data.json");
let file =
File::open(&filename).with_context(|| format!("failed to open file '{filename:?}'"))?;
let file = match File::open(&filename) {
Ok(file) => file,
Err(e) if e.kind() == NotFound => return Ok(None),
Err(e) => return Err(e).with_context(|| format!("failed to open file '{filename:?}'")),
};
let bufrd = BufReader::new(file);
Self::parse_metadata_ec2(bufrd)
.with_context(|| format!("failed to parse file '{filename:?}'"))
.map(Some)
}

/// The metadata is stored as key:value pair in openstack/latest/meta_data.json file
Expand Down Expand Up @@ -144,17 +150,20 @@ impl OpenstackConfigDrive {
impl MetadataProvider for OpenstackConfigDrive {
fn attributes(&self) -> Result<HashMap<String, String>> {
let mut out = HashMap::with_capacity(6);
let metadata_ec2: MetadataEc2JSON = self.read_metadata_ec2()?;
let metadata_openstack: MetadataOpenstackJSON = self.read_metadata_openstack()?;
if let Some(hostname) = metadata_openstack.hostname {
out.insert("OPENSTACK_HOSTNAME".to_string(), hostname);
}
if let Some(instance_id) = metadata_ec2.instance_id {
out.insert("OPENSTACK_INSTANCE_ID".to_string(), instance_id);
}
if let Some(uuid) = metadata_openstack.uuid {
out.insert("OPENSTACK_INSTANCE_UUID".to_string(), uuid);
}

let Some(metadata_ec2) = self.read_metadata_ec2()? else {
return Ok(out);
};
if let Some(instance_id) = metadata_ec2.instance_id {
out.insert("OPENSTACK_INSTANCE_ID".to_string(), instance_id);
}
if let Some(instance_type) = metadata_ec2.instance_type {
out.insert("OPENSTACK_INSTANCE_TYPE".to_string(), instance_type);
}
Expand Down