openstack provider: ignore ec2 metadata if not present #1131
Conversation
|
/cc @jlebon |
rccrdpccl
force-pushed
the
ignore-ec2-if-not-present
branch
from
75c95de to
83ffc74
Compare
|
|
||
| let metadata_ec2 = match self.read_metadata_ec2() { | ||
| Ok(metadata) => metadata, | ||
| Err(error) => return Ok(out), |
There was a problem hiding this comment.
First, let's instead change read_metadata_ec2() to return a Result<Option<MetadataEc2JSON>>. So then it would return Ok(None) in this case. It should only return that if the error was ENOENT. Grep the codebase for NotFound for examples of this.
Second, this is a lot of metadata we're not injecting now. Are you sure that information is not available in the openstack/meta_data.json? I was under the impression when we talked about this that it was.
There was a problem hiding this comment.
All the metadata we are not injecting seems to be either ec2 related (INSTANCE_ID, INSTANCE_TYPE), or somewhat irrelevant, at least in my use case: IPV4_LOCAL and IPV4_PUBLIC .
The information provided by metal3 is the following:
{
"local-hostname": "bmh-vm-02",
"local_hostname": "bmh-vm-02",
"metal3-name": "bmh-vm-02",
"metal3-namespace": "test-capi",
"name": "bmh-vm-02",
"uuid": "30aed4c7-05a4-4d15-be9b-9194dc1b5ad1"
}
We can see uuid, hostname - although none of its label it's matching the current provider's key - and other metal3 related keys (useful to build the providerID pattern expected by metal3).
rccrdpccl
force-pushed
the
ignore-ec2-if-not-present
branch
from
83ffc74 to
ebf930c
Compare
| let file = match File::open(&filename) { | ||
| Ok(file) => file, | ||
| Err(e) if e.kind() == NotFound => return Ok(None), | ||
| Err(e) => return Err(anyhow::Error::new(e).context(format!("failed to open file '{filename:?}'"))), |
| match Self::parse_metadata_ec2(bufrd) | ||
| .with_context(|| format!("failed to parse file '{filename:?}'")) { | ||
| Ok(metadata) => Ok(Some(metadata)), | ||
| Err(e) => Err(e), | ||
| } |
There was a problem hiding this comment.
Instead of the match, you can .map(Some) to wrap it in an Option.
| let metadata_ec2 = match self.read_metadata_ec2() { | ||
| Ok(Some(metadata)) => metadata, | ||
| Ok(None) => return Ok(out), | ||
| Err(e) => return Err(e), | ||
| }; |
There was a problem hiding this comment.
You can do something like:
let Some(...) = self...()? else {
return Ok(out);
};
docs/release-notes.md
Outdated
| @@ -10,6 +10,8 @@ Major changes: | |||
|
|
|||
| Minor changes: | |||
|
|
|||
| - Openstack: do not fail if ec2 metadata is not found | |||
There was a problem hiding this comment.
| - Openstack: do not fail if ec2 metadata is not found | |
| - OpenStack: do not fail if ec2 metadata is not found |
rccrdpccl
force-pushed
the
ignore-ec2-if-not-present
branch
from
ebf930c to
5158090
Compare
rccrdpccl
force-pushed
the
ignore-ec2-if-not-present
branch
2 times, most recently
from
3adc3a1 to
dae8976
Compare
Signed-off-by: Riccardo Piccoli <[email protected]>
rccrdpccl
force-pushed
the
ignore-ec2-if-not-present
branch
from
dae8976 to
f1a9378
Compare
On baremetal platform, when reading metadata from a configdrive with openstack layout we get the following error:
This PR ignores ec2 metadata if not present: