Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync up #204

Merged
merged 5 commits into from
Oct 20, 2020
Merged

Sync up #204

merged 5 commits into from
Oct 20, 2020

Conversation

derekhiggins
Copy link
Member

Syncing up patches from the downstream (openshift) image to here.

elfosardo and others added 5 commits October 12, 2020 10:45
We need to increase the size of the esp image for downstream
compatibility.
Sensor data collection was intended for an earlier use of
the ironic-image and resulting ironic container image in order
to supply data to prometheus about hardware that has not yet
been deployed upon. Since the deicsion was made not to leverage
the data, it seems pointless to collect sensor data.

As such, disable sensor data collection.
An improvement for testing and customization, moving all the
files we need to install in the main image to a file and having
dnf read its content.
This allows exotic compositions of sources, like urls and local dirs,
without having to touch the Dockerfile.
This will allow to pass a custom list of packages to install during
build time with very little effort.
@metal3-io-bot metal3-io-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 13, 2020
@elfosardo
Copy link
Member

/lgtm

@metal3-io-bot metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Oct 13, 2020
@@ -58,7 +58,7 @@ enable_ssl_api = true
automated_clean = {{ env.IRONIC_AUTOMATED_CLEAN }}
# NOTE(dtantsur): keep aligned with [pxe]boot_retry_timeout below.
deploy_callback_timeout = 4800
send_sensor_data = true
send_sensor_data = false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should change this.

Copy link
Member Author

@derekhiggins derekhiggins Oct 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't change it at all, or upstream?

httpd-tools
ipmitool
iproute
iscsi-initiator-utils
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder why we have this, we don't use the iscsi deploy..

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iirc we did at one stage (at the very start), its probably historical

@metal3-io-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekhiggins, dtantsur, elfosardo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [derekhiggins,dtantsur]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@derekhiggins
Copy link
Member Author

/test-integration

@metal3-io-bot metal3-io-bot merged commit 97d0e8d into metal3-io:master Oct 20, 2020
derekhiggins pushed a commit to derekhiggins/ironic-image that referenced this pull request Aug 11, 2021
Bug 1986238: Supermicro X12 fails to provision using Redfish BM HW Provisioning
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants