@@ -198,11 +198,6 @@ def deep_compare(a, b, updates):
198198 logger .info (
199199 f"Cleaning up baremetal node not found in netbox: { node ['Name' ]} "
200200 )
201- flavor_name = "osism-" + node ["Name" ]
202- flavor = openstack .compute_flavor_get (flavor_name )
203- if flavor :
204- logger .info (f"Deleting flavor { flavor_name } " )
205- openstack .compute_flavor_delete (flavor )
206201 for port in openstack .baremetal_port_list (
207202 details = False , attributes = dict (node_uuid = node ["UUID" ])
208203 ):
@@ -271,19 +266,6 @@ def deep_compare(a, b, updates):
271266 for interface in node_interfaces
272267 if interface .enabled and not interface .mgmt_only and interface .mac_address
273268 ]
274- flavor_attributes = {
275- "ram" : 1 ,
276- "disk" : 0 ,
277- "vcpus" : 1 ,
278- "is_public" : False ,
279- "extra_specs" : {
280- "resources:CUSTOM_"
281- + device .name .upper ().replace ("-" , "_" ).replace ("." , "_" ): "1" ,
282- "resources:VCPU" : "0" ,
283- "resources:MEMORY_MB" : "0" ,
284- "resources:DISK_GB" : "0" ,
285- },
286- }
287269
288270 lock = Redlock (
289271 key = f"lock_osism_tasks_conductor_sync_netbox_with_ironic-{ device .name } " ,
@@ -413,48 +395,6 @@ def deep_compare(a, b, updates):
413395 logger .info (
414396 f"Validation of management interface failed for baremetal node for { device .name } \n Reason: { node_validation ['management' ].reason } "
415397 )
416-
417- flavor_name = "osism-" + device .name
418- flavor = openstack .compute_flavor_get (flavor_name )
419- if not flavor :
420- logger .info (f"Creating flavor for { flavor_name } " )
421- flavor = openstack .compute_flavor_create (
422- flavor_name , flavor_attributes
423- )
424- else :
425- flavor_updates = {}
426- deep_compare (flavor_attributes , flavor , flavor_updates )
427- flavor_updates_extra_specs = flavor_updates .pop ("extra_specs" , None )
428- if flavor_updates :
429- logger .info (
430- f"Updating flavor for { device .name } with { flavor_updates } "
431- )
432- openstack .compute_flavor_delete (flavor )
433- flavor = openstack .compute_flavor_create (
434- flavor_name , flavor_attributes
435- )
436- elif flavor_updates_extra_specs :
437- logger .info (
438- f"Updating flavor extra_specs for { device .name } with { flavor_updates_extra_specs } "
439- )
440- openstack .compute_flavor_update_extra_specs (
441- flavor , flavor_updates_extra_specs
442- )
443- flavor = openstack .compute_flavor_get (flavor_name )
444- for extra_specs_key in flavor ["extra_specs" ].keys ():
445- if (
446- extra_specs_key
447- not in flavor_attributes ["extra_specs" ].keys ()
448- ):
449- logger .info (
450- f"Deleting flavor extra_specs property { extra_specs_key } for { device .name } "
451- )
452- flavor = (
453- openstack .compute_flavor_delete_extra_specs_property (
454- flavor , extra_specs_key
455- )
456- )
457-
458398 except Exception as exc :
459399 logger .info (
460400 f"Could not fully synchronize device { device .name } with ironic: { exc } "
0 commit comments