Skip to content

Commit

Permalink
Remove local_storage extra spec (#96)
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Berendt <berendt@osism.tech>
  • Loading branch information
berendt authored Dec 20, 2023
1 parent 159588d commit 767683a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 30 deletions.
29 changes: 0 additions & 29 deletions flavors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,229 +17,200 @@ mandatory:
disk: 0
scs:cpu-type: crowded-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-1L-1-5
cpus: 1
ram: 1024
disk: 5
scs:cpu-type: crowded-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-1V-2
cpus: 1
ram: 2048
disk: 0
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-1V-2-5
cpus: 1
ram: 2048
disk: 5
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-1V-4
cpus: 1
ram: 4096
disk: 0
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-1V-4-10
cpus: 1
ram: 4096
disk: 10
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-1V-8
cpus: 1
ram: 8192
disk: 0
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-1V-8-20
cpus: 1
ram: 8192
disk: 20
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-2V-4
cpus: 2
ram: 4096
disk: 0
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-2V-4-10
cpus: 2
ram: 4096
disk: 10
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-2V-8
cpus: 2
ram: 8192
disk: 0
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-2V-8-20
cpus: 2
ram: 8192
disk: 20
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-2V-16
cpus: 2
ram: 16384
disk: 0
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-2V-16-50
cpus: 2
ram: 16384
disk: 50
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-4V-8
cpus: 4
ram: 8192
disk: 0
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-4V-8-20
cpus: 4
ram: 8192
disk: 20
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-4V-16
cpus: 4
ram: 16384
disk: 0
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-4V-16-50
cpus: 4
ram: 16384
disk: 50
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-4V-32
cpus: 4
ram: 32768
disk: 0
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-4V-32-100
cpus: 4
ram: 32768
disk: 100
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-8V-16
cpus: 8
ram: 16384
disk: 0
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-8V-16-50
cpus: 8
ram: 16384
disk: 50
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-8V-32
cpus: 8
ram: 32768
disk: 0
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-8V-32-100
cpus: 8
ram: 32768
disk: 100
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-16V-32
cpus: 16
ram: 32768
disk: 0
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-16V-32-100
cpus: 16
ram: 32768
disk: 100
scs:cpu-type: shared-core
scs:disk0-type: network
local_storage: "false"
hw_rng:allowed: "true"
- name: SCS-2V-4-20s
cpus: 2
ram: 4096
disk: 20
scs:cpu-type: shared-core
scs:disk0-type: ssd
local_storage: "true"
hw_rng:allowed: "true"
- name: SCS-4V-8-50s
cpus: 4
ram: 8192
disk: 50
scs:cpu-type: shared-core
scs:disk0-type: ssd
local_storage: "true"
hw_rng:allowed: "true"
- name: SCS-8V-32-100s
cpus: 8
ram: 32768
disk: 100
scs:cpu-type: shared-core
scs:disk0-type: ssd
local_storage: "true"
hw_rng:allowed: "true"
2 changes: 1 addition & 1 deletion openstack_flavor_manager/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def set_flavor(self, flavor_spec: dict, defaults: dict) -> Flavor | None:
# we could exclude keys explicitly, like so:
# if key not in ('name', 'ram', 'cpus', 'disk', 'public', 'disabled')
# but the extra specs should be prefixed, so we can as well do it like so:
if ":" in key or key in ["local_storage"]
if ":" in key
}
self.conn.set_flavor_specs(
flavor_id=flavor.id,
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/remove-local-storage-f8d88689f360e903.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
features:
- |
Remove `local_storage` extra spec in favor of `scs:disk0-type` extra spec.

0 comments on commit 767683a

Please sign in to comment.