openstack/kayobe
Code Issues Proposed changes

During inspection, only add PXE boot port

Browse Source 
Until ironic supports the use of multiple ports, nodes must have only a single port
This commit is contained in:
Mark Goddard 2017-04-03 16:14:03 +01:00
parent 60858d761b
commit 5bdc94d044
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all/bifrost
View File

@ -49,7 +49,7 @@ kolla_bifrost_inspector_processing_hooks: "{{ inspector_processing_hooks }}"
# Which MAC addresses to add as ports during introspection. One of 'all', # Which MAC addresses to add as ports during introspection. One of 'all',
# 'active' or 'pxe'. # 'active' or 'pxe'.
kolla_bifrost_inspector_port_addition: "{{ inspector_port_addition }}" kolla_bifrost_inspector_port_addition: "{{ inspector_add_ports }}"
# List of extra kernel parameters for the inspector default PXE configuration. # List of extra kernel parameters for the inspector default PXE configuration.
kolla_bifrost_inspector_extra_kernel_options: "{{ inspector_extra_kernel_options }}" kolla_bifrost_inspector_extra_kernel_options: "{{ inspector_extra_kernel_options }}"

5
ansible/group_vars/all/inspector
View File

@ -38,7 +38,10 @@ inspector_processing_hooks: >
# Which MAC addresses to add as ports during introspection. One of 'all', # Which MAC addresses to add as ports during introspection. One of 'all',
# 'active' or 'pxe'. # 'active' or 'pxe'.
inspector_port_addition: "all" inspector_add_ports: "pxe"
# Which ports to keep after introspection. One of 'all', 'present', or 'added'.
inspector_keep_ports: "added"
# Whether to enable discovery of nodes not managed by Ironic. # Whether to enable discovery of nodes not managed by Ironic.
inspector_enable_discovery: True inspector_enable_discovery: True

3
ansible/kolla-openstack.yml
View File

@ -64,7 +64,8 @@
# Ironic inspector configuration. # Ironic inspector configuration.
kolla_inspector_manage_firewall: "{{ inspector_manage_firewall }}" kolla_inspector_manage_firewall: "{{ inspector_manage_firewall }}"
kolla_inspector_processing_hooks: "{{ inspector_processing_hooks }}" kolla_inspector_processing_hooks: "{{ inspector_processing_hooks }}"
kolla_inspector_port_addition: "{{ inspector_port_addition }}" kolla_inspector_add_ports: "{{ inspector_add_ports }}"
kolla_inspector_keep_ports: "{{ inspector_keep_ports }}"
kolla_inspector_enable_discovery: "{{ inspector_enable_discovery }}" kolla_inspector_enable_discovery: "{{ inspector_enable_discovery }}"
kolla_inspector_discovery_enroll_node_driver: "{{ inspector_discovery_enroll_node_driver }}" kolla_inspector_discovery_enroll_node_driver: "{{ inspector_discovery_enroll_node_driver }}"
kolla_inspector_extra_kernel_options: "{{ inspector_extra_kernel_options }}" kolla_inspector_extra_kernel_options: "{{ inspector_extra_kernel_options }}"

5
ansible/roles/kolla-openstack/defaults/main.yml
View File

@ -127,7 +127,10 @@ kolla_inspector_processing_hooks:
# Which MAC addresses to add as ports during introspection. One of 'all', # Which MAC addresses to add as ports during introspection. One of 'all',
# 'active' or 'pxe'. # 'active' or 'pxe'.
kolla_inspector_port_addition: kolla_inspector_add_ports:
# Which ports to keep after introspection. One of 'all', 'present', or 'added'.
kolla_inspector_keep_ports:
# Whether to enable discovery of nodes not managed by Ironic. # Whether to enable discovery of nodes not managed by Ironic.
kolla_inspector_enable_discovery: kolla_inspector_enable_discovery:

6
ansible/roles/kolla-openstack/templates/ironic-inspector.conf.j2
View File

@ -10,14 +10,16 @@ manage_firewall = {{ kolla_inspector_manage_firewall }}
processing_hooks = {{ kolla_inspector_processing_hooks | join(',') }} processing_hooks = {{ kolla_inspector_processing_hooks | join(',') }}
{% endif %} {% endif %}
{% if kolla_inspector_port_addition %} {% if kolla_inspector_add_ports %}
# Which MAC addresses to add as ports during introspection. One of 'all', # Which MAC addresses to add as ports during introspection. One of 'all',
# 'active' or 'pxe'. # 'active' or 'pxe'.
add_ports = {{ kolla_inspector_port_addition }} add_ports = {{ kolla_inspector_add_ports }}
{% endif %} {% endif %}
{% if kolla_inspector_keep_ports %}
# Keep only those ports that were found during inspection. # Keep only those ports that were found during inspection.
keep_ports = present keep_ports = present
{% endif %}
# Store logs returned by the inspection ramdisk. # Store logs returned by the inspection ramdisk.
ramdisk_logs_dir = /var/log/kolla/ironic ramdisk_logs_dir = /var/log/kolla/ironic