openstack/bifrost
Code Issues Proposed changes

Merge "Make bifrost more metalsmith-friendly"

Browse Source
This commit is contained in:
Zuul 2020-06-22 09:35:55 +00:00 committed by Gerrit Code Review
commit e4b32c2348
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/bifrost-ironic-install/defaults/main.yml
View File

@ -134,6 +134,8 @@ enabled_deploy_interfaces: "iscsi,direct"
enabled_management_interfaces: "redfish,ilo,ipmitool,noop" enabled_management_interfaces: "redfish,ilo,ipmitool,noop"
enabled_power_interfaces: "redfish,ilo,ipmitool,fake" enabled_power_interfaces: "redfish,ilo,ipmitool,fake"
default_resource_class: baremetal
# Extra pip packages to install with ironic # Extra pip packages to install with ironic
# This should be a list of pip-installable references. # This should be a list of pip-installable references.
# default: empty list # default: empty list

5
playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml
View File

@ -300,6 +300,11 @@
url: "{{ cirros_deploy_image_upstream_url }}" url: "{{ cirros_deploy_image_upstream_url }}"
dest: "{{ deploy_image }}" dest: "{{ deploy_image }}"
when: use_cirros | bool == true when: use_cirros | bool == true
- name: "Create a checksum file for cirros"
shell: md5sum {{ deploy_image_filename }} > {{ deploy_image_filename }}.CHECKSUMS
args:
chdir: "{{ http_boot_folder }}"
when: use_cirros | bool
- name: > - name: >
"Explicitly permit nginx port (TCP) for file downloads from nodes to be provisioned "Explicitly permit nginx port (TCP) for file downloads from nodes to be provisioned
and TCP/6385 for IPA callback" and TCP/6385 for IPA callback"

2
playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
View File

@ -19,6 +19,8 @@ enabled_deploy_interfaces = {{ enabled_deploy_interfaces }}
enabled_hardware_types = {{ enabled_hardware_types }} enabled_hardware_types = {{ enabled_hardware_types }}
default_resource_class = {{ default_resource_class }}
{% if use_rabbitmq is defined and use_rabbitmq | bool == true %} {% if use_rabbitmq is defined and use_rabbitmq | bool == true %}
transport_url = rabbit://ironic:{{ironic_db_password }}@{{ message_queue_host | default('127.0.0.1') }}:{{ message_queue_port | default('5672') }}/{{ rabbit_virtual_host | default('') }} transport_url = rabbit://ironic:{{ironic_db_password }}@{{ message_queue_host | default('127.0.0.1') }}:{{ message_queue_port | default('5672') }}/{{ rabbit_virtual_host | default('') }}
{% else %} {% else %}

6
releasenotes/notes/resource-class-243535c9049cbd73.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Sets the default resource class for newly enrolled nodes without an
explicit resource class. Defaults to ``baremetal``, can be changed via
the ``default_resource_class`` parameter.