Skip to content

Skip adding memory and disk for baremetal flavors #6

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jan 26, 2023
Merged

Skip adding memory and disk for baremetal flavors #6

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
caf12fd
Skip adding memory and disk for baremetal flavors
JohnGarbutt Jan 26, 2023
5f6aa82
fix up syntax
JohnGarbutt Jan 26, 2023
0ddb34d
Add some debug info
JohnGarbutt Jan 26, 2023
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
27 changes: 23 additions & 4 deletions os_capacity/prometheus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,15 @@ def get_capacity_per_flavor(placement_client, flavors):


def get_placement_request(flavor):
resources = {"MEMORY_MB": flavor.ram, "DISK_GB": (flavor.disk + flavor.ephemeral)}
resources = {}
required_traits = []

def add_defaults(resources, flavor, skip_vcpu=False):
resources["MEMORY_MB"] = flavor.ram
resources["DISK_GB"] = flavor.disk + flavor.ephemeral
if not skip_vcpu:
resources["VCPU"] = flavor.vcpus

for key, value in flavor.extra_specs.items():
if "trait:" == key[:6]:
if value == "required":
Expand All @@ -29,8 +36,13 @@ def get_placement_request(flavor):
resources[key[10:]] = count
if "hw:cpu_policy" == key and value == "dedicated":
resources["PCPU"] = flavor.vcpus
if "PCPU" not in resources.keys() and "VCPU" not in resources.keys():
resources["VCPU"] = flavor.vcpus
add_defaults(resources, flavor, skip_vcpu=True)

# if not baremetal and not PCPU
# we should add the default vcpu ones
if not resources:
add_defaults(resources, flavor)

return resources, required_traits


Expand Down Expand Up @@ -61,7 +73,10 @@ def get_max_per_host(placement_client, resources, required_traits):
# available count is the min of the max counts
if max_counts:
count_per_rp[rp_uuid] = min(max_counts)

if not count_per_rp:
print(
f"# WARNING - no candidates for resources:{resource_str} traits:{required_str}"
)
return count_per_rp


Expand Down Expand Up @@ -136,6 +151,7 @@ def print_details(compute_client, placement_client):
for hostname in hostnames:
rp = resource_providers[hostname]
rp_id = rp["uuid"]
free_space_found = False
for flavor_name in flavor_names:
all_counts = capacity_per_flavor.get(flavor_name, {})
our_count = all_counts.get(rp_id, 0)
Expand All @@ -151,6 +167,9 @@ def print_details(compute_client, placement_client):
print(
f'openstack_capacity_by_hostname{{{host_str},flavor="{flavor_name}"}} {our_count}'
)
free_space_found = True
if not free_space_found:
print(f"# WARNING - no free spaces found for {hostname}")

for project, names in project_to_aggregate.items():
for name in names:
Expand Down