File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -144,17 +144,21 @@ impl OpenstackConfigDrive {
144
144
impl MetadataProvider for OpenstackConfigDrive {
145
145
fn attributes ( & self ) -> Result < HashMap < String , String > > {
146
146
let mut out = HashMap :: with_capacity ( 6 ) ;
147
- let metadata_ec2: MetadataEc2JSON = self . read_metadata_ec2 ( ) ?;
148
147
let metadata_openstack: MetadataOpenstackJSON = self . read_metadata_openstack ( ) ?;
149
148
if let Some ( hostname) = metadata_openstack. hostname {
150
149
out. insert ( "OPENSTACK_HOSTNAME" . to_string ( ) , hostname) ;
151
150
}
152
- if let Some ( instance_id) = metadata_ec2. instance_id {
153
- out. insert ( "OPENSTACK_INSTANCE_ID" . to_string ( ) , instance_id) ;
154
- }
155
151
if let Some ( uuid) = metadata_openstack. uuid {
156
152
out. insert ( "OPENSTACK_INSTANCE_UUID" . to_string ( ) , uuid) ;
157
153
}
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
+ }
158
162
if let Some ( instance_type) = metadata_ec2. instance_type {
159
163
out. insert ( "OPENSTACK_INSTANCE_TYPE" . to_string ( ) , instance_type) ;
160
164
}
You can’t perform that action at this time.
0 commit comments