Enable redfish by default

Change-Id: Idee73d80437d02894b3273e06ee3ad02827cdc03
This commit is contained in:
Dmitry Tantsur 2019-06-04 09:47:22 +02:00
parent 1ba2f10aa0
commit d8751563e7
8 changed files with 38 additions and 4 deletions

View File

@ -11,6 +11,7 @@ openstacksdk_source_install: true
shade_source_install: true
ironicinspector_source_install: true
ironicinspectorclient_source_install: false
sushy_source_install: false
staging_drivers_source_install: false
# Setting to utilize diskimage-builder to create a bootable image.
create_image_via_dib: true
@ -99,15 +100,17 @@ upper_constraints_file: "{{ lookup('env', 'UPPER_CONSTRAINTS_FILE') | default(re
staging_drivers_git_folder: /opt/stack/ironic-staging-drivers
ironicinspector_git_folder: /opt/stack/ironic-inspector
ironicinspectorclient_git_folder: /opt/stack/python-ironic-inspector-client
sushy_git_folder: /opt/stack/sushy
staging_drivers_git_url: https://opendev.org/x/ironic-staging-drivers
# TODO(TheJulia): Add redfish to this list.
enabled_hardware_types: "ipmi,ilo"
enabled_hardware_types: "ipmi,redfish,ilo"
default_deploy_interface: "direct"
enabled_bios_interfaces: "redfish,ilo,no-bios"
enabled_boot_interfaces: "ilo-virtual-media,ipxe,pxe"
enabled_management_interfaces: "ilo,ipmitool"
enabled_power_interfaces: "ilo,ipmitool"
enabled_deploy_interfaces: "iscsi,direct"
enabled_management_interfaces: "redfish,ilo,ipmitool"
enabled_power_interfaces: "redfish,ilo,ipmitool"
# Extra pip packages to install with ironic
# This should be a list of pip-installable references.

View File

@ -65,6 +65,15 @@
# as a result.
when: skip_install is not defined and install_dib | bool == true
- name: "sushy - Install"
include: pip_install.yml
package=sushy
sourcedir={{ sushy_git_folder }}
source_install={{ sushy_source_install }}
# NOTE(TheJulia): We do not explicitly define an upper constraints file
# to be utilized in order to allow newer versions to be installed.
when: skip_install is not defined
- name: "Ironic Client - Install"
include: pip_install.yml
package=python-ironicclient

View File

@ -11,6 +11,7 @@ default_deploy_interface = {{ default_deploy_interface }}
enabled_inspect_interfaces = no-inspect,inspector
default_inspect_interface = inspector
{% endif %}
enabled_bios_interfaces = {{ enabled_bios_interfaces }}
enabled_boot_interfaces = {{ enabled_boot_interfaces }}
enabled_management_interfaces = {{ enabled_management_interfaces }}
enabled_power_interfaces = {{ enabled_power_interfaces }}

View File

@ -34,6 +34,9 @@ shade_git_url: URL for shade, defaults to:
ironic_git_url: URL for ironic, defaults to:
https://opendev.org/openstack/ironic
sushy_git_url: URL for sushy, defaults to:
https://opendev.org/openstack/sushy
ironicclient_git_folder: The folder to clone ironicclient to if missing,
defaults to: "{{ git_root}}/ironicclient.git"
@ -46,6 +49,9 @@ openstacksdk_git_folder: The folder to clone openstacksdk to if missing,
shade_git_folder: The folder to clone shade to if missing, defaults to:
"{{ git_root}}/shade.git"
sushy_git_folder: The folder to clone sushy to if missing, default to:
"{{ git_root}}/sushy.git"
git_branch: Default branch to install, defaults to "master".
ironicclient_git_branch: Branch to install, defaults to the value of
@ -73,6 +79,8 @@ staging_drivers_git_branch: Branch to install, defaults to the value of
keystone_git_branch: Branch to install, defaults to the value of git_branch.
sushy_git_branch: Branch to install, defaults to the value of git_branch.
copy_from_local_path: Boolean value, defaults to false. If set to true,
the role will attempt to perform a filesystem copy of
locally defined git repositories instead of cloning

View File

@ -12,6 +12,7 @@ ironicinspectorclient_git_url: https://opendev.org/openstack/python-ironic-inspe
reqs_git_url: https://opendev.org/openstack/requirements
staging_drivers_git_url: https://opendev.org/x/ironic-staging-drivers
keystone_git_url: https://opendev.org/openstack/keystone
sushy_git_url: https://opendev.org/openstack/sushy
# *_git_folder can be overridden by local clones for offline installs
ironicclient_git_folder: "{{ git_root}}/python-ironicclient"
ironic_git_folder: "{{ git_root}}/ironic"
@ -24,6 +25,7 @@ reqs_git_folder: "{{ git_root }}/requirements"
upper_constraints_file: "{{ lookup('env', 'UPPER_CONSTRAINTS_FILE') | default(reqs_git_folder + '/upper-constraints.txt', True) }}"
staging_drivers_git_folder: "{{ git_root }}/ironic-staging-drivers"
keystone_git_folder: "{{ git_root}}/keystone"
sushy_git_folder: "{{ git_root}}/sushy"
# *git_branch can be overridden for stable branch testing
git_branch: master
ironicclient_git_branch: "{{ git_branch }}"
@ -36,6 +38,7 @@ ironicinspectorclient_git_branch: "{{ git_branch }}"
reqs_git_branch: "{{ git_branch }}"
staging_drivers_git_branch: "{{ git_branch }}"
keystone_git_branch: "{{ git_branch }}"
sushy_git_branch: "{{ git_branch }}"
# Conditional variables utilized based on CI or manual testing options.
copy_from_local_path: false
@ -82,3 +85,7 @@ bifrost_install_sources:
git_url: "{{ keystone_git_url }}"
git_branch: "{{ keystone_git_branch }}"
name: keystone
- git_folder: "{{ sushy_git_folder }}"
git_url: "{{ sushy_git_url }}"
git_branch: "{{ sushy_git_branch }}"
name: sushy

View File

@ -37,6 +37,7 @@
ironicinspector_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/ironic-inspector"
ironicinspectorclient_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/python-ironic-inspector-client"
keystone_git_url: "/opt/git/openstack/keystone"
sushy_git_url: "/opt/git/openstack/sushy"
reqs_git_url: "{{ lookup('env', 'WORKSPACE') }}/openstack/requirements"
staging_drivers_git_url: "/opt/git/x/ironic-staging-drivers"
# TODO(TheJulia) Fix the above paths to be consistent, because the NV job gets the dib

View File

@ -0,0 +1,4 @@
---
features:
- |
The ``redfish`` hardware type is now enabled by default.

View File

@ -19,6 +19,7 @@
- openstack/python-ironicclient
- openstack/requirements
- openstack/shade
- openstack/sushy
- job:
name: bifrost-integration