Skip to content

Commit 75c95de

Browse files
committed
openstack provider: ignore ec2 metadata if not present
Signed-off-by: Riccardo Piccoli <rpiccoli@redhat.com>
1 parent de95d78 commit 75c95de

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/providers/openstack/configdrive.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,21 @@ impl OpenstackConfigDrive {
144144
impl MetadataProvider for OpenstackConfigDrive {
145145
fn attributes(&self) -> Result<HashMap<String, String>> {
146146
let mut out = HashMap::with_capacity(6);
147-
let metadata_ec2: MetadataEc2JSON = self.read_metadata_ec2()?;
148147
let metadata_openstack: MetadataOpenstackJSON = self.read_metadata_openstack()?;
149148
if let Some(hostname) = metadata_openstack.hostname {
150149
out.insert("OPENSTACK_HOSTNAME".to_string(), hostname);
151150
}
152-
if let Some(instance_id) = metadata_ec2.instance_id {
153-
out.insert("OPENSTACK_INSTANCE_ID".to_string(), instance_id);
154-
}
155151
if let Some(uuid) = metadata_openstack.uuid {
156152
out.insert("OPENSTACK_INSTANCE_UUID".to_string(), uuid);
157153
}
154+
155+
let metadata_ec2 = match self.read_metadata_ec2() {
156+
Ok(metadata) => metadata,
157+
Err(error) => return Ok(out),
158+
};
159+
if let Some(instance_id) = metadata_ec2.instance_id {
160+
out.insert("OPENSTACK_INSTANCE_ID".to_string(), instance_id);
161+
}
158162
if let Some(instance_type) = metadata_ec2.instance_type {
159163
out.insert("OPENSTACK_INSTANCE_TYPE".to_string(), instance_type);
160164
}

0 commit comments

Comments
 (0)