openstack/tenks
Code Issues Proposed changes

Extract Ironic node extra specs dicts

Browse Source 
It improves readability to have each dict defined separately.
This commit is contained in:
Will Miller 2018-09-07 14:20:01 +00:00
parent 94aee5d0ce
commit 2789a56ef7
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ansible/roles/nova-flavors/tasks/main.yml
View File

@ -22,23 +22,33 @@
# * Add required and forbidden traits.
# * Add any custom specs from the user.
extra_specs: >-
{{ {
"resources:DISK_GB": 0,
"resources:MEMORY_MB": 0,
"resources:VCPU": 0,
"resources:CUSTOM_" ~ (
item.resource_class | upper
| regex_replace('[^A-Za-z0-9]', '_')): 1
}
| combine(dict(item.required_traits | default([])
| map('regex_replace', '(.*)', 'trait:\1')
| zip_longest([], fillvalue='required')))
| combine(dict(item.forbidden_traits | default([])
| map('regex_replace', '(.*)', 'trait:\1')
| zip_longest([], fillvalue='forbidden')))
| combine(item.custom_specs | default({}))
{{ hw_specs
| combine(resource_class)
| combine(required_traits)
| combine(forbidden_traits)
| combine(item.custom_specs | default({}))
}}
vars:
hw_specs:
"resources:DISK_GB": 0
"resources:MEMORY_MB": 0
"resources:VCPU": 0
resource_class: >-
{{ {
"resources:CUSTOM_" ~ (
item.resource_class | upper
| regex_replace('[^A-Z0-9]', '_')): 1
} }}
required_traits: >-
{{ dict(item.required_traits
| default([])
| map('regex_replace', '(.*)', 'trait:\1')
| zip_longest([], fillvalue='required')) }}
forbidden_traits: >-
{{ dict(item.forbidden_traits
| default([])
| map('regex_replace', '(.*)', 'trait:\1')
| zip_longest([], fillvalue='forbidden')) }}
ansible_python_interpreter: >-
{{ '/'.join([flavors_virtualenv_path, 'bin', 'python']) }}
loop: "{{ flavors }}"